Merge remote-tracking branch 'origin/master' into auth_passportjs

server/controllers/UserController.js

@@ -1,52 +1,63 @@
+const uuidv4 = require("uuid").v4
 const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
+const Database = require('../Database')
 
 const User = require('../objects/user/User')
 
-const { getId, toNumber } = require('../utils/index')
+const { toNumber } = require('../utils/index')
 
 class UserController {
   constructor() { }
 
-  findAll(req, res) {
+  async findAll(req, res) {
     if (!req.user.isAdminOrUp) return res.sendStatus(403)
     const hideRootToken = !req.user.isRoot
+
+    const includes = (req.query.include || '').split(',').map(i => i.trim())
+
+    // Minimal toJSONForBrowser does not include mediaProgress and bookmarks
+    const allUsers = await Database.models.user.getOldUsers()
+    const users = allUsers.map(u => u.toJSONForBrowser(hideRootToken, true))
+
+    if (includes.includes('latestSession')) {
+      for (const user of users) {
+        const userSessions = await Database.getPlaybackSessions({ userId: user.id })
+        user.latestSession = userSessions.sort((a, b) => b.updatedAt - a.updatedAt).shift() || null
+      }
+    }
+
     res.json({
-      // Minimal toJSONForBrowser does not include mediaProgress and bookmarks
-      users: this.db.users.map(u => u.toJSONForBrowser(hideRootToken, true))
+      users
     })
   }
 
-  findOne(req, res) {
+  async findOne(req, res) {
     if (!req.user.isAdminOrUp) {
       Logger.error('User other than admin attempting to get user', req.user)
       return res.sendStatus(403)
     }
 
-    const user = this.db.users.find(u => u.id === req.params.id)
-    if (!user) {
-      return res.sendStatus(404)
-    }
-
-    res.json(this.userJsonWithItemProgressDetails(user, !req.user.isRoot))
+    res.json(this.userJsonWithItemProgressDetails(req.reqUser, !req.user.isRoot))
   }
 
   async create(req, res) {
-    var account = req.body
+    const account = req.body
+    const username = account.username
 
-    var username = account.username
-    var usernameExists = this.db.users.find(u => u.username.toLowerCase() === username.toLowerCase())
+    const usernameExists = await Database.models.user.getUserByUsername(username)
     if (usernameExists) {
       return res.status(500).send('Username already taken')
     }
 
-    account.id = getId('usr')
+    account.id = uuidv4()
     account.pash = await this.auth.hashPass(account.password)
     delete account.password
     account.token = await this.auth.generateAccessToken(account)
     account.createdAt = Date.now()
-    var newUser = new User(account)
-    var success = await this.db.insertEntity('user', newUser)
+    const newUser = new User(account)
+
+    const success = await Database.createUser(newUser)
     if (success) {
       SocketAuthority.adminEmitter('user_added', newUser.toJSONForBrowser())
       res.json({
@@ -58,7 +69,7 @@ class UserController {
   }
 
   async update(req, res) {
-    var user = req.reqUser
+    const user = req.reqUser
 
     if (user.type === 'root' && !req.user.isRoot) {
       Logger.error(`[UserController] Admin user attempted to update root user`, req.user.username)
@@ -69,7 +80,7 @@ class UserController {
     var shouldUpdateToken = false
 
     if (account.username !== undefined && account.username !== user.username) {
-      var usernameExists = this.db.users.find(u => u.username.toLowerCase() === account.username.toLowerCase())
+      const usernameExists = await Database.models.user.getUserByUsername(account.username)
       if (usernameExists) {
         return res.status(500).send('Username already taken')
       }
@@ -82,13 +93,12 @@ class UserController {
       delete account.password
     }
 
-    var hasUpdated = user.update(account)
-    if (hasUpdated) {
+    if (user.update(account)) {
       if (shouldUpdateToken) {
         user.token = await this.auth.generateAccessToken(user)
         Logger.info(`[UserController] User ${user.username} was generated a new api token`)
       }
-      await this.db.updateEntity('user', user)
+      await Database.updateUser(user)
       SocketAuthority.clientEmitter(req.user.id, 'user_updated', user.toJSONForBrowser())
     }
 
@@ -112,13 +122,13 @@ class UserController {
     // Todo: check if user is logged in and cancel streams
 
     // Remove user playlists
-    const userPlaylists = this.db.playlists.filter(p => p.userId === user.id)
+    const userPlaylists = await Database.models.playlist.getPlaylistsForUserAndLibrary(user.id)
     for (const playlist of userPlaylists) {
-      await this.db.removeEntity('playlist', playlist.id)
+      await Database.removePlaylist(playlist.id)
     }
 
     const userJson = user.toJSONForBrowser()
-    await this.db.removeEntity('user', user.id)
+    await Database.removeUser(user.id)
     SocketAuthority.adminEmitter('user_removed', userJson)
     res.json({
       success: true
@@ -152,40 +162,6 @@ class UserController {
     res.json(listeningStats)
   }
 
-  // POST: api/users/:id/purge-media-progress
-  async purgeMediaProgress(req, res) {
-    const user = req.reqUser
-
-    if (user.type === 'root' && !req.user.isRoot) {
-      Logger.error(`[UserController] Admin user attempted to purge media progress of root user`, req.user.username)
-      return res.sendStatus(403)
-    }
-
-    var progressPurged = 0
-    user.mediaProgress = user.mediaProgress.filter(mp => {
-      const libraryItem = this.db.libraryItems.find(li => li.id === mp.libraryItemId)
-      if (!libraryItem) {
-        progressPurged++
-        return false
-      } else if (mp.episodeId) {
-        const episode = libraryItem.mediaType === 'podcast' ? libraryItem.media.getEpisode(mp.episodeId) : null
-        if (!episode) { // Episode not found
-          progressPurged++
-          return false
-        }
-      }
-      return true
-    })
-
-    if (progressPurged) {
-      Logger.info(`[UserController] Purged ${progressPurged} media progress for user ${user.username}`)
-      await this.db.updateEntity('user', user)
-      SocketAuthority.adminEmitter('user_updated', user.toJSONForBrowser())
-    }
-
-    res.json(this.userJsonWithItemProgressDetails(user, !req.user.isRoot))
-  }
-
   // POST: api/users/online (admin)
   async getOnlineUsers(req, res) {
     if (!req.user.isAdminOrUp) {
@@ -198,7 +174,7 @@ class UserController {
     })
   }
 
-  middleware(req, res, next) {
+  async middleware(req, res, next) {
     if (!req.user.isAdminOrUp && req.user.id !== req.params.id) {
       return res.sendStatus(403)
     } else if ((req.method == 'PATCH' || req.method == 'POST' || req.method == 'DELETE') && !req.user.isAdminOrUp) {
@@ -206,7 +182,7 @@ class UserController {
     }
 
     if (req.params.id) {
-      req.reqUser = this.db.users.find(u => u.id === req.params.id)
+      req.reqUser = await Database.models.user.getUserById(req.params.id)
       if (!req.reqUser) {
         return res.sendStatus(404)
       }