Merge branch 'caching' of https://github.com/mikiher/audiobookshelf into caching

server/controllers/MiscController.js

@@ -119,8 +119,9 @@ class MiscController {
   /**
    * PATCH: /api/settings
    * Update server settings
-   * @param {*} req 
-   * @param {*} res 
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
    */
   async updateServerSettings(req, res) {
     if (!req.user.isAdminOrUp) {
@@ -128,7 +129,7 @@ class MiscController {
       return res.sendStatus(403)
     }
     const settingsUpdate = req.body
-    if (!settingsUpdate || !isObject(settingsUpdate)) {
+    if (!isObject(settingsUpdate)) {
       return res.status(400).send('Invalid settings update object')
     }
 
@@ -248,8 +249,8 @@ class MiscController {
    * POST: /api/authorize
    * Used to authorize an API token
    * 
-   * @param {*} req 
-   * @param {*} res 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
    */
   async authorize(req, res) {
     if (!req.user) {
@@ -555,10 +556,10 @@ class MiscController {
     switch (type) {
       case 'add':
         this.watcher.onFileAdded(libraryId, path)
-        break;
+        break
       case 'unlink':
         this.watcher.onFileRemoved(libraryId, path)
-        break;
+        break
       case 'rename':
         const oldPath = req.body.oldPath
         if (!oldPath) {
@@ -566,7 +567,7 @@ class MiscController {
           return res.sendStatus(400)
         }
         this.watcher.onFileRename(libraryId, oldPath, path)
-        break;
+        break
       default:
         Logger.error(`[MiscController] Invalid type for updateWatchedPath. type: "${type}"`)
         return res.sendStatus(400)
@@ -589,5 +590,105 @@ class MiscController {
       res.status(400).send(error.message)
     }
   }
+
+  /**
+   * GET: api/auth-settings (admin only)
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
+  getAuthSettings(req, res) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[MiscController] Non-admin user "${req.user.username}" attempted to get auth settings`)
+      return res.sendStatus(403)
+    }
+    return res.json(Database.serverSettings.authenticationSettings)
+  }
+
+  /**
+   * PATCH: api/auth-settings
+   * @this import('../routers/ApiRouter')
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
+  async updateAuthSettings(req, res) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[MiscController] Non-admin user "${req.user.username}" attempted to update auth settings`)
+      return res.sendStatus(403)
+    }
+
+    const settingsUpdate = req.body
+    if (!isObject(settingsUpdate)) {
+      return res.status(400).send('Invalid auth settings update object')
+    }
+
+    let hasUpdates = false
+
+    const currentAuthenticationSettings = Database.serverSettings.authenticationSettings
+    const originalAuthMethods = [...currentAuthenticationSettings.authActiveAuthMethods]
+
+    // TODO: Better validation of auth settings once auth settings are separated from server settings
+    for (const key in currentAuthenticationSettings) {
+      if (settingsUpdate[key] === undefined) continue
+
+      if (key === 'authActiveAuthMethods') {
+        let updatedAuthMethods = settingsUpdate[key]?.filter?.((authMeth) => Database.serverSettings.supportedAuthMethods.includes(authMeth))
+        if (Array.isArray(updatedAuthMethods) && updatedAuthMethods.length) {
+          updatedAuthMethods.sort()
+          currentAuthenticationSettings[key].sort()
+          if (updatedAuthMethods.join() !== currentAuthenticationSettings[key].join()) {
+            Logger.debug(`[MiscController] Updating auth settings key "authActiveAuthMethods" from "${currentAuthenticationSettings[key].join()}" to "${updatedAuthMethods.join()}"`)
+            Database.serverSettings[key] = updatedAuthMethods
+            hasUpdates = true
+          }
+        } else {
+          Logger.warn(`[MiscController] Invalid value for authActiveAuthMethods`)
+        }
+      } else {
+        const updatedValueType = typeof settingsUpdate[key]
+        if (['authOpenIDAutoLaunch', 'authOpenIDAutoRegister'].includes(key)) {
+          if (updatedValueType !== 'boolean') {
+            Logger.warn(`[MiscController] Invalid value for ${key}. Expected boolean`)
+            continue
+          }
+        } else if (settingsUpdate[key] !== null && updatedValueType !== 'string') {
+          Logger.warn(`[MiscController] Invalid value for ${key}. Expected string or null`)
+          continue
+        }
+        let updatedValue = settingsUpdate[key]
+        if (updatedValue === '') updatedValue = null
+        let currentValue = currentAuthenticationSettings[key]
+        if (currentValue === '') currentValue = null
+
+        if (updatedValue !== currentValue) {
+          Logger.debug(`[MiscController] Updating auth settings key "${key}" from "${currentValue}" to "${updatedValue}"`)
+          Database.serverSettings[key] = updatedValue
+          hasUpdates = true
+        }
+      }
+    }
+
+    if (hasUpdates) {
+      await Database.updateServerSettings()
+
+      // Use/unuse auth methods
+      Database.serverSettings.supportedAuthMethods.forEach((authMethod) => {
+        if (originalAuthMethods.includes(authMethod) && !Database.serverSettings.authActiveAuthMethods.includes(authMethod)) {
+          // Auth method has been removed
+          Logger.info(`[MiscController] Disabling active auth method "${authMethod}"`)
+          this.auth.unuseAuthStrategy(authMethod)
+        } else if (!originalAuthMethods.includes(authMethod) && Database.serverSettings.authActiveAuthMethods.includes(authMethod)) {
+          // Auth method has been added
+          Logger.info(`[MiscController] Enabling active auth method "${authMethod}"`)
+          this.auth.useAuthStrategy(authMethod)
+        }
+      })
+    }
+
+    res.json({
+      serverSettings: Database.serverSettings.toJSONForBrowser()
+    })
+  }
 }
 module.exports = new MiscController()

server/controllers/SessionController.js

@@ -6,7 +6,7 @@ class SessionController {
   constructor() { }
 
   async findOne(req, res) {
-    return res.json(req.session)
+    return res.json(req.playbackSession)
   }
 
   async getAllWithUserData(req, res) {
@@ -63,32 +63,32 @@ class SessionController {
   }
 
   async getOpenSession(req, res) {
-    const libraryItem = await Database.libraryItemModel.getOldById(req.session.libraryItemId)
-    const sessionForClient = req.session.toJSONForClient(libraryItem)
+    const libraryItem = await Database.libraryItemModel.getOldById(req.playbackSession.libraryItemId)
+    const sessionForClient = req.playbackSession.toJSONForClient(libraryItem)
     res.json(sessionForClient)
   }
 
   // POST: api/session/:id/sync
   sync(req, res) {
-    this.playbackSessionManager.syncSessionRequest(req.user, req.session, req.body, res)
+    this.playbackSessionManager.syncSessionRequest(req.user, req.playbackSession, req.body, res)
   }
 
   // POST: api/session/:id/close
   close(req, res) {
     let syncData = req.body
     if (syncData && !Object.keys(syncData).length) syncData = null
-    this.playbackSessionManager.closeSessionRequest(req.user, req.session, syncData, res)
+    this.playbackSessionManager.closeSessionRequest(req.user, req.playbackSession, syncData, res)
   }
 
   // DELETE: api/session/:id
   async delete(req, res) {
     // if session is open then remove it
-    const openSession = this.playbackSessionManager.getSession(req.session.id)
+    const openSession = this.playbackSessionManager.getSession(req.playbackSession.id)
     if (openSession) {
-      await this.playbackSessionManager.removeSession(req.session.id)
+      await this.playbackSessionManager.removeSession(req.playbackSession.id)
     }
 
-    await Database.removePlaybackSession(req.session.id)
+    await Database.removePlaybackSession(req.playbackSession.id)
     res.sendStatus(200)
   }
 
@@ -111,7 +111,7 @@ class SessionController {
       return res.sendStatus(404)
     }
 
-    req.session = playbackSession
+    req.playbackSession = playbackSession
     next()
   }
 
@@ -130,7 +130,7 @@ class SessionController {
       return res.sendStatus(403)
     }
 
-    req.session = playbackSession
+    req.playbackSession = playbackSession
     next()
   }
 }

server/controllers/UserController.js

@@ -100,7 +100,7 @@ class UserController {
     account.id = uuidv4()
     account.pash = await this.auth.hashPass(account.password)
     delete account.password
-    account.token = await this.auth.generateAccessToken({ userId: account.id, username })
+    account.token = await this.auth.generateAccessToken(account)
     account.createdAt = Date.now()
     const newUser = new User(account)
 
@@ -150,7 +150,7 @@ class UserController {
 
     if (user.update(account)) {
       if (shouldUpdateToken) {
-        user.token = await this.auth.generateAccessToken({ userId: user.id, username: user.username })
+        user.token = await this.auth.generateAccessToken(user)
         Logger.info(`[UserController] User ${user.username} was generated a new api token`)
       }
       await Database.updateUser(user)