Update:Get all users api endpoint to include latest session, display device info on users table #724

client/components/tables/UsersTable.vue

@@ -19,9 +19,13 @@
           </td>
           <td class="text-sm">{{ user.type }}</td>
           <td class="hidden lg:table-cell">
-            <div v-if="usersOnline[user.id]">
+            <div v-if="usersOnline[user.id]?.session?.displayTitle">
-              <p v-if="usersOnline[user.id].session && usersOnline[user.id].session.libraryItem" class="truncate text-xs">Listening: {{ usersOnline[user.id].session.libraryItem.media.metadata.title || '' }}</p>
+              <p class="truncate text-xs">Listening: {{ usersOnline[user.id].session.displayTitle || '' }}</p>
-              <p v-else-if="usersOnline[user.id].mostRecent && usersOnline[user.id].mostRecent.media" class="truncate text-xs">Last: {{ usersOnline[user.id].mostRecent.media.metadata.title }}</p>
+              <p class="truncate text-xs text-gray-300">{{ getDeviceInfoString(usersOnline[user.id].session.deviceInfo) }}</p>
+            </div>
+            <div v-else-if="user.latestSession?.displayTitle">
+              <p class="truncate text-xs">Last: {{ user.latestSession.displayTitle || '' }}</p>
+              <p class="truncate text-xs text-gray-300">{{ getDeviceInfoString(user.latestSession.deviceInfo) }}</p>
             </div>
           </td>
           <td class="text-xs font-mono hidden sm:table-cell">
@@ -83,6 +87,12 @@ export default {
     }
   },
   methods: {
+    getDeviceInfoString(deviceInfo) {
+      if (!deviceInfo) return ''
+      if (deviceInfo.manufacturer && deviceInfo.model) return `${deviceInfo.manufacturer} ${deviceInfo.model}`
+
+      return `${deviceInfo.osName || 'Unknown'} ${deviceInfo.osVersion || ''} ${deviceInfo.browserName || ''}`
+    },
     deleteUserClick(user) {
       if (this.isDeletingUser) return
       if (confirm(this.$getString('MessageRemoveUserWarning', [user.username]))) {
@@ -114,11 +124,12 @@ export default {
     },
     loadUsers() {
       this.$axios
-        .$get('/api/users')
+        .$get('/api/users?include=latestSession')
         .then((res) => {
           this.users = res.users.sort((a, b) => {
             return a.createdAt - b.createdAt
           })
+          console.log('Loaded users', this.users)
         })
         .catch((error) => {
           console.error('Failed', error)

server/controllers/UserController.js

@@ -8,12 +8,24 @@ const { getId, 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 users = this.db.users.map(u => u.toJSONForBrowser(hideRootToken, true))
+
+    if (includes.includes('latestSession')) {
+      for (const user of users) {
+        const userSessions = await this.db.selectUserSessions(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
-      users: this.db.users.map(u => u.toJSONForBrowser(hideRootToken, true))
     })
   }
 

server/objects/PlaybackSession.js

@@ -1,6 +1,5 @@
 const date = require('../libs/dateAndTime')
 const { getId } = require('../utils/index')
-const { PlayMethod } = require('../utils/constants')
 const BookMetadata = require('./metadata/BookMetadata')
 const PodcastMetadata = require('./metadata/PodcastMetadata')
 const DeviceInfo = require('./DeviceInfo')