Merge pull request #49 from scimmyjs/issue/41-unknown-sub-attribute-r…

…esponse Ignore unknown sub-attributes when coercing complex values in `SCIMMY.Types.Attribute`
scimmyjs · Sep 11, 2024 · 9d132c8 · 9d132c8
2 parents f87028a + b789de1
commit 9d132c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/lib/config.js b/src/lib/config.js
@@ -193,6 +193,9 @@ export default class Config {
                     // No shorthand, make sure value is an object
                     else if (value === Object(value)) {
                         try {
+                            // Make sure all object keys correspond to valid config attributes
+                            for (let name of Object.keys(value)) Schemas.ServiceProviderConfig.definition.attribute(`${key}.${name}`);
+
                             // Coerce the value and assign it to the config property
                             Object.assign(target, Schemas.ServiceProviderConfig.definition.attribute(key)
                                 .coerce({...target, supported: true, ...value}));

diff --git a/src/lib/types/attribute.js b/src/lib/types/attribute.js
@@ -573,15 +573,8 @@ export class Attribute {
                         for (let [key, value] of Object.entries(source)) try {
                             target[key.toLowerCase()] = value;
                         } catch (ex) {
-                            // Attempted to add an undeclared attribute to the value
-                            if (ex instanceof TypeError && ex.message.endsWith("not extensible")) {
-                                ex.message = `Complex attribute '${this.name}' `
-                                    + (typeof source !== "object" || Array.isArray(source)
-                                    ? `expected complex value but found type '${typeof source}'`
-                                    : `does not declare subAttribute '${key}'`);
-                            }
-
-                            throw ex;
+                            // Ignore attempts to add an undeclared attribute to the value, raise all other errors
+                            if (!(ex instanceof TypeError && ex.message.endsWith("not extensible"))) throw ex;
                         }
 
                         // Reassign values to catch missing required sub-attributes

diff --git a/test/lib/config.js b/test/lib/config.js
@@ -58,7 +58,7 @@ describe("SCIMMY.Config", () => {
                 {name: "TypeError", message: "SCIM configuration: schema does not define attribute 'test'"},
                 "Static method 'set' accepted unknown attribute object key");
             assert.throws(() => SCIMMY.Config.set("patch", {test: true}),
-                {name: "TypeError", message: "SCIM configuration: complex attribute 'patch' does not declare subAttribute 'test'"},
+                {name: "TypeError", message: "SCIM configuration: attribute 'patch' of schema 'urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig' does not declare subAttribute 'test'"},
                 "Static method 'set' accepted unknown sub-attribute object key");
         });