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

brockallen · brockallen · commit cbcf2a68504a · 2019-02-10T16:05:05.000-05:00
diff --git a/src/OidcClient.js b/src/OidcClient.js
@@ -123,12 +123,13 @@ export class OidcClient {
         });
     }
 
-    createSignoutRequest({id_token_hint, data, state, post_logout_redirect_uri} = {},
+    createSignoutRequest({id_token_hint, data, state, post_logout_redirect_uri, extraQueryParams } = {},
         stateStore
     ) {
         Log.debug("OidcClient.createSignoutRequest");
 
         post_logout_redirect_uri = post_logout_redirect_uri || this._settings.post_logout_redirect_uri;
+        extraQueryParams = extraQueryParams || this._settings.extraQueryParams;
 
         return this._metadataService.getEndSessionEndpoint().then(url => {
             if (!url) {
@@ -142,7 +143,8 @@ export class OidcClient {
                 url,
                 id_token_hint,
                 post_logout_redirect_uri,
-                data: data || state
+                data: data || state,
+                extraQueryParams
             });
 
             var signoutState = request.state;
diff --git a/src/SignoutRequest.js b/src/SignoutRequest.js
@@ -6,7 +6,7 @@ import { UrlUtility } from './UrlUtility';
 import { State } from './State';
 
 export class SignoutRequest {
-    constructor({url, id_token_hint, post_logout_redirect_uri, data}) {
+    constructor({url, id_token_hint, post_logout_redirect_uri, data, extraQueryParams}) {
         if (!url) {
             Log.error("SignoutRequest.ctor: No url passed");
             throw new Error("url");
@@ -26,6 +26,10 @@ export class SignoutRequest {
             }
         }
 
+        for(let key in extraQueryParams){
+            url = UrlUtility.addQueryParam(url, key, extraQueryParams[key])
+        }
+
         this.url = url;
     }
 }
diff --git a/test/unit/SignoutRequest.spec.js b/test/unit/SignoutRequest.spec.js
@@ -80,6 +80,15 @@ describe("SignoutRequest", function() {
             url.should.contain("state=" + subject.state.id);
         });
 
+        it("should include extra query params", function() {
+            settings.extraQueryParams = {
+                'TargetResource': 'logouturl.com',
+                'InErrorResource': 'errorurl.com'
+            };
+            subject = new SignoutRequest(settings);
+            subject.url.should.contain('TargetResource=logouturl.com&InErrorResource=errorurl.com');
+        });
+
     });
 
 });

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { UrlUtility } from './UrlUtility';`
`6`	`6`	`import { State } from './State';`
`7`	`7`
`8`	`8`	`export class SignoutRequest {`
`9`		`- constructor({url, id_token_hint, post_logout_redirect_uri, data}) {`
	`9`	`+ constructor({url, id_token_hint, post_logout_redirect_uri, data, extraQueryParams}) {`
`10`	`10`	`if (!url) {`
`11`	`11`	`Log.error("SignoutRequest.ctor: No url passed");`
`12`	`12`	`throw new Error("url");`
`@@ -26,6 +26,10 @@ export class SignoutRequest {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ for(let key in extraQueryParams){`
	`30`	`+ url = UrlUtility.addQueryParam(url, key, extraQueryParams[key])`
	`31`	`+ }`
	`32`	`+`
`29`	`33`	`this.url = url;`
`30`	`34`	`}`
`31`	`35`	`}`