Fix(SCIMMY.Resources.*): make basepath mutable for multi-tenant envir…

…onments
scimmyjs · Nov 15, 2023 · 7cd3145 · 7cd3145
1 parent 431ce49
commit 7cd3145
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/src/lib/resources/group.js b/src/lib/resources/group.js
@@ -20,8 +20,7 @@ export class Group extends Types.Resource {
     /** @implements {SCIMMY.Types.Resource.basepath} */
     static basepath(path) {
         if (path === undefined) return Group.#basepath;
-        else if (Group.#basepath === undefined)
-            Group.#basepath = (path.endsWith(Group.endpoint) ? path : `${path}${Group.endpoint}`);
+        else Group.#basepath = (path.endsWith(Group.endpoint) ? path : `${path}${Group.endpoint}`);
 
         return Group;
     }

diff --git a/src/lib/resources/resourcetype.js b/src/lib/resources/resourcetype.js
@@ -20,8 +20,7 @@ export class ResourceType extends Types.Resource {
     /** @implements {SCIMMY.Types.Resource.basepath} */
     static basepath(path) {
         if (path === undefined) return ResourceType.#basepath;
-        else if (ResourceType.#basepath === undefined)
-            ResourceType.#basepath = (path.endsWith(ResourceType.endpoint) ? path : `${path}${ResourceType.endpoint}`);
+        else ResourceType.#basepath = (path.endsWith(ResourceType.endpoint) ? path : `${path}${ResourceType.endpoint}`);
 
         return ResourceType;
     }

diff --git a/src/lib/resources/schema.js b/src/lib/resources/schema.js
@@ -19,8 +19,7 @@ export class Schema extends Types.Resource {
     /** @implements {SCIMMY.Types.Resource.basepath} */
     static basepath(path) {
         if (path === undefined) return Schema.#basepath;
-        else if (Schema.#basepath === undefined)
-            Schema.#basepath = (path.endsWith(Schema.endpoint) ? path : `${path}${Schema.endpoint}`);
+        else Schema.#basepath = (path.endsWith(Schema.endpoint) ? path : `${path}${Schema.endpoint}`);
 
         return Schema;
     }

diff --git a/src/lib/resources/spconfig.js b/src/lib/resources/spconfig.js
@@ -19,8 +19,7 @@ export class ServiceProviderConfig extends Types.Resource {
     /** @implements {SCIMMY.Types.Resource.basepath} */
     static basepath(path) {
         if (path === undefined) return ServiceProviderConfig.#basepath;
-        else if (ServiceProviderConfig.#basepath === undefined)
-            ServiceProviderConfig.#basepath = (path.endsWith(ServiceProviderConfig.endpoint) ? path : `${path}${ServiceProviderConfig.endpoint}`);
+        else ServiceProviderConfig.#basepath = (path.endsWith(ServiceProviderConfig.endpoint) ? path : `${path}${ServiceProviderConfig.endpoint}`);
 
         return ServiceProviderConfig;
     }

diff --git a/src/lib/resources/user.js b/src/lib/resources/user.js
@@ -20,8 +20,7 @@ export class User extends Types.Resource {
     /** @implements {SCIMMY.Types.Resource.basepath} */
     static basepath(path) {
         if (path === undefined) return User.#basepath;
-        else if (User.#basepath === undefined)
-            User.#basepath = (path.endsWith(User.endpoint) ? path : `${path}${User.endpoint}`);
+        else User.#basepath = (path.endsWith(User.endpoint) ? path : `${path}${User.endpoint}`);
 
         return User;
     }

diff --git a/test/hooks/resources.js b/test/hooks/resources.js
@@ -200,16 +200,14 @@ export default {
                 "Static method 'basepath' was not a function");
         });
 
-        it("should only set basepath once, then do nothing", () => {
-            const expected = `/scim${TargetResource.endpoint}`;
-
+        it("should be mutable", () => {
             TargetResource.basepath("/scim");
-            assert.ok(TargetResource.basepath() === (expected),
-                "Static method 'basepath' did not set or ignore resource basepath");
+            assert.ok(TargetResource.basepath() === (`/scim${TargetResource.endpoint}`),
+                `Static method 'basepath' did not set resource basepath to '/scim${TargetResource.endpoint}'`);
 
             TargetResource.basepath("/test");
-            assert.ok(TargetResource.basepath() === (expected),
-                "Static method 'basepath' did not do nothing when basepath was already set");
+            assert.ok(TargetResource.basepath() === (`/test${TargetResource.endpoint}`),
+                `Static method 'basepath' did not set resource basepath to '/test${TargetResource.endpoint}'`);
         });
     }),
     construct: (TargetResource, filterable = true) => (() => {