fix metadataSeed improperly merged and returned IdentityModel#1305

chrisgbaker · Feb 15, 2021 · c735ad6 · c735ad6
1 parent 9077300
commit c735ad6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/MetadataService.js b/src/MetadataService.js
@@ -59,11 +59,9 @@ export class MetadataService {
             .then(metadata => {
                 Log.debug("MetadataService.getMetadata: json received");
 
-                var mergedMetadata = this._settings.metadataSeed || {};
-                Object.assign(mergedMetadata, metadata);
-
-                this._settings.metadata = mergedMetadata;
-                return metadata;
+                var seed = this._settings.metadataSeed || {};
+                this._settings.metadata = Object.assign({}, seed, metadata);
+                return this._settings.metadata;
             });
     }
 

diff --git a/test/unit/MetadataService.spec.js b/test/unit/MetadataService.spec.js
@@ -115,14 +115,15 @@ describe("MetadataService", function() {
             });
         });
 
-        it("should merge metadata from seed", function(done) {
+        it.only("should merge metadata from seed", function(done) {
             settings.metadataUrl = "http://sts/metadata";
             settings.metadataSeed = {test1:"one"};
             stubJsonService.result = Promise.resolve({test2:"two"});
 
             let p = subject.getMetadata();
 
             p.then(result => {
+                result.should.deep.equal({test1:"one", test2:"two"});
                 settings.metadata.should.deep.equal({test1:"one", test2:"two"});
                 done();
             });