Fix:Series covers on home page not spread out correctly #505, Update:Server settings are now returned with auth requests

server/Auth.js

@@ -100,6 +100,14 @@ class Auth {
     })
   }
 
+  getUserLoginResponsePayload(user) {
+    return {
+      user: user.toJSONForBrowser(),
+      userDefaultLibraryId: user.getDefaultLibraryId(this.db.libraries),
+      serverSettings: this.db.serverSettings.toJSON()
+    }
+  }
+
   async login(req, res) {
     var username = (req.body.username || '').toLowerCase()
     var password = req.body.password || ''
@@ -120,17 +128,14 @@ class Auth {
       if (password) {
         return res.status(401).send('Invalid root password (hint: there is none)')
       } else {
-        return res.json({ user: user.toJSONForBrowser(), userDefaultLibraryId: user.getDefaultLibraryId(this.db.libraries) })
+        return res.json(this.getUserLoginResponsePayload(user))
       }
     }
 
     // Check password match
     var compare = await bcrypt.compare(password, user.pash)
     if (compare) {
-      res.json({
-        user: user.toJSONForBrowser(),
-        userDefaultLibraryId: user.getDefaultLibraryId(this.db.libraries)
-      })
+      res.json(this.getUserLoginResponsePayload(user))
     } else {
       Logger.debug(`[Auth] Failed login attempt ${req.rateLimit.current} of ${req.rateLimit.limit}`)
       if (req.rateLimit.remaining <= 2) {

server/Server.js

@@ -409,6 +409,7 @@ class Server {
     await this.db.updateEntity('user', user)
 
     const initialPayload = {
+      // TODO: this is sent with user auth now, update mobile app to use that then remove this
       serverSettings: this.db.serverSettings.toJSON(),
       audiobookPath: global.AudiobookPath,
       metadataPath: global.MetadataPath,

server/controllers/MiscController.js

@@ -230,7 +230,12 @@ class MiscController {
       Logger.error('Invalid user in authorize')
       return res.sendStatus(401)
     }
-    res.json({ user: req.user, userDefaultLibraryId: req.user.getDefaultLibraryId(this.db.libraries) })
+    const userResponse = {
+      user: req.user,
+      userDefaultLibraryId: req.user.getDefaultLibraryId(this.db.libraries),
+      serverSettings: this.db.serverSettings.toJSON()
+    }
+    res.json(userResponse)
   }
 
   getAllTags(req, res) {