@budibase/worker 2.9.33-alpha.1 → 2.9.33

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:14-alpine
 
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.9.33-alpha.1",
+  "version": "2.9.33",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -38,10 +38,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.9.33-alpha.1",
-    "@budibase/pro": "2.9.33-alpha.1",
-    "@budibase/string-templates": "2.9.33-alpha.1",
-    "@budibase/types": "2.9.33-alpha.1",
+    "@budibase/backend-core": "2.9.33",
+    "@budibase/pro": "2.9.33",
+    "@budibase/string-templates": "2.9.33",
+    "@budibase/types": "2.9.33",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -103,20 +103,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "nx": {
-    "targets": {
-      "dev:builder": {
-        "dependsOn": [
-          {
-            "comment": "Required for pro usage when submodule not loaded",
-            "projects": [
-              "@budibase/backend-core"
-            ],
-            "target": "build"
-          }
-        ]
-      }
-    }
-  },
-  "gitHead": "0523660bd2e224d1dc5f077cad6ab958540c6583"
+  "gitHead": "4e465ce84f0d2fb3391981fcfc2d6bee3cbff77e"
 }

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

@@ -48,7 +48,7 @@ export async function generateAPIKey(ctx: any) {
   } catch (err) {
     devInfo = { _id: id, userId }
   }
-  devInfo.apiKey = apiKey
+  devInfo.apiKey = await apiKey
   await db.put(devInfo)
   ctx.body = cleanupDevInfo(devInfo)
 }
@@ -63,7 +63,7 @@ export async function fetchAPIKey(ctx: any) {
     devInfo = {
       _id: id,
       userId: ctx.user._id,
-      apiKey: newApiKey(),
+      apiKey: await newApiKey(),
     }
     await db.put(devInfo)
   }

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

@@ -25,11 +25,11 @@ import {
 import {
   accounts,
   cache,
-  ErrorCode,
   events,
   migrations,
-  platform,
   tenancy,
+  platform,
+  ErrorCode,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import { isEmailConfigured } from "../../../utilities/email"
@@ -280,7 +280,7 @@ export const onboardUsers = async (ctx: Ctx<InviteUsersRequest>) => {
     let bulkCreateReponse = await userSdk.db.bulkCreate(users, [])
 
     // Apply temporary credentials
-    ctx.body = {
+    let createWithCredentials = {
       ...bulkCreateReponse,
       successful: bulkCreateReponse?.successful.map(user => {
         return {
@@ -290,6 +290,8 @@ export const onboardUsers = async (ctx: Ctx<InviteUsersRequest>) => {
       }),
       created: true,
     }
+
+    ctx.body = createWithCredentials
   } else {
     ctx.throw(400, "User onboarding failed")
   }

package/src/api/routes/global/tests/appBuilder.spec.ts

@@ -33,9 +33,7 @@ describe("/api/global/users/:userId/app/builder", () => {
         MOCK_APP_ID,
         400
       )
-      expect(resp.body.message).toContain(
-        "appBuilders are not currently enabled"
-      )
+      expect(resp.body.message).toContain("Feature not enabled")
     })
   })
 

package/src/api/routes/global/tests/scim.spec.ts

@@ -10,8 +10,6 @@ import {
 import { TestConfiguration } from "../../../../tests"
 import { events } from "@budibase/backend-core"
 
-jest.setTimeout(30000)
-
 mocks.licenses.useScimIntegration()
 
 describe("scim", () => {

package/src/environment.ts

@@ -31,8 +31,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/tests/jestEnv.ts

@@ -9,4 +9,4 @@ process.env.MINIO_SECRET_KEY = "test"
 process.env.PLATFORM_URL = "http://localhost:10000"
 process.env.INTERNAL_API_KEY = "tet"
 process.env.DISABLE_ACCOUNT_PORTAL = "0"
-process.env.MOCK_REDIS = "1"
+process.env.REDIS_PASSWORD = "budibase"

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