allow for optional metadata properties

brockallen · brockallen · commit 63397c83297e · 2016-08-09T15:11:23.000-04:00
diff --git a/src/MetadataService.js b/src/MetadataService.js
@@ -55,23 +55,30 @@ export default class MetadataService {
     
     getCheckSessionIframe() {
         Log.info("MetadataService.getCheckSessionIframe");
-        return this._getMetadataProperty("check_session_iframe");
+        return this._getMetadataProperty("check_session_iframe", true);
     }
 
     getEndSessionEndpoint() {
         Log.info("MetadataService.getEndSessionEndpoint");
-        return this._getMetadataProperty("end_session_endpoint");
+        return this._getMetadataProperty("end_session_endpoint", true);
     }
 
-    _getMetadataProperty(name) {
+    _getMetadataProperty(name, optional=false) {
         Log.info("MetadataService._getMetadataProperty", name);
 
         return this.getMetadata().then(metadata => {
             Log.info("metadata recieved");
 
             if (metadata[name] === undefined) {
-                Log.error("Metadata does not contain property " + name);
-                throw new Error("Metadata does not contain property " + name);
+
+                if (optional === true) {
+                    Log.warn("Metadata does not contain optional property " + name);
+                    return undefined;
+                }
+                else {
+                    Log.error("Metadata does not contain property " + name);
+                    throw new Error("Metadata does not contain property " + name);
+                }
             }
 
             return metadata[name];
diff --git a/src/OidcClient.js b/src/OidcClient.js
@@ -115,6 +115,11 @@ export default class OidcClient {
         post_logout_redirect_uri = post_logout_redirect_uri || this._settings.post_logout_redirect_uri;
 
         return this._metadataService.getEndSessionEndpoint().then(url => {
+            if (!url) {
+                Log.error("No end session endpoint url returned");
+                throw new Error("no end session endpoint");
+            }
+
             Log.info("Received end session endpoint", url);
 
             let request = new SignoutRequest({
diff --git a/test/unit/MetadataService.spec.js b/test/unit/MetadataService.spec.js
@@ -220,6 +220,18 @@ describe("MetadataService", function() {
             });
         });
 
+        it("should support optional value", function(done) {
+            settings.metadata = {
+            };
+
+            let p = subject.getEndSessionEndpoint();
+
+            p.then(result => {
+                assert.isUndefined(result);
+                done();
+            });
+        });
+
     });
     
     describe("getCheckSessionIframe", function() {
@@ -237,6 +249,18 @@ describe("MetadataService", function() {
             });
         });
 
+        it("should support optional value", function(done) {
+            settings.metadata = {
+            };
+
+            let p = subject.getCheckSessionIframe();
+
+            p.then(result => {
+                assert.isUndefined(result);
+                done();
+            });
+        });
+
     });
     
     describe("getIssuer", function() {
diff --git a/test/unit/OidcClient.spec.js b/test/unit/OidcClient.spec.js
@@ -272,6 +272,17 @@ describe("OidcClient", function () {
             });
         });
 
+        it("should fail if no signout endpoint on metadata", function (done) {
+            stubMetadataService.getEndSessionEndpointResult = Promise.resolve(undefined);
+
+            var p = subject.createSignoutRequest();
+
+            p.catch(err => {
+                err.message.should.contain("no end session endpoint");
+                done();
+            });
+        });
+
         it("should store state", function (done) {
             stubMetadataService.getEndSessionEndpointResult = Promise.resolve("http://sts/signout");
 
