Merge branch 'dev' of https://github.com/IdentityModel/oidc-client-js …

…into dev
chrisgbaker · Feb 10, 2019 · c7cf6e5 · c7cf6e5
2 parents a82ec66 + 510d2c5
commit c7cf6e5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/ResponseValidator.js b/src/ResponseValidator.js
@@ -187,7 +187,12 @@ export class ResponseValidator {
                     }
                 }
                 else if (result[name] !== value) {
-                    result[name] = [result[name], value];
+                    if (typeof value === 'object') {
+                        result[name] = this._mergeClaims(result[name], value);
+                    } 
+                    else {
+                        result[name] = [result[name], value];
+                    }
                 }
             }
         }

diff --git a/test/unit/ResponseValidator.spec.js b/test/unit/ResponseValidator.spec.js
@@ -538,6 +538,14 @@ describe("ResponseValidator", function () {
 
         });
 
+        it("should merge claims when claim types are objects", function () {
+
+            var c1 = { custom: {'apple': 'foo', 'pear': 'bar'} };
+            var c2 = { custom: {'apple': 'foo', 'orange': 'peel'}, b: 'banana' };
+            var result = subject._mergeClaims(c1, c2);
+            result.should.deep.equal({ custom: {'apple': 'foo', 'pear': 'bar', 'orange': 'peel'}, b: 'banana' });
+        });
+
         it("should merge same claim types into array", function () {
 
             var c1 = { a: 'apple', b: 'banana' };