@budibase/worker 3.30.0 → 3.30.2

package/Dockerfile

@@ -7,7 +7,20 @@ LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-ho
 
 
 # handle node-gyp
-RUN apk add --no-cache --virtual .gyp python3 make g++ jq
+RUN apk add --no-cache --virtual .gyp python3 make g++ \
+    && apk add --no-cache \
+        jq \
+        procps \
+        iproute2 \
+        curl \
+        bind-tools \
+        netcat-openbsd \
+        openssl \
+        lsof \
+        strace \
+        less \
+        coreutils \
+        tzdata
 RUN yarn global add pm2
 
 WORKDIR /

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.30.0",
+  "version": "3.30.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -109,5 +109,5 @@
       }
     }
   },
-  "gitHead": "58456cc695d2c71a354bcf5c064943b247ad4969"
+  "gitHead": "13dbc5b25ef09b4c6ae6ef16c6e16d7ef37f5589"
 }

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

@@ -20,9 +20,11 @@ export async function save(ctx: UserCtx) {
 
   // don't allow updating the roles through this endpoint
   delete group.roles
+  delete group.builder
   if (group._id) {
     const oldGroup = await groups.get(group._id)
     group.roles = oldGroup.roles
+    group.builder = oldGroup.builder
     group.scimInfo = oldGroup.scimInfo
   }
   const response = await groups.save(group)

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

@@ -4,13 +4,12 @@ import {
   context,
   db,
   events,
-  HTTPError,
   locks,
   platform,
   tenancy,
   users,
 } from "@budibase/backend-core"
-import { features, groups as proGroups } from "@budibase/pro"
+import { groups as proGroups } from "@budibase/pro"
 import { BpmStatusKey, BpmStatusValue, utils } from "@budibase/shared-core"
 import {
   AcceptUserInviteRequest,
@@ -800,10 +799,6 @@ async function handleUserWorkspacePermission(
     delete existingUser.roles[prodWorkspaceId]
   }
 
-  if (role === "CREATOR" && !(await features.isAppBuildersEnabled())) {
-    throw new HTTPError("Feature not enabled, please check license", 400)
-  }
-
   const creatorForApps = Object.entries(existingUser.roles)
     .filter(([_appId, role]) => role === "CREATOR")
     .map(([appId]) => appId)

package/src/api/routes/global/groups.ts

@@ -19,6 +19,9 @@ function buildGroupSaveValidation() {
       users: Joi.array().optional(),
       apps: Joi.array().optional(),
       roles: Joi.object().optional(),
+      builder: Joi.object({
+        apps: Joi.array().items(Joi.string()).optional(),
+      }).optional(),
       createdAt: Joi.string().optional(),
       updatedAt: Joi.string().optional(),
     }).required()

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

@@ -104,6 +104,40 @@ describe("/api/global/groups", () => {
       expect(events.group.permissionsEdited).not.toHaveBeenCalled()
     })
 
+    it("should accept builder in save payload but not allow changing it", async () => {
+      const appId = "app_test123"
+      const updatedName = generator.guid()
+      const group = structures.groups.UserGroup()
+      const { body: savedGroup } = await config.api.groups.saveGroup(group)
+
+      await config.api.groups.updateGroupApps(savedGroup._id, {
+        add: [{ appId, roleId: "CREATOR" }],
+        remove: [],
+      })
+
+      const { body: groupWithBuilder } = await config.api.groups.find(
+        savedGroup._id
+      )
+      expect(groupWithBuilder.builder.apps).toEqual([appId])
+
+      await config.api.groups.saveGroup(
+        {
+          ...groupWithBuilder,
+          name: updatedName,
+          builder: {
+            apps: ["app_different"],
+          },
+        },
+        { expect: 200 }
+      )
+
+      const { body: updatedGroup } = await config.api.groups.find(
+        savedGroup._id
+      )
+      expect(updatedGroup.name).toEqual(updatedName)
+      expect(updatedGroup.builder.apps).toEqual([appId])
+    })
+
     describe("scim", () => {
       async function createScimGroup() {
         mocks.licenses.useScimIntegration()
@@ -451,7 +485,6 @@ describe("/api/global/groups", () => {
     let group: UserGroup
 
     beforeEach(async () => {
-      mocks.licenses.useAppBuilders()
       const groupResponse = await config.api.groups.saveGroup(
         structures.groups.UserGroup()
       )

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

@@ -1060,24 +1060,7 @@ describe("/api/global/users", () => {
   })
 
   describe("POST /api/global/users/:userId/permission/:role", () => {
-    it("should fail to assign CREATOR role when feature is not enabled", async () => {
-      const user = await config.createUser()
-      const workspaceId = "app_123456789"
-
-      const res = await config.withApp(workspaceId, () =>
-        config.api.users.addUserToWorkspace(
-          user._id!,
-          user._rev!,
-          "CREATOR",
-          400
-        )
-      )
-      expect(res.body.message).toBe("Feature not enabled, please check license")
-    })
-
     it("should assign CREATOR role and set builder properties", async () => {
-      featureMocks.licenses.useAppBuilders()
-
       const user = await config.createUser()
       const workspaceId = "app_123456789"
 
@@ -1113,8 +1096,6 @@ describe("/api/global/users", () => {
     })
 
     it("should keep builder creator flag when assigning CREATOR roles", async () => {
-      featureMocks.licenses.useAppBuilders()
-
       const builderUser = await config.createUser({
         builder: {
           creator: true,
@@ -1137,7 +1118,6 @@ describe("/api/global/users", () => {
     })
 
     it("should maintain builder properties when user has multiple CREATOR roles", async () => {
-      mocks.licenses.useAppBuilders()
       const user = await config.createUser()
       const workspaceId1 = "app_111111111"
       const workspaceId2 = "app_222222222"