@budibase/worker 3.14.0 → 3.14.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.14.0",
+  "version": "3.14.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -115,5 +115,5 @@
       }
     }
   },
-  "gitHead": "7ff8f5fc9480931c373b86dd573882841dd290d4"
+  "gitHead": "95576e7a88dbb8563210818dd3d451b60770b901"
 }

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

@@ -30,6 +30,7 @@ import {
   LockType,
   LookupAccountHolderResponse,
   LookupTenantUserResponse,
+  OIDCUser,
   SaveUserResponse,
   SearchUsersRequest,
   SearchUsersResponse,
@@ -114,11 +115,20 @@ export const changeTenantOwnerEmail = async (
   try {
     for (const tenantId of tenantIds) {
       await tenancy.doInTenant(tenantId, async () => {
-        const tenantUser = await userSdk.db.getUserByEmail(originalEmail)
+        const tenantUser = (await userSdk.db.getUserByEmail(
+          originalEmail
+        )) as OIDCUser
         if (!tenantUser) {
           return
         }
         tenantUser.email = newAccountEmail
+
+        tenantUser.provider = undefined
+        tenantUser.providerType = undefined
+        tenantUser.thirdPartyProfile = undefined
+        tenantUser.profile = undefined
+        tenantUser.oauth2 = undefined
+
         await userSdk.db.save(tenantUser, {
           currentUserId: tenantUser._id,
           isAccountHolder: true,

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

@@ -1,4 +1,4 @@
-import { InviteUsersResponse, User } from "@budibase/types"
+import { InviteUsersResponse, User, OIDCUser } from "@budibase/types"
 
 import { TestConfiguration, mocks, structures } from "../../../../tests"
 import { events, tenancy, accounts as _accounts } from "@budibase/backend-core"
@@ -800,4 +800,162 @@ describe("/api/global/users", () => {
       expect(response.unsuccessful.length).toBe(1)
     })
   })
+
+  describe("PUT /api/global/users/tenant/owner", () => {
+    it("should successfully change tenant owner email for existing user", async () => {
+      const originalEmail = `original-${structures.uuid()}@example.com`
+      const newEmail = `new-${structures.uuid()}@example.com`
+      const tenantId = config.getTenantId()
+
+      const user = await config.doInTenant(async () => {
+        return await userSdk.db.save(
+          {
+            email: originalEmail,
+            tenantId,
+          } as any,
+          { requirePassword: false, isAccountHolder: true }
+        )
+      })
+
+      await config.api.users.changeTenantOwnerEmail(newEmail, originalEmail, [
+        tenantId,
+      ])
+
+      const updatedUser = await config.doInTenant(async () => {
+        return await userSdk.db.getUser(user._id!)
+      })
+
+      expect(updatedUser).toBeDefined()
+      expect(updatedUser!.email).toBe(newEmail)
+    })
+
+    it("should handle multiple tenants", async () => {
+      const originalEmail = `original-${structures.uuid()}@example.com`
+      const newEmail = `new-${structures.uuid()}@example.com`
+      const tenant1 = config.getTenantId()
+      const tenant2 = structures.tenant.id()
+
+      const user1 = await config.doInTenant(async () => {
+        return await userSdk.db.save(
+          {
+            email: originalEmail,
+            tenantId: tenant1,
+          } as any,
+          { requirePassword: false, isAccountHolder: true }
+        )
+      })
+
+      const user2 = await config.doInSpecificTenant(tenant2, async () => {
+        return await userSdk.db.save(
+          {
+            email: originalEmail,
+            tenantId: tenant2,
+          } as any,
+          { requirePassword: false, isAccountHolder: true }
+        )
+      })
+
+      await config.api.users.changeTenantOwnerEmail(newEmail, originalEmail, [
+        tenant1,
+        tenant2,
+      ])
+
+      const updatedUser1 = await config.doInTenant(async () => {
+        return await userSdk.db.getUser(user1._id!)
+      })
+
+      const updatedUser2 = await config.doInSpecificTenant(
+        tenant2,
+        async () => {
+          return await userSdk.db.getUser(user2._id!)
+        }
+      )
+
+      expect(updatedUser1).toBeDefined()
+      expect(updatedUser1!.email).toBe(newEmail)
+      expect(updatedUser2).toBeDefined()
+      expect(updatedUser2!.email).toBe(newEmail)
+    })
+
+    it("should not fail if user doesn't exist in tenant", async () => {
+      const originalEmail = `nonexistent-${structures.uuid()}@example.com`
+      const newEmail = `new-${structures.uuid()}@example.com`
+      const tenantId = config.getTenantId()
+
+      await config.api.users.changeTenantOwnerEmail(newEmail, originalEmail, [
+        tenantId,
+      ])
+
+      const user = await config.doInTenant(async () => {
+        return await userSdk.db.getUserByEmail(newEmail)
+      })
+
+      expect(user).toBeUndefined()
+    })
+
+    it("should handle empty tenant list", async () => {
+      const originalEmail = `original-${structures.uuid()}@example.com`
+      const newEmail = `new-${structures.uuid()}@example.com`
+
+      await config.api.users.changeTenantOwnerEmail(newEmail, originalEmail, [])
+    })
+
+    it("should clear all OIDC-related fields", async () => {
+      const originalEmail = `original-${structures.uuid()}@example.com`
+      const newEmail = `new-${structures.uuid()}@example.com`
+      const tenantId = config.getTenantId()
+      const profile = {}
+      const provider = "oidc"
+      const providerType = "oidc"
+      const thirdPartyProfile = {}
+      const oauth2 = {}
+
+      await config.doInTenant(async () => {
+        await userSdk.db.save(
+          {
+            email: originalEmail,
+            tenantId,
+            profile,
+            provider,
+            providerType,
+            thirdPartyProfile,
+            oauth2,
+          } as any,
+          { requirePassword: false, isAccountHolder: true }
+        )
+      })
+
+      await config.api.users.changeTenantOwnerEmail(newEmail, originalEmail, [
+        tenantId,
+      ])
+
+      const updatedUser = (await config.doInTenant(async () => {
+        return await userSdk.db.getUserByEmail(newEmail)
+      })) as OIDCUser
+
+      expect(updatedUser).toBeDefined()
+      expect(updatedUser!.email).toBe(newEmail)
+      expect(updatedUser.profile).toBe(undefined)
+      expect(updatedUser.provider).toBe(undefined)
+      expect(updatedUser.providerType).toBe(undefined)
+      expect(updatedUser.thirdPartyProfile).toBe(undefined)
+      expect(updatedUser.oauth2).toBe(undefined)
+    })
+
+    it("should require internal API headers", async () => {
+      const originalEmail = `original-${structures.uuid()}@example.com`
+      const newEmail = `new-${structures.uuid()}@example.com`
+      const tenantId = config.getTenantId()
+
+      await config.request
+        .put(`/api/global/users/tenant/owner`)
+        .send({
+          newAccountEmail: newEmail,
+          originalEmail,
+          tenantIds: [tenantId],
+        })
+        .set(config.defaultHeaders())
+        .expect(403)
+    })
+  })
 })

package/src/tests/TestConfiguration.ts

@@ -138,9 +138,9 @@ class TestConfiguration {
 
   // TENANCY
 
-  doInTenant(task: any) {
-    return context.doInTenant(this.tenantId, () => {
-      return task()
+  async doInTenant<T>(task: () => Promise<T>): Promise<T> {
+    return await context.doInTenant(this.tenantId, async () => {
+      return await task()
     })
   }
 
@@ -171,6 +171,15 @@ class TestConfiguration {
     }
   }
 
+  async doInSpecificTenant<T>(
+    tenantId: string,
+    task: () => Promise<T>
+  ): Promise<T> {
+    return await context.doInTenant(tenantId, async () => {
+      return await task()
+    })
+  }
+
   // AUTH
 
   async _createSession({

package/src/tests/api/users.ts

@@ -214,4 +214,17 @@ export class UserAPI extends TestAPI {
 
     return resp.body as InviteUsersResponse
   }
+
+  changeTenantOwnerEmail = (
+    newAccountEmail: string,
+    originalEmail: string,
+    tenantIds: string[],
+    status = 200
+  ) => {
+    return this.request
+      .put(`/api/global/users/tenant/owner`)
+      .send({ newAccountEmail, originalEmail, tenantIds })
+      .set(this.config.internalAPIHeaders())
+      .expect(status)
+  }
 }