@budibase/worker 3.20.4 → 3.20.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.20.4",
+  "version": "3.20.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -109,5 +109,5 @@
       }
     }
   },
-  "gitHead": "00bd6ef4645dfb893f5a83ec78571181ead1f084"
+  "gitHead": "91ae7d82b9b1311754548f1447db8039b592f6b9"
 }

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

@@ -669,16 +669,19 @@ async function handleUserWorkspacePermission(
     throw new HTTPError("Feature not enabled, please check license", 400)
   }
 
-  const appCreator = Object.entries(existingUser.roles)
+  const creatorForApps = Object.entries(existingUser.roles)
     .filter(([_appId, role]) => role === "CREATOR")
     .map(([appId]) => appId)
-  if (!appCreator.length && existingUser.builder) {
-    delete existingUser.builder.creator
-    delete existingUser.builder.apps
-  } else if (appCreator.length) {
+
+  const shouldHaveCreatorRole =
+    existingUser.builder?.creator || creatorForApps.length
+  if (!shouldHaveCreatorRole) {
+    delete existingUser.builder?.creator
+    delete existingUser.builder?.apps
+  } else {
     existingUser.builder ??= {}
     existingUser.builder.creator = true
-    existingUser.builder.apps = appCreator
+    existingUser.builder.apps = creatorForApps
   }
 
   const user = await userSdk.db.save(existingUser, {

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

@@ -1015,27 +1015,50 @@ describe("/api/global/users", () => {
       expect(updatedUser.builder?.creator).toBe(true)
       expect(updatedUser.builder?.apps).toEqual([workspaceId])
     })
+    it("should keep builder creator flag when assigning non-CREATOR roles", async () => {
+      const builderUser = await config.createUser({
+        builder: {
+          creator: true,
+        },
+      })
+      const workspaceId = "app_creator_preserve"
 
-    it("should remove CREATOR role and clean up builder properties when no creator apps remain", async () => {
-      mocks.licenses.useAppBuilders()
-      const user = await config.createUser()
-      const workspaceId = "app_123456789"
-
-      // First assign CREATOR role
       const res = await config.withApp(workspaceId, () =>
-        config.api.users.addUserToWorkspace(user._id!, user._rev!, "CREATOR")
+        config.api.users.addUserToWorkspace(
+          builderUser._id!,
+          builderUser._rev!,
+          "BASIC"
+        )
       )
-      user._rev = res.body._rev
+      builderUser._rev = res.body._rev
 
-      // Then remove the user from workspace
-      await config.withApp(workspaceId, () =>
-        config.api.users.removeUserFromWorkspace(user._id!, user._rev!)
+      const updatedUser = await config.getUser(builderUser.email)
+      expect(updatedUser.roles[workspaceId]).toBe("BASIC")
+      expect(updatedUser.builder?.creator).toBe(true)
+    })
+
+    it("should keep builder creator flag when assigning CREATOR roles", async () => {
+      featureMocks.licenses.useAppBuilders()
+
+      const builderUser = await config.createUser({
+        builder: {
+          creator: true,
+        },
+      })
+      const workspaceId = "app_creator_preserve"
+
+      const res = await config.withApp(workspaceId, () =>
+        config.api.users.addUserToWorkspace(
+          builderUser._id!,
+          builderUser._rev!,
+          "CREATOR"
+        )
       )
+      builderUser._rev = res.body._rev
 
-      const updatedUser = await config.getUser(user.email)
-      expect(updatedUser.roles[workspaceId]).toBeUndefined()
-      expect(updatedUser.builder?.creator).toBeUndefined()
-      expect(updatedUser.builder?.apps).toBeUndefined()
+      const updatedUser = await config.getUser(builderUser.email)
+      expect(updatedUser.roles[workspaceId]).toBe("CREATOR")
+      expect(updatedUser.builder?.creator).toBe(true)
     })
 
     it("should maintain builder properties when user has multiple CREATOR roles", async () => {