CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-02 18:44:54 +12:00
Code Issues Projects Releases Wiki Activity

encapsulate global logout function

Browse source
This commit is contained in:
Martin McKeaveney 2021-10-13 12:26:26 +01:00
parent ed9574b815
commit 81f49dcdf1
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/auth/src/utils.js
View file

@ -240,22 +240,20 @@ exports.saveUser = async (
/**
* Logs a user out from budibase. Re-used across account portal and builder.
*/
exports.platformLogout = async ({
ctx,
userId,
sessionId,
keepActiveSession,
}) => {
exports.platformLogout = async ({ ctx, userId, keepActiveSession }) => {
if (!ctx) throw new Error("Koa context must be supplied to logout.")
const currentSession = this.getCookie(ctx, Cookies.Auth)
let sessions = await getUserSessions(userId)
if (keepActiveSession) {
sessions = sessions.filter(session => session.sessionId !== sessionId)
sessions = sessions.filter(
session => session.sessionId !== currentSession.sessionId
)
} else {
if (ctx) {
// clear cookies
this.clearCookie(ctx, Cookies.Auth)
this.clearCookie(ctx, Cookies.CurrentApp)
}
// clear cookies
this.clearCookie(ctx, Cookies.Auth)
this.clearCookie(ctx, Cookies.CurrentApp)
}
await invalidateSessions(

5
packages/worker/src/api/controllers/global/users.js
View file

@ -3,9 +3,8 @@ const {
StaticDatabases,
generateNewUsageQuotaDoc,
} = require("@budibase/auth/db")
const { hash, getGlobalUserByEmail, saveUser, platformLogout, getCookie } =
const { hash, getGlobalUserByEmail, saveUser, platformLogout } =
require("@budibase/auth").utils
const { Cookies } = require("@budibase/auth").constants
const { EmailTemplatePurpose } = require("../../../constants")
const { checkInviteCode } = require("../../../utilities/redis")
const { sendEmail } = require("../../../utilities/email")
@ -178,11 +177,9 @@ exports.updateSelf = async ctx => {
// changing password
ctx.request.body.password = await hash(ctx.request.body.password)
// Log all other sessions out apart from the current one
const authCookie = getCookie(ctx, Cookies.Auth)
await platformLogout({
ctx,
userId: ctx.user._id,
sessionId: authCookie.sessionId,
keepActiveSession: true,
})
}