@budibase/worker 3.33.1 → 3.33.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.33.1",
+  "version": "3.33.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -91,5 +91,5 @@
     "supertest": "6.3.3",
     "timekeeper": "2.2.0"
   },
-  "gitHead": "7e37f4dca78aaab158a4fa07ba631720003da6b3"
+  "gitHead": "636f2bfa98c45e71c604b7a655ddedb16871dd85"
 }

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

@@ -777,27 +777,52 @@ export const inviteAccept = async (
           resolvedTenantId
         )
         const user = await tenancy.doInTenant(info.tenantId, async () => {
+          const appRoles = info.apps || {}
+          const creatorAppsFromRoles = Object.keys(appRoles).filter(
+            appId => appRoles[appId] === "CREATOR"
+          )
+
+          const builderApps = [
+            ...(info?.builder?.apps || []),
+            ...creatorAppsFromRoles,
+          ]
+          const uniqueBuilderApps = [...new Set(builderApps)]
+          const hasCreatorPerms =
+            !!info?.builder?.creator || creatorAppsFromRoles.length > 0
+
           let request: any = {
             firstName,
             lastName,
             password,
             email,
             admin: { global: info?.admin?.global || false },
-            roles: info.apps,
+            roles: appRoles,
             tenantId: info.tenantId,
           }
-          const builder: { global: boolean; apps?: string[] } = {
+          const builder: {
+            global: boolean
+            creator?: boolean
+            apps?: string[]
+          } = {
             global: info?.builder?.global || false,
           }
 
-          if (info?.builder?.apps) {
-            builder.apps = info.builder.apps
-            request.builder = builder
+          if (hasCreatorPerms) {
+            builder.creator = true
+          }
+          if (uniqueBuilderApps.length) {
+            builder.apps = uniqueBuilderApps
           }
-          delete info.apps
+
+          const cleanedInviteInfo = { ...info }
+          delete cleanedInviteInfo.apps
+          delete cleanedInviteInfo.builder
           request = {
             ...request,
-            ...info,
+            ...cleanedInviteInfo,
+          }
+          if (info?.builder || hasCreatorPerms || uniqueBuilderApps.length) {
+            request.builder = builder
           }
 
           const saved = await userSdk.db.save(request)

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

@@ -374,6 +374,36 @@ describe("/api/global/users", () => {
       expect(events.user.invited).toHaveBeenCalledTimes(2)
     })
 
+    it("should persist invited creator app access when accepting the invite", async () => {
+      const email = structures.users.newEmail()
+      const workspaceId = "app_creator_invite_workspace"
+      const request = [
+        {
+          email,
+          userInfo: {
+            builder: { creator: true },
+            apps: {
+              [workspaceId]: "CREATOR",
+            },
+          },
+        },
+      ]
+
+      await config.api.users.sendMultiUserInvite(request)
+
+      const emailCall = sendMailMock.mock.calls[0][0]
+      const code = emailCall.html
+        .split("http://localhost:10000/builder/invite?code=")[1]
+        .split('"')[0]
+        .split("&")[0]
+      await config.api.users.acceptInvite(code)
+
+      const user = await config.getUser(email)
+      expect(user?.roles?.[workspaceId]).toBe("CREATOR")
+      expect(user?.builder?.creator).toBe(true)
+      expect(user?.builder?.apps).toEqual([workspaceId])
+    })
+
     it("should not be able to generate an invitation for existing user", async () => {
       const request = [{ email: config.user!.email, userInfo: {} }]