@budibase/worker 2.9.33-alpha.1 → 2.9.33-alpha.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.9.33-alpha.1",
+  "version": "2.9.33-alpha.11",
   "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-alpha.11",
+    "@budibase/pro": "2.9.33-alpha.11",
+    "@budibase/string-templates": "2.9.33-alpha.11",
+    "@budibase/types": "2.9.33-alpha.11",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -118,5 +118,5 @@
       }
     }
   },
-  "gitHead": "0523660bd2e224d1dc5f077cad6ab958540c6583"
+  "gitHead": "c373a4bc9bd79d809270ca272235083a2d771cb3"
 }

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

@@ -266,14 +266,17 @@ export const onboardUsers = async (ctx: Ctx<InviteUsersRequest>) => {
 
       // Temp password to be passed to the user.
       createdPasswords[invite.email] = password
-
+      let builder: { global: boolean; apps?: string[] } = { global: false }
+      if (invite.userInfo.appBuilders) {
+        builder.apps = invite.userInfo.appBuilders
+      }
       return {
         email: invite.email,
         password,
         forceResetPassword: true,
         roles: invite.userInfo.apps,
         admin: { global: false },
-        builder: { global: false },
+        builder,
         tenantId: tenancy.getTenantId(),
       }
     })
@@ -368,6 +371,15 @@ export const updateInvite = async (ctx: any) => {
     ...invite,
   }
 
+  if (!updateBody?.appBuilders || !updateBody.appBuilders?.length) {
+    updated.info.appBuilders = []
+  } else {
+    updated.info.appBuilders = [
+      ...(invite.info.appBuilders ?? []),
+      ...updateBody.appBuilders,
+    ]
+  }
+
   if (!updateBody?.apps || !Object.keys(updateBody?.apps).length) {
     updated.info.apps = []
   } else {
@@ -392,7 +404,7 @@ export const inviteAccept = async (
     // info is an extension of the user object that was stored by global
     const { email, info }: any = await checkInviteCode(inviteCode)
     const user = await tenancy.doInTenant(info.tenantId, async () => {
-      let request = {
+      let request: any = {
         firstName,
         lastName,
         password,
@@ -400,9 +412,14 @@ export const inviteAccept = async (
         roles: info.apps,
         tenantId: info.tenantId,
       }
+      let builder: { global: boolean; apps?: string[] } = { global: false }
 
+      if (info.appBuilders) {
+        builder.apps = info.appBuilders
+        request.builder = builder
+        delete info.appBuilders
+      }
       delete info.apps
-
       request = {
         ...request,
         ...info,