added includeIdTokenInSilentRenew to userManagerSettings DuendeArchive#343

brockallen · brockallen · commit fede1ca94b98 · 2017-09-23T15:05:46.000-04:00
diff --git a/src/UserManager.js b/src/UserManager.js
@@ -140,7 +140,7 @@ export default class UserManager extends OidcClient {
         args.prompt = "none";
 
         let setIdToken;
-        if (args.id_token_hint) {
+        if (args.id_token_hint || !this.settings.includeIdTokenInSilentRenew) {
             setIdToken = Promise.resolve();
         }
         else {
diff --git a/src/UserManagerSettings.js b/src/UserManagerSettings.js
@@ -21,6 +21,7 @@ export default class UserManagerSettings extends OidcClientSettings {
         silent_redirect_uri,
         silentRequestTimeout,
         automaticSilentRenew = false,
+        includeIdTokenInSilentRenew = true,
         monitorSession = true,
         checkSessionInterval = DefaultCheckSessionInterval,
         revokeAccessTokenOnSignout = false,
@@ -40,6 +41,7 @@ export default class UserManagerSettings extends OidcClientSettings {
         this._silent_redirect_uri = silent_redirect_uri;
         this._silentRequestTimeout = silentRequestTimeout;
         this._automaticSilentRenew = !!automaticSilentRenew;
+        this._includeIdTokenInSilentRenew = includeIdTokenInSilentRenew;
         this._accessTokenExpiringNotificationTime = accessTokenExpiringNotificationTime;
 
         this._monitorSession = monitorSession;
@@ -75,6 +77,9 @@ export default class UserManagerSettings extends OidcClientSettings {
     get automaticSilentRenew() {
         return !!(this.silent_redirect_uri && this._automaticSilentRenew);
     }
+    get includeIdTokenInSilentRenew() {
+        return this._includeIdTokenInSilentRenew;
+    }
     get accessTokenExpiringNotificationTime() {
         return this._accessTokenExpiringNotificationTime;
     }
diff --git a/test/unit/UserManagerSettings.spec.js b/test/unit/UserManagerSettings.spec.js
@@ -99,6 +99,28 @@ describe("UserManagerSettings", function () {
 
     });
 
+    describe("includeIdTokenInSilentRenew", function () {
+        it("should return true value from initial settings", function () {
+            let subject = new UserManagerSettings({
+                includeIdTokenInSilentRenew: true,
+            });
+            subject.includeIdTokenInSilentRenew.should.be.true;
+        });
+
+        it("should return false value from initial settings", function () {
+            let subject = new UserManagerSettings({
+                includeIdTokenInSilentRenew: false,
+            });
+            subject.includeIdTokenInSilentRenew.should.be.false;
+        });
+
+        it("should use default value", function () {
+            let subject = new UserManagerSettings({
+            });
+            subject.includeIdTokenInSilentRenew.should.be.true;
+        });
+    });
+
     describe("accessTokenExpiringNotificationTime", function () {
 
         it("should return value from initial settings", function () {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ export default class UserManager extends OidcClient {`
`140`	`140`	`args.prompt = "none";`
`141`	`141`
`142`	`142`	`let setIdToken;`
`143`		`- if (args.id_token_hint) {`
	`143`	`+ if (args.id_token_hint \|\| !this.settings.includeIdTokenInSilentRenew) {`
`144`	`144`	`setIdToken = Promise.resolve();`
`145`	`145`	`}`
`146`	`146`	`else {`