@budibase/worker 1.2.13 → 1.2.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.13",
+  "version": "1.2.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.2.13",
-    "@budibase/pro": "1.2.12",
-    "@budibase/string-templates": "^1.2.13",
-    "@budibase/types": "^1.2.13",
+    "@budibase/backend-core": "^1.2.16",
+    "@budibase/pro": "1.2.15",
+    "@budibase/string-templates": "^1.2.16",
+    "@budibase/types": "^1.2.16",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -101,5 +101,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "e621f6075692dbf38e824fe569616de51d7206cb"
+  "gitHead": "012a0d114ceb5687cf87e206dd29e01db708a7cf"
 }

package/src/api/routes/index.js

@@ -6,7 +6,6 @@ const templateRoutes = require("./global/templates")
 const emailRoutes = require("./global/email")
 const authRoutes = require("./global/auth")
 const roleRoutes = require("./global/roles")
-const sessionRoutes = require("./global/sessions")
 const environmentRoutes = require("./system/environment")
 const tenantsRoutes = require("./system/tenants")
 const statusRoutes = require("./system/status")
@@ -23,7 +22,6 @@ exports.routes = [
   templateRoutes,
   tenantsRoutes,
   emailRoutes,
-  sessionRoutes,
   roleRoutes,
   environmentRoutes,
   statusRoutes,

package/src/environment.js

@@ -61,6 +61,7 @@ module.exports = {
   SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
   // other
   CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
+  SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value

package/src/sdk/users/users.ts

@@ -370,6 +370,7 @@ export const bulkDelete = async (userIds: any) => {
 export const destroy = async (id: string, currentUser: any) => {
   const db = tenancy.getGlobalDB()
   const dbUser = await db.get(id)
+  const userId = dbUser._id as string
   let groups = dbUser.userGroups
 
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
@@ -387,7 +388,7 @@ export const destroy = async (id: string, currentUser: any) => {
 
   await deprovisioning.removeUserFromInfoDB(dbUser)
 
-  await db.remove(dbUser._id, dbUser._rev)
+  await db.remove(userId, dbUser._rev)
 
   if (groups) {
     await groupUtils.deleteGroupUsers(groups, dbUser)
@@ -395,17 +396,18 @@ export const destroy = async (id: string, currentUser: any) => {
 
   await eventHelpers.handleDeleteEvents(dbUser)
   await quotas.removeUser(dbUser)
-  await cache.user.invalidateUser(dbUser._id)
-  await sessions.invalidateSessions(dbUser._id)
+  await cache.user.invalidateUser(userId)
+  await sessions.invalidateSessions(userId, { reason: "deletion" })
   // let server know to sync user
-  await apps.syncUserInApps(dbUser._id)
+  await apps.syncUserInApps(userId)
 }
 
 const bulkDeleteProcessing = async (dbUser: User) => {
+  const userId = dbUser._id as string
   await deprovisioning.removeUserFromInfoDB(dbUser)
   await eventHelpers.handleDeleteEvents(dbUser)
-  await cache.user.invalidateUser(dbUser._id)
-  await sessions.invalidateSessions(dbUser._id)
+  await cache.user.invalidateUser(userId)
+  await sessions.invalidateSessions(userId, { reason: "bulk-deletion" })
   // let server know to sync user
-  await apps.syncUserInApps(dbUser._id)
+  await apps.syncUserInApps(userId)
 }

package/src/api/controllers/global/sessions.js

@@ -1,37 +0,0 @@
-const {
-  getAllSessions,
-  getUserSessions,
-  invalidateSessions,
-} = require("@budibase/backend-core/sessions")
-
-exports.fetch = async ctx => {
-  ctx.body = await getAllSessions()
-}
-
-exports.find = async ctx => {
-  const { userId } = ctx.params
-  const sessions = await getUserSessions(userId)
-  ctx.body = sessions.map(session => session.value)
-}
-
-exports.invalidateUser = async ctx => {
-  const { userId } = ctx.params
-  await invalidateSessions(userId)
-  ctx.body = {
-    message: "User sessions invalidated",
-  }
-}
-
-exports.selfSessions = async ctx => {
-  const userId = ctx.user._id
-  ctx.body = await getUserSessions(userId)
-}
-
-exports.invalidateSession = async ctx => {
-  const userId = ctx.user._id
-  const { sessionId } = ctx.params
-  await invalidateSessions(userId, sessionId)
-  ctx.body = {
-    message: "Session invalidated successfully.",
-  }
-}

package/src/api/routes/global/sessions.js

@@ -1,14 +0,0 @@
-const Router = require("@koa/router")
-const controller = require("../../controllers/global/sessions")
-const { adminOnly } = require("@budibase/backend-core/auth")
-
-const router = Router()
-
-router
-  .get("/api/global/sessions", adminOnly, controller.fetch)
-  .get("/api/global/sessions/self", controller.selfSessions)
-  .get("/api/global/sessions/:userId", adminOnly, controller.find)
-  .delete("/api/global/sessions/:userId", adminOnly, controller.invalidateUser)
-  .delete("/api/global/sessions/self/:sessionId", controller.invalidateSession)
-
-module.exports = router