add popupWindowFeatures to allow customization of popup window

brockallen · brockallen · commit 707cb6d87617 · 2016-05-01T14:29:35.000-04:00
diff --git a/dist/oidc-client.js b/dist/oidc-client.js
diff --git a/src/PopupNavigator.js b/src/PopupNavigator.js
@@ -6,8 +6,8 @@ import PopupWindow from './PopupWindow';
 
 export default class PopupNavigator {
     
-    prepare() {
-        let popup = new PopupWindow();
+    prepare(params) {
+        let popup = new PopupWindow(params);
         return Promise.resolve(popup);
     }
     
diff --git a/src/PopupWindow.js b/src/PopupWindow.js
@@ -4,10 +4,11 @@
 import Log from './Log';
 
 const CheckForPopupClosedInterval = 500;
+const DefaultPopupFeatures = 'location=no,toolbar=no,width=500,height=500,left=100,top=100';
 
 export default class PopupWindow {
 
-    constructor() {
+    constructor(params) {
         Log.info("PopupWindow.ctor");
 
         this._promise = new Promise((resolve, reject) => {
@@ -17,8 +18,10 @@ export default class PopupWindow {
 
         this._boundMessageEvent = this._message.bind(this);
         window.addEventListener("message", this._boundMessageEvent, false);
+        
+        let features = params.popupWindowFeatures || DefaultPopupFeatures;
 
-        this._popup = window.open('', '_blank', 'location=no,toolbar=no,width=500,height=500');
+        this._popup = window.open('', '_blank', features);
         if (this._popup) {
             Log.info("popup successfully created");
             this._checkForPopupClosedTimer = window.setInterval(this._checkForPopupClosed.bind(this), CheckForPopupClosedInterval);
diff --git a/src/UserManager.js b/src/UserManager.js
@@ -150,7 +150,7 @@ export default class UserManager extends OidcClient {
     _signinStart(args, navigator, navigatorParams = {}) {
         Log.info("_signinStart");
 
-        return navigator.prepare().then(handle => {
+        return navigator.prepare(navigatorParams).then(handle => {
             Log.info("got navigator window handle");
 
             return this.createSigninRequest(args).then(signinRequest => {
@@ -182,7 +182,7 @@ export default class UserManager extends OidcClient {
     _signoutStart(args = {}, navigator, navigatorParams = {}) {
         Log.info("_signoutStart");
 
-        return navigator.prepare().then(handle => {
+        return navigator.prepare(navigatorParams).then(handle => {
             Log.info("got navigator window handle");
 
             return this.getUser().then(user => {
diff --git a/src/UserManagerSettings.js b/src/UserManagerSettings.js
@@ -9,13 +9,15 @@ const DefaultAccessTokenExpiringNotificationTime = 60;
 export default class UserManagerSettings extends OidcClientSettings {
     constructor({
         popup_redirect_uri,
+        popupWindowFeatures,
         silent_redirect_uri,
         automaticSilentRenew = false,
         accessTokenExpiringNotificationTime = DefaultAccessTokenExpiringNotificationTime
     } = {}) {
         super(arguments[0]);
         
         this._popup_redirect_uri = popup_redirect_uri;
+        this._popupWindowFeatures = popupWindowFeatures;
         this._silent_redirect_uri = silent_redirect_uri;
         this._automaticSilentRenew = !!automaticSilentRenew;
         this._accessTokenExpiringNotificationTime = accessTokenExpiringNotificationTime;
@@ -24,6 +26,9 @@ export default class UserManagerSettings extends OidcClientSettings {
     get popup_redirect_uri(){
         return this._popup_redirect_uri;
     }
+    get popupWindowFeatures(){
+        return this._popupWindowFeatures;
+    }
 
     get silent_redirect_uri() {
         return this._silent_redirect_uri;
diff --git a/test/unit/UserManagerSettings.spec.js b/test/unit/UserManagerSettings.spec.js
@@ -36,6 +36,15 @@ describe("UserManagerSettings", function () {
         });
 
     });
+    
+    describe("popupWindowFeatures", function () {
+
+        it("should return value from initial settings", function () {
+            let subject = new UserManagerSettings({ popupWindowFeatures: 'foo' });
+            subject.popupWindowFeatures.should.equal('foo');
+        });
+
+    });
 
     describe("silent_redirect_uri", function () {
 

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import PopupWindow from './PopupWindow';`
`6`	`6`
`7`	`7`	`export default class PopupNavigator {`
`8`	`8`
`9`		`- prepare() {`
`10`		`- let popup = new PopupWindow();`
	`9`	`+ prepare(params) {`
	`10`	`+ let popup = new PopupWindow(params);`
`11`	`11`	`return Promise.resolve(popup);`
`12`	`12`	`}`
`13`	`13`