@budibase/worker 2.5.5-alpha.0 → 2.5.5-alpha.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.5.5-alpha.0",
+  "version": "2.5.5-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.5.5-alpha.0",
-    "@budibase/pro": "2.5.4",
-    "@budibase/string-templates": "2.5.5-alpha.0",
-    "@budibase/types": "2.5.5-alpha.0",
+    "@budibase/backend-core": "2.5.5-alpha.2",
+    "@budibase/pro": "2.5.5-alpha.1",
+    "@budibase/string-templates": "2.5.5-alpha.2",
+    "@budibase/types": "2.5.5-alpha.2",
     "@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": "84e8cc00315e223433e388b72fae3bd048ff5760"
+  "gitHead": "696bf03033e57dae59175aae552fc2fd45cfd0cf"
 }

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

@@ -585,6 +585,59 @@ describe("scim", () => {
             totalResults: groupCount,
           })
         })
+
+        it("can fetch groups using displayName filters", async () => {
+          const groupToFetch = _.sample(groups)
+          const response = await getScimGroups({
+            params: { filter: `displayName eq "${groupToFetch!.displayName}"` },
+          })
+
+          expect(response).toEqual({
+            Resources: [groupToFetch],
+            itemsPerPage: 1,
+            schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+            startIndex: 1,
+            totalResults: 1,
+          })
+        })
+
+        it("can fetch groups excluding members", async () => {
+          const response = await getScimGroups({
+            params: { excludedAttributes: "members" },
+          })
+
+          expect(response).toEqual({
+            Resources: expect.arrayContaining(
+              groups.map(g => {
+                const { members, ...groupData } = g
+                return groupData
+              })
+            ),
+            itemsPerPage: 25,
+            schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+            startIndex: 1,
+            totalResults: groupCount,
+          })
+        })
+
+        it("can fetch groups excluding multiple fields", async () => {
+          const response = await getScimGroups({
+            params: { excludedAttributes: "members,displayName" },
+          })
+
+          expect(response).toEqual({
+            Resources: expect.arrayContaining(
+              groups.map(g => {
+                const { members, displayName, ...groupData } = g
+                return groupData
+              })
+            ),
+            itemsPerPage: 25,
+            schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
+            startIndex: 1,
+            totalResults: groupCount,
+          })
+        })
       })
     })
 
@@ -662,6 +715,16 @@ describe("scim", () => {
           status: 404,
         })
       })
+
+      it("should allow excluding members", async () => {
+        const response = await findScimGroup(group.id, {
+          qs: "excludedAttributes=members",
+        })
+
+        const { members, ...expectedResponse } = group
+
+        expect(response).toEqual(expectedResponse)
+      })
     })
 
     describe("DELETE /api/global/scim/v2/groups/:id", () => {

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

@@ -18,6 +18,7 @@ export class ScimGroupsAPI extends ScimTestAPI {
         startIndex?: number
         pageSize?: number
         filter?: string
+        excludedAttributes?: string
       }
     }
   ) => {
@@ -32,6 +33,9 @@ export class ScimGroupsAPI extends ScimTestAPI {
     if (params?.filter) {
       url += `filter=${params.filter}&`
     }
+    if (params?.excludedAttributes) {
+      url += `excludedAttributes=${params.excludedAttributes}&`
+    }
     const res = await this.call(url, "get", requestSettings)
     return res.body as ScimGroupListResponse
   }
@@ -54,9 +58,12 @@ export class ScimGroupsAPI extends ScimTestAPI {
     return res.body as ScimGroupResponse
   }
 
-  find = async (id: string, requestSettings?: Partial<RequestSettings>) => {
+  find = async (
+    id: string,
+    requestSettings?: Partial<RequestSettings> & { qs?: string }
+  ) => {
     const res = await this.call(
-      `/api/global/scim/v2/groups/${id}`,
+      `/api/global/scim/v2/groups/${id}?${requestSettings?.qs}`,
       "get",
       requestSettings
     )