encapsulate global logout function

packages/auth/src/utils.js

@@ -240,23 +240,21 @@ exports.saveUser = async (
 /**
  * Logs a user out from budibase. Re-used across account portal and builder.
  */
-exports.platformLogout = async ({
+exports.platformLogout = async ({ ctx, userId, keepActiveSession }) => {
-  ctx,
+  if (!ctx) throw new Error("Koa context must be supplied to logout.")
-  userId,
+
-  sessionId,
+  const currentSession = this.getCookie(ctx, Cookies.Auth)
-  keepActiveSession,
-}) => {
   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)
   }
-  }
 
   await invalidateSessions(
     userId,

packages/worker/src/api/controllers/global/users.js

@@ -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,
     })
   }