diff --git a/client/pages/account.vue b/client/pages/account.vue index 8323772a5..c371a969d 100644 --- a/client/pages/account.vue +++ b/client/pages/account.vue @@ -77,7 +77,8 @@ {{ $strings.LabelDeviceInfo }} {{ $strings.LabelIpAddress }} - {{ $strings.LabelLastUpdate }} + {{ $strings.LabelLastUpdate }} + @@ -91,13 +92,23 @@

{{ session.ipAddress || '-' }}

- +

{{ $dateDistanceFromNow(session.updatedAt) }}

 + +
+ +
+ +
+ +

{{ $getString('LabelPaginationPageXOfY', [authSessionsPage + 1, authSessionsNumPages]) }}

+ +
@@ -122,6 +133,11 @@ export default { changingPassword: false, loggingOut: false, authSessions: [], + authSessionsPage: 0, + authSessionsNumPages: 0, + authSessionsItemsPerPage: 10, + loadingAuthSessions: false, + deletingSessionId: null, selectedLanguage: '', newEReaderDevice: { name: '', @@ -285,15 +301,67 @@ export default { ereaderDevicesUpdated(ereaderDevices) { this.ereaderDevices = ereaderDevices }, - loadAuthSessions() { + loadAuthSessions(page = 0) { + if (this.loadingAuthSessions) return + if (page < 0) return + if (this.authSessionsNumPages > 0 && page > this.authSessionsNumPages - 1) return + + this.loadingAuthSessions = true this.$axios - .$get('/api/me/sessions') + .$get(`/api/me/sessions?page=${page}&itemsPerPage=${this.authSessionsItemsPerPage}`) .then((data) => { this.authSessions = data.sessions || [] + this.authSessionsPage = data.page ?? page + this.authSessionsNumPages = data.numPages ?? 0 }) .catch((error) => { console.error('Failed to load sessions', error) }) + .finally(() => { + this.loadingAuthSessions = false + }) + }, + prevAuthSessionsPage() { + if (this.authSessionsPage <= 0) return + this.loadAuthSessions(this.authSessionsPage - 1) + }, + nextAuthSessionsPage() { + if (this.authSessionsPage >= this.authSessionsNumPages - 1) return + this.loadAuthSessions(this.authSessionsPage + 1) + }, + deleteAuthSessionClick(session) { + this.$store.commit('globals/setConfirmPrompt', { + message: this.$getString('MessageConfirmLogoutDevice', [this.getSessionDeviceLabel(session)]), + callback: (confirmed) => { + if (confirmed) this.deleteAuthSession(session) + }, + type: 'yesNo' + }) + }, + deleteAuthSession(session) { + // Call logout instead for current session + if (session.current) { + this.logout(false) + return + } + + this.deletingSessionId = session.id + this.$axios + .$delete(`/api/me/sessions/${session.id}`) + .then(() => { + if (this.authSessions.length === 1 && this.authSessionsPage > 0) { + this.loadAuthSessions(this.authSessionsPage - 1) + } else { + this.loadAuthSessions(this.authSessionsPage) + } + }) + .catch((error) => { + console.error('Failed to delete session', error) + this.$toast.error(this.$strings.ToastFailedToDelete) + }) + .finally(() => { + this.deletingSessionId = null + }) }, getSessionDeviceLabel(session) { const deviceInfo = session.deviceInfo diff --git a/client/strings/en-us.json b/client/strings/en-us.json index 684927124..d9d6325e4 100644 --- a/client/strings/en-us.json +++ b/client/strings/en-us.json @@ -777,6 +777,7 @@ "MessageConfirmDeleteSession": "Are you sure you want to delete this session?", "MessageConfirmEmbedMetadataInAudioFiles": "Are you sure you want to embed metadata in {0} audio files?", "MessageConfirmForceReScan": "Are you sure you want to force re-scan?", + "MessageConfirmLogoutDevice": "Are you sure you want to log out of \"{0}\"?", "MessageConfirmMarkAllEpisodesFinished": "Are you sure you want to mark all episodes as finished?", "MessageConfirmMarkAllEpisodesNotFinished": "Are you sure you want to mark all episodes as not finished?", "MessageConfirmMarkItemFinished": "Are you sure you want to mark \"{0}\" as finished?", diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js index b8f378bfa..ca600d373 100644 --- a/server/controllers/MeController.js +++ b/server/controllers/MeController.js @@ -4,7 +4,7 @@ const Logger = require('../Logger') const SocketAuthority = require('../SocketAuthority') const Database = require('../Database') const { sort } = require('../libs/fastSort') -const { toNumber, isNullOrNaN } = require('../utils/index') +const { toNumber, isNullOrNaN, isUUID } = require('../utils/index') const userStats = require('../utils/queries/userStats') const parseUserAgent = require('../utils/parsers/parseUserAgent') @@ -35,21 +35,30 @@ class MeController { * @param {Response} res */ async getSessions(req, res) { + const page = Math.max(0, toNumber(req.query.page, 0)) + const itemsPerPage = Math.max(1, toNumber(req.query.itemsPerPage, 10)) + if (req.user.isGuest) { - return res.json({ sessions: [] }) + return res.json({ sessions: [], total: 0, numPages: 0, page, itemsPerPage }) } const refreshToken = req.cookies.refresh_token || req.headers['x-refresh-token'] - const sessions = await Database.sessionModel.findAll({ + const { rows, count } = await Database.sessionModel.findAndCountAll({ where: { userId: req.user.id, expiresAt: { [Op.gt]: new Date() } }, - order: [['updatedAt', 'DESC']] + order: [['updatedAt', 'DESC']], + limit: itemsPerPage, + offset: itemsPerPage * page }) res.json({ - sessions: sessions.map((session) => ({ + total: count, + numPages: Math.ceil(count / itemsPerPage), + page, + itemsPerPage, + sessions: rows.map((session) => ({ id: session.id, ipAddress: session.ipAddress, userAgent: session.userAgent, @@ -62,6 +71,38 @@ class MeController { }) } + /** + * DELETE: /api/me/sessions/:id + * + * @param {RequestWithUser} req + * @param {Response} res + */ + async deleteSession(req, res) { + if (req.user.isGuest) { + return res.sendStatus(403) + } + + if (!isUUID(req.params.id)) { + return res.sendStatus(400) + } + + const session = await Database.sessionModel.findOne({ + where: { + id: req.params.id, + userId: req.user.id + } + }) + + if (!session) { + return res.sendStatus(404) + } + + await Database.sessionModel.destroy({ where: { id: session.id } }) + Logger.info(`[MeController] User ${req.user.username} deleted auth session ${session.id}`) + + res.sendStatus(200) + } + /** * GET: /api/me/progress * diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js index 3ade851bb..7c89126b2 100644 --- a/server/routers/ApiRouter.js +++ b/server/routers/ApiRouter.js @@ -172,6 +172,7 @@ class ApiRouter { // this.router.get('/me', MeController.getCurrentUser.bind(this)) this.router.get('/me/sessions', MeController.getSessions.bind(this)) + this.router.delete('/me/sessions/:id', MeController.deleteSession.bind(this)) this.router.get('/me/progress', MeController.getAllMediaProgress.bind(this)) this.router.get('/me/bookmarks', MeController.getAllBookmarks.bind(this)) this.router.get('/me/bookmarks/:libraryItemId', MeController.getBookmarksForLibraryItem.bind(this))