@budibase/worker 3.12.13 → 3.12.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.12.13",
+  "version": "3.12.15",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -113,5 +113,5 @@
       }
     }
   },
-  "gitHead": "3b8f23325e52fad7328a51218d61c171232d9e02"
+  "gitHead": "e773b5a964aab33ff99a5fea0aa40f16dbfaa2ea"
 }

package/src/api/controllers/global/auth.ts

@@ -53,12 +53,20 @@ async function passportCallback(
     return ctx.throw(403, info ? info : "Unauthorized")
   }
 
-  const token = await authSdk.loginUser(user)
+  const loginResult = await authSdk.loginUser(user)
 
   // set a cookie for browser access
-  setCookie(ctx, token, Cookie.Auth, { sign: false })
+  setCookie(ctx, loginResult.token, Cookie.Auth, { sign: false })
   // set the token in a header as well for APIs
-  ctx.set(Header.TOKEN, token)
+  ctx.set(Header.TOKEN, loginResult.token)
+
+  // add session invalidation info to response headers for frontend to handle
+  if (loginResult.invalidatedSessionCount > 0) {
+    ctx.set(
+      "X-Session-Invalidated-Count",
+      loginResult.invalidatedSessionCount.toString()
+    )
+  }
 }
 
 export const login = async (

package/src/environment.ts

@@ -38,6 +38,8 @@ const environment = {
   COUCH_DB_URL: process.env.COUCH_DB_URL,
   REDIS_URL: process.env.REDIS_URL,
   ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
+  INTERNAL_ACCOUNT_PORTAL_URL:
+    process.env.INTERNAL_ACCOUNT_PORTAL_URL || process.env.ACCOUNT_PORTAL_URL,
   PLATFORM_URL: process.env.PLATFORM_URL,
   APPS_URL: process.env.APPS_URL,
   // ports

package/src/sdk/auth/auth.ts

@@ -18,12 +18,13 @@ import * as emails from "../../utilities/email"
 export async function loginUser(user: User) {
   const sessionId = coreUtils.newid()
   const tenantId = tenancy.getTenantId()
-  await sessions.createASession(user._id!, {
+  const sessionResult = await sessions.createASession(user._id!, {
     sessionId,
     tenantId,
     email: user.email,
   })
-  return jwt.sign(
+
+  const token = jwt.sign(
     {
       userId: user._id,
       sessionId,
@@ -32,6 +33,11 @@ export async function loginUser(user: User) {
     },
     coreEnv.JWT_SECRET!
   )
+
+  return {
+    token,
+    invalidatedSessionCount: sessionResult.invalidatedSessionCount,
+  }
 }
 
 export async function logout(opts: PlatformLogoutOpts) {

package/src/sdk/auth/tests/auth.spec.ts

@@ -68,5 +68,25 @@ describe("auth", () => {
         expect(await sessions.getSessionsForUser(user._id!)).toHaveLength(0)
       })
     })
+
+    it("loginUser should return session invalidation count", async () => {
+      await context.doInTenant(structures.tenant.id(), async () => {
+        const user = await config.createUser()
+
+        const loginResult1 = await loginUser(user)
+        expect(loginResult1.invalidatedSessionCount).toBe(0)
+
+        const loginResult2 = await loginUser(user)
+        expect(loginResult2.invalidatedSessionCount).toBe(0)
+
+        const loginResult3 = await loginUser(user)
+        expect(loginResult3.invalidatedSessionCount).toBe(0)
+
+        const loginResult4 = await loginUser(user)
+        expect(loginResult4.invalidatedSessionCount).toBe(1)
+
+        expect(await sessions.getSessionsForUser(user._id!)).toHaveLength(3)
+      })
+    })
   })
 })