From dce623dd7c3dde9120fde3e60e86953d41e0d00b Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 21 May 2022 17:07:30 +0200
Subject: [PATCH] web/user: fix use sub-pages not redirecting back to the
 subpage

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/user/user-settings/details/UserPassword.ts        | 2 +-
 web/src/user/user-settings/mfa/MFADevicesPage.ts          | 4 +++-
 web/src/user/user-settings/sources/SourceSettingsOAuth.ts | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/src/user/user-settings/details/UserPassword.ts b/web/src/user/user-settings/details/UserPassword.ts
index e41ad101e..4c5fec3c7 100644
--- a/web/src/user/user-settings/details/UserPassword.ts
+++ b/web/src/user/user-settings/details/UserPassword.ts
@@ -32,7 +32,7 @@ export class UserSettingsPassword extends LitElement {
             <div class="pf-c-card__body">
                 <a
                     href="${ifDefined(this.configureUrl)}${AndNext(
-                        "/if/user/#/settings;page-details",
+                        `/if/user/#/settings;${JSON.stringify({ page: "page-details" })}`,
                     )}"
                     class="pf-c-button pf-m-primary"
                 >
diff --git a/web/src/user/user-settings/mfa/MFADevicesPage.ts b/web/src/user/user-settings/mfa/MFADevicesPage.ts
index 437f0c7b5..d074ac4fa 100644
--- a/web/src/user/user-settings/mfa/MFADevicesPage.ts
+++ b/web/src/user/user-settings/mfa/MFADevicesPage.ts
@@ -79,7 +79,9 @@ export class MFADevicesPage extends Table<Device> {
                                     return html`<li>
                                         <a
                                             href="${ifDefined(stage.configureUrl)}${AndNext(
-                                                "/if/user/#/settings;page-mfa",
+                                                `/if/user/#/settings;${JSON.stringify({
+                                                    page: "page-mfa",
+                                                })}`,
                                             )}"
                                             class="pf-c-dropdown__menu-item"
                                         >
diff --git a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
index 8fd137119..13801f64e 100644
--- a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
+++ b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
@@ -52,7 +52,7 @@ export class SourceSettingsOAuth extends BaseUserSettings {
                     return html` <a
                         class="pf-c-button pf-m-primary"
                         href="${ifDefined(this.configureUrl)}${AndNext(
-                            "/if/user/#/settings;page-sources",
+                            `/if/user/#/settings;${JSON.stringify({ page: "page-sources" })}`,
                         )}"
                     >
                         ${t`Connect`}