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

brockallen · brockallen · commit c7cf6e55f9a9 · 2019-02-10T16:01:58.000-05:00
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' };

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,12 @@ export class ResponseValidator {`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`else if (result[name] !== value) {`
`190`		`- result[name] = [result[name], value];`
	`190`	`+ if (typeof value === 'object') {`
	`191`	`+ result[name] = this._mergeClaims(result[name], value);`
	`192`	`+ }`
	`193`	`+ else {`
	`194`	`+ result[name] = [result[name], value];`
	`195`	`+ }`
`191`	`196`	`}`
`192`	`197`	`}`
`193`	`198`	`}`