add silentRequestTimeout setting

brockallen · brockallen · commit 0a9f2b3b9d41 · 2016-06-19T15:11:11.000-04:00
diff --git a/dist/oidc-client.js b/dist/oidc-client.js
diff --git a/dist/oidc-client.min.js b/dist/oidc-client.min.js
diff --git a/lib/oidc-client.js b/lib/oidc-client.js
diff --git a/lib/oidc-client.min.js b/lib/oidc-client.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oidc-client",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "OpenID Connect (OIDC) & OAuth2 client library",
   "main": "lib/oidc-client.min.js",
   "scripts": {
diff --git a/sample/public/user-manager-sample.js b/sample/public/user-manager-sample.js
@@ -36,6 +36,7 @@ var settings = {
     
     silent_redirect_uri:'http://localhost:5000/user-manager-sample-silent.html',
     automaticSilentRenew:true,
+    //silentRequestTimeout:10000,
 
     filterProtocolClaims: true,
     loadUserInfo: true
diff --git a/src/IFrameNavigator.js b/src/IFrameNavigator.js
@@ -6,8 +6,8 @@ import IFrameWindow from './IFrameWindow';
 
 export default class IFrameNavigator {
 
-    prepare() {
-        let frame = new IFrameWindow();
+    prepare(params) {
+        let frame = new IFrameWindow(params);
         return Promise.resolve(frame);
     }
 
diff --git a/src/IFrameWindow.js b/src/IFrameWindow.js
@@ -7,7 +7,7 @@ const DefaultTimeout = 5000;
 
 export default class IFrameWindow {
 
-    constructor() {
+    constructor(params) {
         Log.info("IFrameWindow.ctor");
 
         this._promise = new Promise((resolve, reject) => {
@@ -30,7 +30,9 @@ export default class IFrameWindow {
             this._error("No url provided");
         }
         else {
-            this._timer = window.setTimeout(this._timeout.bind(this), DefaultTimeout);
+            let timeout = params.silentRequestTimeout || DefaultTimeout;
+            Log.info("Using timeout of:", timeout);
+            this._timer = window.setTimeout(this._timeout.bind(this), timeout);
             this._frame.src = params.url;
         }
         
diff --git a/src/UserManager.js b/src/UserManager.js
@@ -101,7 +101,10 @@ export default class UserManager extends OidcClient {
         args.redirect_uri = url;
         args.prompt = "none";
 
-        return this._signin(args, this._iframeNavigator, { startUrl: url });
+        return this._signin(args, this._iframeNavigator, { 
+            startUrl: url, 
+            silentRequestTimeout: args.silentRequestTimeout || this.settings.silentRequestTimeout
+        });
     }
     signinSilentCallback(url) {
         Log.info("UserManager.signinSilentCallback");
diff --git a/src/UserManagerSettings.js b/src/UserManagerSettings.js
@@ -17,6 +17,7 @@ export default class UserManagerSettings extends OidcClientSettings {
         popupWindowFeatures,
         popupWindowTarget,
         silent_redirect_uri,
+        silentRequestTimeout,
         automaticSilentRenew = false,
         accessTokenExpiringNotificationTime = DefaultAccessTokenExpiringNotificationTime,
         redirectNavigator = new RedirectNavigator(),
@@ -31,6 +32,7 @@ export default class UserManagerSettings extends OidcClientSettings {
         this._popupWindowTarget = popupWindowTarget;
         
         this._silent_redirect_uri = silent_redirect_uri;
+        this._silentRequestTimeout = silentRequestTimeout;
         this._automaticSilentRenew = !!automaticSilentRenew;
         this._accessTokenExpiringNotificationTime = accessTokenExpiringNotificationTime;
 
@@ -53,6 +55,9 @@ export default class UserManagerSettings extends OidcClientSettings {
 
     get silent_redirect_uri() {
         return this._silent_redirect_uri;
+    }
+     get silentRequestTimeout() {
+        return this._silentRequestTimeout;
     }
     get automaticSilentRenew() {
         return !!(this.silent_redirect_uri && this._automaticSilentRenew);
diff --git a/test/unit/UserManager.spec.js b/test/unit/UserManager.spec.js
@@ -83,4 +83,34 @@ describe("UserManager", function () {
 
     });
 
+    describe("signinSilent", function(){
+
+        it("should pass silentRequestTimeout from settings", function(done){
+
+            settings.silentRequestTimeout = 123;
+            settings.silent_redirect_uri = "http://client/silent_callback";
+            subject = new UserManager(settings);
+
+            subject._signin = function(args, nav, navArgs){
+                Log.info("_signin", args, nav, navArgs);
+
+                navArgs.silentRequestTimeout.should.equal(123);
+                done();
+            }
+            subject.signinSilent();
+        });
+
+        it("should pass silentRequestTimeout from params", function(done){
+
+            settings.silent_redirect_uri = "http://client/silent_callback";
+            subject = new UserManager(settings);
+
+            subject._signin = function(args, nav, navArgs){
+                navArgs.silentRequestTimeout.should.equal(234);
+                done();
+            }
+            subject.signinSilent({silentRequestTimeout:234});
+        });
+    });
+
 });
diff --git a/test/unit/UserManagerSettings.spec.js b/test/unit/UserManagerSettings.spec.js
@@ -64,6 +64,15 @@ describe("UserManagerSettings", function () {
 
     });
 
+    describe("silentRequestTimeout", function () {
+
+        it("should return value from initial settings", function () {
+            let subject = new UserManagerSettings({ silentRequestTimeout: 123 });
+            subject.silentRequestTimeout.should.equal(123);
+        });
+
+    });
+
     describe("automaticSilentRenew", function () {
 
         it("should return value from initial settings", function () {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "oidc-client",`
`3`		`- "version": "1.1.0-beta.1",`
	`3`	`+ "version": "1.1.0-beta.2",`
`4`	`4`	`"description": "OpenID Connect (OIDC) & OAuth2 client library",`
`5`	`5`	`"main": "lib/oidc-client.min.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import IFrameWindow from './IFrameWindow';`
`6`	`6`
`7`	`7`	`export default class IFrameNavigator {`
`8`	`8`
`9`		`- prepare() {`
`10`		`- let frame = new IFrameWindow();`
	`9`	`+ prepare(params) {`
	`10`	`+ let frame = new IFrameWindow(params);`
`11`	`11`	`return Promise.resolve(frame);`
`12`	`12`	`}`
`13`	`13`