@budibase/worker 3.13.8 → 3.13.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.13.8",
+  "version": "3.13.10",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -113,5 +113,5 @@
       }
     }
   },
-  "gitHead": "3550187f1ceddaa3d86735f514c3b771603ac596"
+  "gitHead": "9d6b86cc387bd1e3cc4ec8f3a1c7f8f3a94d1205"
 }

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

@@ -16,25 +16,27 @@ import {
 
 export async function fetch(ctx: Ctx<void, FetchGlobalRolesResponse>) {
   const tenantId = ctx.user!.tenantId
-  // always use the dev apps as they'll be most up to date (true)
-  const apps = (await dbCore.getAllApps({ tenantId, all: true })) as App[]
-  const promises = []
-  for (let app of apps) {
-    // use dev app IDs
-    promises.push(roles.getAllRoles(app.appId))
-  }
-  const roleList = await Promise.all(promises)
-  const response: any = {}
-  for (let app of apps) {
-    const deployedAppId = dbCore.getProdAppID(app.appId)
-    response[deployedAppId] = {
-      roles: roleList.shift(),
-      name: app.name,
-      version: app.version,
-      url: app.url,
+  await context.doInTenant(tenantId, async () => {
+    // always use the dev apps as they'll be most up to date (true)
+    const apps = await dbCore.getAllApps({ all: true })
+    const promises = []
+    for (let app of apps) {
+      // use dev app IDs
+      promises.push(roles.getAllRoles(app.appId))
     }
-  }
-  ctx.body = response
+    const roleList = await Promise.all(promises)
+    const response: any = {}
+    for (let app of apps) {
+      const deployedAppId = dbCore.getProdAppID(app.appId)
+      response[deployedAppId] = {
+        roles: roleList.shift(),
+        name: app.name,
+        version: app.version,
+        url: app.url,
+      }
+    }
+    ctx.body = response
+  })
 }
 
 export async function find(ctx: Ctx<void, FindGlobalRoleResponse>) {

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

@@ -7,6 +7,7 @@ import {
   AddSSoUserResponse,
   BulkUserRequest,
   BulkUserResponse,
+  ChangeTenantOwnerEmailRequest,
   CheckInviteResponse,
   CountUserResponse,
   CreateAdminUserRequest,
@@ -106,6 +107,31 @@ export const save = async (ctx: UserCtx<UnsavedUser, SaveUserResponse>) => {
   }
 }
 
+export const changeTenantOwnerEmail = async (
+  ctx: Ctx<ChangeTenantOwnerEmailRequest, void>
+) => {
+  const { newAccountEmail, originalEmail, tenantIds } = ctx.request.body
+  try {
+    for (const tenantId of tenantIds) {
+      await tenancy.doInTenant(tenantId, async () => {
+        const tenantUser = await userSdk.db.getUserByEmail(originalEmail)
+        if (!tenantUser) {
+          return
+        }
+        tenantUser.email = newAccountEmail
+        await userSdk.db.save(tenantUser, {
+          currentUserId: tenantUser._id,
+          isAccountHolder: true,
+          allowChangingEmail: true,
+        })
+      })
+    }
+    ctx.status = 200
+  } catch (err: any) {
+    ctx.throw(err.status || 400, err)
+  }
+}
+
 export const addSsoSupport = async (
   ctx: Ctx<AddSSoUserRequest, AddSSoUserResponse>
 ) => {

package/src/api/index.ts

@@ -120,6 +120,10 @@ const NO_TENANCY_ENDPOINTS = [
     route: "/api/global/users/accountholder",
     method: "GET",
   },
+  {
+    route: "/api/global/users/tenant/owner",
+    method: "PUT",
+  },
 ]
 
 // most public endpoints are gets, but some are posts

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

@@ -294,6 +294,23 @@ describe("/api/global/groups", () => {
     })
   })
 
+  describe("role filtering", () => {
+    it("should filter out roles for non-existent apps when enriching group", async () => {
+      const fakeAppId = "app_fake"
+      const group = structures.groups.UserGroup()
+
+      const { body: savedGroup } = await config.api.groups.saveGroup(group)
+      await config.api.groups.updateGroupApps(savedGroup._id, {
+        add: [{ appId: fakeAppId, roleId: "BASIC" }],
+      })
+      const { body: retrievedGroup } = await config.api.groups.find(
+        savedGroup._id
+      )
+
+      expect(Object.keys(retrievedGroup.roles)).not.toContain(fakeAppId)
+    })
+  })
+
   describe("with global builder role", () => {
     let builder: User
     let group: UserGroup

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

@@ -59,6 +59,16 @@ function buildInviteAcceptValidation() {
   }).required().unknown(true))
 }
 
+function buildChangeTenantOwnerEmailValidation() {
+  return auth.joiValidator.body(
+    Joi.object({
+      newAccountEmail: Joi.string().required(),
+      originalEmail: Joi.string().required(),
+      tenantIds: Joi.array().items(Joi.string()).required(),
+    }).required()
+  )
+}
+
 router
   .post(
     "/api/global/users",
@@ -140,5 +150,11 @@ router
   .get("/api/global/users/tenant/:id", controller.tenantUserLookup)
   // global endpoint but needs to come at end (blocks other endpoints otherwise)
   .get("/api/global/users/:id", auth.builderOrAdmin, controller.find)
+  .put(
+    "/api/global/users/tenant/owner",
+    cloudRestricted,
+    buildChangeTenantOwnerEmailValidation(),
+    controller.changeTenantOwnerEmail
+  )
 
 export default router

package/src/tests/api/groups.ts

@@ -1,4 +1,4 @@
-import { UserGroup } from "@budibase/types"
+import { UserGroup, UpdateGroupAppRequest } from "@budibase/types"
 import { TestAPI } from "./base"
 
 export class GroupsAPI extends TestAPI {
@@ -53,6 +53,19 @@ export class GroupsAPI extends TestAPI {
       .expect(expect)
   }
 
+  updateGroupApps = (
+    groupId: string,
+    body: UpdateGroupAppRequest,
+    { expect } = { expect: 200 }
+  ) => {
+    return this.request
+      .post(`/api/global/groups/${groupId}/apps`)
+      .send(body)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(expect)
+  }
+
   fetch = ({ expect } = { expect: 200 }) => {
     return this.request
       .get(`/api/global/groups`)