feat: authts#48 add redirectMethod to settings

kyxyes · Sep 14, 2021 · 14a481f · 14a481f
1 parent f320c64
commit 14a481f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/src/UserManager.ts b/src/UserManager.ts
@@ -93,7 +93,9 @@ export class UserManager {
         const args = {
             request_type: "si:r"
         };
-        await this._signinStart(args, this._redirectNavigator);
+        await this._signinStart(args, this._redirectNavigator, {
+            redirectMethod: this.settings.redirectMethod
+        });
         Log.info("UserManager.signinRedirect: successful");
     }
     public async signinRedirectCallback(url?: string): Promise<User> {
@@ -123,7 +125,8 @@ export class UserManager {
         const user = await this._signin(args, this._popupNavigator, {
             startUrl: url,
             popupWindowFeatures: this.settings.popupWindowFeatures,
-            popupWindowTarget: this.settings.popupWindowTarget
+            popupWindowTarget: this.settings.popupWindowTarget,
+            redirectMethod: this.settings.redirectMethod
         });
         if (user) {
             if (user.profile && user.profile.sub) {
@@ -298,7 +301,8 @@ export class UserManager {
         };
         const navResponse = await this._signinStart(args, this._iframeNavigator, {
             startUrl: url,
-            silentRequestTimeoutInSeconds: this.settings.silentRequestTimeoutInSeconds
+            silentRequestTimeoutInSeconds: this.settings.silentRequestTimeoutInSeconds,
+            redirectMethod: this.settings.redirectMethod
         });
         try {
             const signinResponse = await this._client.processSigninResponse(navResponse.url);
@@ -339,7 +343,7 @@ export class UserManager {
         const navResponse = await this._signinStart(args, navigator, navigatorParams);
         return this._signinEnd(navResponse.url, args);
     }
-    protected async _signinStart(args: SigninArgs, navigator: INavigator, navigatorParams: NavigatorParams = {}) {
+    protected async _signinStart(args: SigninArgs, navigator: INavigator, navigatorParams: NavigatorParams) {
         const handle = await navigator.prepare(navigatorParams);
         Log.debug("UserManager._signinStart: got navigator window handle");
 

diff --git a/src/UserManagerSettings.ts b/src/UserManagerSettings.ts
@@ -18,6 +18,8 @@ export interface UserManagerSettings extends OidcClientSettings {
     popupWindowFeatures?: string;
     /** The target parameter to window.open for the popup signin window (default: "_blank") */
     popupWindowTarget?: string;
+    /** The methods window.location method used to redirect (default: "assign") */
+    redirectMethod?: "replace" | "assign";
 
     /** The URL for the page containing the code handling the silent renew */
     silent_redirect_uri?: string;
@@ -51,6 +53,7 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
     public readonly popup_post_logout_redirect_uri: string | undefined;
     public readonly popupWindowFeatures: string | undefined;
     public readonly popupWindowTarget: string | undefined;
+    public readonly redirectMethod: "replace" | "assign" | undefined;
 
     public readonly silent_redirect_uri: string | undefined;
     public readonly silentRequestTimeoutInSeconds: number | undefined;
@@ -75,6 +78,7 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
             popup_post_logout_redirect_uri,
             popupWindowFeatures,
             popupWindowTarget,
+            redirectMethod,
             silent_redirect_uri,
             silentRequestTimeoutInSeconds,
             automaticSilentRenew = false,
@@ -96,6 +100,7 @@ export class UserManagerSettingsStore extends OidcClientSettingsStore {
         this.popup_post_logout_redirect_uri = popup_post_logout_redirect_uri;
         this.popupWindowFeatures = popupWindowFeatures;
         this.popupWindowTarget = popupWindowTarget;
+        this.redirectMethod = redirectMethod;
 
         this.silent_redirect_uri = silent_redirect_uri;
         this.silentRequestTimeoutInSeconds = silentRequestTimeoutInSeconds;

diff --git a/test/unit/UserManagerSettings.test.ts b/test/unit/UserManagerSettings.test.ts
@@ -79,6 +79,23 @@ describe("UserManagerSettings", () => {
 
     });
 
+    describe("redirectMethod", () => {
+
+        it("should return value from initial settings", () => {
+            // act
+            const subject = new UserManagerSettingsStore({
+                authority: "authority",
+                client_id: "client",
+                redirect_uri: "redirect",
+                redirectMethod: "replace"
+            });
+
+            // assert
+            expect(subject.redirectMethod).toEqual("replace");
+        });
+
+    });
+
     describe("silent_redirect_uri", () => {
 
         it("should return value from initial settings", () => {