From 2fe7f4cf045dbf06b07055bd2dc97400a9d49c74 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Fri, 17 Sep 2021 09:53:14 +0200
Subject: [PATCH] web/user: fix final redirect after stage setup

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .../user/user-settings/stages/UserSettingsAuthenticatorDuo.ts   | 2 +-
 .../user-settings/stages/UserSettingsAuthenticatorStatic.ts     | 2 +-
 .../user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts  | 2 +-
 .../user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts
index fe53067cb..e36597d30 100644
--- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts
+++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorDuo.ts
@@ -56,7 +56,7 @@ export class UserSettingsAuthenticatorDuo extends BaseUserSettings {
             <div class="pf-c-card__footer">
                 ${this.configureUrl
                     ? html`<a
-                          href="${this.configureUrl}?next=/%23%2Fuser"
+                          href="${this.configureUrl}?next=/${encodeURIComponent("#/settings")}"
                           class="pf-c-button pf-m-primary"
                           >${t`Enable Duo authenticator`}
                       </a>`
diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts
index df4b8ce29..4331547f3 100644
--- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts
+++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorStatic.ts
@@ -75,7 +75,7 @@ export class UserSettingsAuthenticatorStatic extends BaseUserSettings {
             <div class="pf-c-card__footer">
                 ${this.configureUrl
                     ? html`<a
-                          href="${this.configureUrl}?next=/%23%2Fuser"
+                          href="${this.configureUrl}?next=/${encodeURIComponent("#/settings")}"
                           class="pf-c-button pf-m-primary"
                           >${t`Enable Static Tokens`}
                       </a>`
diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts
index 12541cef2..271ccbbf6 100644
--- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts
+++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorTOTP.ts
@@ -56,7 +56,7 @@ export class UserSettingsAuthenticatorTOTP extends BaseUserSettings {
             <div class="pf-c-card__footer">
                 ${this.configureUrl
                     ? html`<a
-                          href="${this.configureUrl}?next=/%23%2Fuser"
+                          href="${this.configureUrl}?next=/${encodeURIComponent("#/settings")}"
                           class="pf-c-button pf-m-primary"
                           >${t`Enable TOTP`}
                       </a>`
diff --git a/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts b/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts
index 2ee2434dd..0ee72d294 100644
--- a/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts
+++ b/web/src/user/user-settings/stages/UserSettingsAuthenticatorWebAuthn.ts
@@ -114,7 +114,7 @@ export class UserSettingsAuthenticatorWebAuthn extends BaseUserSettings {
             <div class="pf-c-card__footer">
                 ${this.configureUrl
                     ? html`<a
-                          href="${this.configureUrl}?next=/%23%2Fuser"
+                          href="${this.configureUrl}?next=/${encodeURIComponent("#/settings")}"
                           class="pf-c-button pf-m-primary"
                           >${t`Configure WebAuthn`}
                       </a>`