@budibase/worker 2.4.44-alpha.10 → 2.4.44-alpha.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.44-alpha.10",
+  "version": "2.4.44-alpha.12",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.4.44-alpha.10",
-    "@budibase/pro": "2.4.44-alpha.9",
-    "@budibase/string-templates": "2.4.44-alpha.10",
-    "@budibase/types": "2.4.44-alpha.10",
+    "@budibase/backend-core": "2.4.44-alpha.12",
+    "@budibase/pro": "2.4.44-alpha.11",
+    "@budibase/string-templates": "2.4.44-alpha.12",
+    "@budibase/types": "2.4.44-alpha.12",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -102,5 +102,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "e1b120d9f0399e668c5870e612652a7bc684f47d"
+  "gitHead": "6c376568d6f2cc8d6836299a82261693ffec50dd"
 }

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

@@ -318,6 +318,15 @@ describe("scim", () => {
           await postScimUser({ body }, { expect: 500 })
         })
       })
+
+      it("creating an existing user name returns a conflict", async () => {
+        const body = structures.scim.createUserRequest()
+
+        await postScimUser({ body })
+
+        const res = await postScimUser({ body }, { expect: 409 })
+        expect((res as any).message).toBe("Email already in use")
+      })
     })
 
     describe("GET /api/global/scim/v2/users/:id", () => {
@@ -399,53 +408,19 @@ describe("scim", () => {
       })
 
       it.each([false, "false", "False"])(
-        "can deactive an active user (sending %s)",
-        async activeValue => {
-          const body: ScimUpdateRequest = {
-            schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
-            Operations: [{ op: "Replace", path: "active", value: activeValue }],
-          }
-
-          const response = await patchScimUser({ id: user.id, body })
-
-          const expectedScimUser: ScimUserResponse = {
-            ...user,
-            active: false,
-          }
-          expect(response).toEqual(expectedScimUser)
-
-          const persistedUser = await config.api.scimUsersAPI.find(user.id)
-          expect(persistedUser).toEqual(expectedScimUser)
-        }
-      )
-
-      it.each([true, "true", "True"])(
-        "can activate an inactive user (sending %s)",
+        "deactivating an active user (sending %s) will delete it",
         async activeValue => {
-          // Deactivate user
-          await patchScimUser({
-            id: user.id,
-            body: {
-              schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
-              Operations: [{ op: "Replace", path: "active", value: true }],
-            },
-          })
-
           const body: ScimUpdateRequest = {
             schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"],
             Operations: [{ op: "Replace", path: "active", value: activeValue }],
           }
 
-          const response = await patchScimUser({ id: user.id, body })
-
-          const expectedScimUser: ScimUserResponse = {
-            ...user,
-            active: true,
-          }
-          expect(response).toEqual(expectedScimUser)
+          await patchScimUser(
+            { id: user.id, body },
+            { expect: 204, skipContentTypeCheck: true }
+          )
 
-          const persistedUser = await config.api.scimUsersAPI.find(user.id)
-          expect(persistedUser).toEqual(expectedScimUser)
+          await config.api.scimUsersAPI.find(user.id, { expect: 404 })
         }
       )
 

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

@@ -48,7 +48,7 @@ describe("/api/global/users", () => {
         400
       )
 
-      expect(res.body.message).toBe("Unavailable")
+      expect(res.body.message).toBe(`Unavailable`)
       expect(sendMailMock).toHaveBeenCalledTimes(0)
       expect(code).toBeUndefined()
       expect(events.user.invited).toBeCalledTimes(0)
@@ -225,7 +225,9 @@ describe("/api/global/users", () => {
 
       const response = await config.api.users.saveUser(user, 400)
 
-      expect(response.body.message).toBe(`Unavailable`)
+      expect(response.body.message).toBe(
+        `Email already in use: '${user.email}'`
+      )
       expect(events.user.created).toBeCalledTimes(0)
     })
 
@@ -237,7 +239,9 @@ describe("/api/global/users", () => {
         delete user._id
         const response = await config.api.users.saveUser(user, 400)
 
-        expect(response.body.message).toBe(`Unavailable`)
+        expect(response.body.message).toBe(
+          `Email already in use: '${user.email}'`
+        )
         expect(events.user.created).toBeCalledTimes(0)
       })
     })
@@ -249,7 +253,9 @@ describe("/api/global/users", () => {
 
       const response = await config.api.users.saveUser(user, 400)
 
-      expect(response.body.message).toBe(`Unavailable`)
+      expect(response.body.message).toBe(
+        `Email already in use: '${user.email}'`
+      )
       expect(events.user.created).toBeCalledTimes(0)
     })
 

package/src/sdk/users/users.ts

@@ -16,6 +16,7 @@ import {
   ViewName,
   env as coreEnv,
   context,
+  EmailUnavailableError,
 } from "@budibase/backend-core"
 import {
   AccountMetadata,
@@ -158,7 +159,7 @@ const validateUniqueUser = async (email: string, tenantId: string) => {
   if (env.MULTI_TENANCY) {
     const tenantUser = await getPlatformUser(email)
     if (tenantUser != null && tenantUser.tenantId !== tenantId) {
-      throw `Unavailable`
+      throw new EmailUnavailableError(email)
     }
   }
 
@@ -166,7 +167,7 @@ const validateUniqueUser = async (email: string, tenantId: string) => {
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
     const account = await accounts.getAccount(email)
     if (account && account.verified && account.tenantId !== tenantId) {
-      throw `Unavailable`
+      throw new EmailUnavailableError(email)
     }
   }
 }
@@ -235,7 +236,7 @@ export const save = async (
     // no id was specified - load from email instead
     dbUser = await usersCore.getGlobalUserByEmail(email)
     if (dbUser && dbUser._id !== _id) {
-      throw `Unavailable`
+      throw new EmailUnavailableError(email)
     }
   }
 

package/src/tests/api/scim/shared.ts

@@ -4,6 +4,7 @@ import { TestAPI } from "../base"
 const defaultConfig = {
   expect: 200,
   setHeaders: true,
+  skipContentTypeCheck: false,
 }
 
 export type RequestSettings = typeof defaultConfig
@@ -27,7 +28,7 @@ export abstract class ScimTestAPI extends TestAPI {
       "application/scim+json; charset=utf-8"
     )
 
-    if (method !== "delete") {
+    if (method !== "delete" && !requestSettings?.skipContentTypeCheck) {
       request = request.expect("Content-Type", /json/)
     }