Merge branch 'master' into auth_passportjs

server/controllers/AuthorController.js

@@ -167,6 +167,30 @@ class AuthorController {
     }
   }
 
+  /**
+   * DELETE: /api/authors/:id
+   * Remove author from all books and delete
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
+  async delete(req, res) {
+    Logger.info(`[AuthorController] Removing author "${req.author.name}"`)
+
+    await Database.authorModel.removeById(req.author.id)
+
+    if (req.author.imagePath) {
+      await CacheManager.purgeImageCache(req.author.id) // Purge cache
+    }
+
+    SocketAuthority.emitter('author_removed', req.author.toJSON())
+
+    // Update filter data
+    Database.removeAuthorFromFilterData(req.author.libraryId, req.author.id)
+
+    res.sendStatus(200)
+  }
+
   async match(req, res) {
     let authorData = null
     const region = req.body.region || 'us'

server/controllers/BackupController.js

@@ -6,7 +6,8 @@ class BackupController {
 
   getAll(req, res) {
     res.json({
-      backups: this.backupManager.backups.map(b => b.toJSON())
+      backups: this.backupManager.backups.map(b => b.toJSON()),
+      backupLocation: this.backupManager.backupLocation
     })
   }
 
@@ -42,6 +43,9 @@ class BackupController {
       Logger.debug(`Use X-Accel to serve static file ${encodedURI}`)
       return res.status(204).header({ 'X-Accel-Redirect': encodedURI }).send()
     }
+
+    res.setHeader('Content-disposition', 'attachment; filename=' + req.backup.filename)
+
     res.sendFile(req.backup.fullPath)
   }
 
@@ -65,4 +69,4 @@ class BackupController {
     next()
   }
 }
-module.exports = new BackupController()
+module.exports = new BackupController()

server/controllers/LibraryController.js

@@ -620,7 +620,7 @@ class LibraryController {
         model: Database.bookModel,
         attributes: ['id', 'tags', 'explicit'],
         where: bookWhere,
-        required: true,
+        required: false,
         through: {
           attributes: []
         }

server/controllers/LibraryItemController.js

@@ -225,15 +225,45 @@ class LibraryItemController {
     res.sendStatus(200)
   }
 
-  // GET api/items/:id/cover
+  /**
+   * GET: api/items/:id/cover
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   async getCover(req, res) {
-    const { query: { width, height, format, raw }, libraryItem } = req
+    const { query: { width, height, format, raw } } = req
+
+    const libraryItem = await Database.libraryItemModel.findByPk(req.params.id, {
+      attributes: ['id', 'mediaType', 'mediaId', 'libraryId'],
+      include: [
+        {
+          model: Database.bookModel,
+          attributes: ['id', 'coverPath', 'tags', 'explicit']
+        },
+        {
+          model: Database.podcastModel,
+          attributes: ['id', 'coverPath', 'tags', 'explicit']
+        }
+      ]
+    })
+    if (!libraryItem) {
+      Logger.warn(`[LibraryItemController] getCover: Library item "${req.params.id}" does not exist`)
+      return res.sendStatus(404)
+    }
+
+    // Check if user can access this library item
+    if (!req.user.checkCanAccessLibraryItemWithData(libraryItem.libraryId, libraryItem.media.explicit, libraryItem.media.tags)) {
+      return res.sendStatus(403)
+    }
+
+    // Check if library item media has a cover path
+    if (!libraryItem.media.coverPath || !await fs.pathExists(libraryItem.media.coverPath)) {
+      Logger.debug(`[LibraryItemController] getCover: Library item "${req.params.id}" has no cover path`)
+      return res.sendStatus(404)
+    }
 
     if (raw) { // any value
-      if (!libraryItem.media.coverPath || !await fs.pathExists(libraryItem.media.coverPath)) {
-        return res.sendStatus(404)
-      }
-
       if (global.XAccel) {
         const encodedURI = encodeUriPath(global.XAccel + libraryItem.media.coverPath)
         Logger.debug(`Use X-Accel to serve static file ${encodedURI}`)
@@ -247,13 +277,7 @@ class LibraryItemController {
       height: height ? parseInt(height) : null,
       width: width ? parseInt(width) : null
     }
-    return CacheManager.handleCoverCache(res, libraryItem, options)
-  }
-
-  // GET: api/items/:id/stream
-  openStream(req, res) {
-    // this.streamManager.openStreamApiRequest(res, req.user, req.libraryItem)
-    res.sendStatus(500)
+    return CacheManager.handleCoverCache(res, libraryItem.id, libraryItem.media.coverPath, options)
   }
 
   // POST: api/items/:id/play

server/controllers/MeController.js

@@ -196,7 +196,7 @@ class MeController {
 
       const libraryItem = await Database.libraryItemModel.getOldById(localProgress.libraryItemId)
       if (!libraryItem) {
-        Logger.error(`[MeController] syncLocalMediaProgress invalid local media progress object no library item`, localProgress)
+        Logger.error(`[MeController] syncLocalMediaProgress invalid local media progress object no library item with id "${localProgress.libraryItemId}"`, localProgress)
         continue
       }
 

server/controllers/PodcastController.js

@@ -91,7 +91,7 @@ class PodcastController {
 
     res.json(libraryItem.toJSONExpanded())
 
-    if (payload.episodesToDownload && payload.episodesToDownload.length) {
+    if (payload.episodesToDownload?.length) {
       Logger.info(`[PodcastController] Podcast created now starting ${payload.episodesToDownload.length} episode downloads`)
       this.podcastManager.downloadPodcastEpisodes(libraryItem, payload.episodesToDownload)
     }