@budibase/worker 2.29.28 → 2.29.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.29.28",
+  "version": "2.29.30",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.29.28",
-    "@budibase/pro": "2.29.28",
-    "@budibase/string-templates": "2.29.28",
-    "@budibase/types": "2.29.28",
+    "@budibase/backend-core": "2.29.30",
+    "@budibase/pro": "2.29.30",
+    "@budibase/string-templates": "2.29.30",
+    "@budibase/types": "2.29.30",
     "@koa/router": "8.0.8",
     "@techpass/passport-openidconnect": "0.3.3",
     "@types/global-agent": "2.1.1",
@@ -107,5 +107,5 @@
       }
     }
   },
-  "gitHead": "59c06abf03668faf54c352e75b33880c763c2737"
+  "gitHead": "189394af7aa7280f434d1753a4bb04b755e3941a"
 }

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

@@ -1,6 +1,6 @@
 import * as userSdk from "../../../sdk/users"
 import {
-  featureFlags,
+  features,
   tenancy,
   db as dbCore,
   utils,
@@ -104,8 +104,8 @@ export async function getSelf(ctx: any) {
   ctx.body = await groups.enrichUserRolesFromGroups(user)
 
   // add the feature flags for this tenant
-  const tenantId = tenancy.getTenantId()
-  ctx.body.featureFlags = featureFlags.getTenantFeatureFlags(tenantId)
+  const flags = await features.fetch()
+  ctx.body.flags = flags
 
   addSessionAttributesToUser(ctx)
 }

package/src/environment.ts

@@ -19,8 +19,6 @@ function parseIntSafe(number: any) {
 }
 
 const environment = {
-  // features
-  WORKER_FEATURES: process.env.WORKER_FEATURES,
   // auth
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,

package/src/sdk/tenants/tenants.ts

@@ -48,10 +48,13 @@ async function removeTenantUsers(tenantId: string) {
   try {
     const allUsers = await getTenantUsers(tenantId)
     const allEmails = allUsers.rows.map((row: any) => row.doc.email)
+    const allSsoIds = allUsers.rows
+      .map((row: any) => row.doc.ssoId)
+      .filter(id => !!id)
 
     // get the id and email doc ids
     let keys = allUsers.rows.map((row: any) => row.id)
-    keys = keys.concat(allEmails)
+    keys = keys.concat(allEmails).concat(allSsoIds)
 
     const platformDb = platform.getPlatformDB()
 

package/src/features.ts

@@ -1,13 +0,0 @@
-import { features } from "@budibase/backend-core"
-import env from "./environment"
-
-enum WorkerFeature {}
-
-const featureList: WorkerFeature[] = features.processFeatureEnvVar(
-  Object.values(WorkerFeature),
-  env.WORKER_FEATURES
-)
-
-export function isFeatureEnabled(feature: WorkerFeature) {
-  return featureList.includes(feature)
-}