From da50eb0369443da018fc52dbb4eba21156d90fe2 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 6 Nov 2021 12:57:06 +0100
Subject: [PATCH] web/user: fix redirect after starting configuration flow from
 user interface

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

diff --git a/web/src/user/user-settings/details/UserPassword.ts b/web/src/user/user-settings/details/UserPassword.ts
index 8356bb544..6ef941396 100644
--- a/web/src/user/user-settings/details/UserPassword.ts
+++ b/web/src/user/user-settings/details/UserPassword.ts
@@ -28,7 +28,12 @@ export class UserSettingsPassword extends LitElement {
         return html`<div class="pf-c-card">
             <div class="pf-c-card__title">${t`Change your password`}</div>
             <div class="pf-c-card__body">
-                <a href="${ifDefined(this.configureUrl)}" class="pf-c-button pf-m-primary">
+                <a
+                    href="${ifDefined(this.configureUrl)}?next=${encodeURIComponent(
+                        "/if/user/#/settings;page-details",
+                    )}"
+                    class="pf-c-button pf-m-primary"
+                >
                     ${t`Change password`}
                 </a>
             </div>
diff --git a/web/src/user/user-settings/mfa/MFADevicesPage.ts b/web/src/user/user-settings/mfa/MFADevicesPage.ts
index 92beaab20..1bd440bfa 100644
--- a/web/src/user/user-settings/mfa/MFADevicesPage.ts
+++ b/web/src/user/user-settings/mfa/MFADevicesPage.ts
@@ -78,7 +78,11 @@ export class MFADevicesPage extends Table<Device> {
                                 .map((stage) => {
                                     return html`<li>
                                         <a
-                                            href="${ifDefined(stage.configureUrl)}"
+                                            href="${ifDefined(
+                                                stage.configureUrl,
+                                            )}?next=${encodeURIComponent(
+                                                "/if/user/#/settings;page-mfa",
+                                            )}"
                                             class="pf-c-dropdown__menu-item"
                                         >
                                             ${stageToAuthenticatorName(stage)}
diff --git a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
index 2560a1982..e1ac64f0d 100644
--- a/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
+++ b/web/src/user/user-settings/sources/SourceSettingsOAuth.ts
@@ -45,7 +45,12 @@ export class SourceSettingsOAuth extends BaseUserSettings {
                             </button>`;
                     }
                     return html`<p>${t`Not connected.`}</p>
-                        <a class="pf-c-button pf-m-primary" href=${ifDefined(this.configureUrl)}>
+                        <a
+                            class="pf-c-button pf-m-primary"
+                            href="${ifDefined(this.configureUrl)}?next=${encodeURIComponent(
+                                "/if/user/#/settings;page-sources",
+                            )}"
+                        >
                             ${t`Connect`}
                         </a>`;
                 }),