From ef371b3750e856c5bf132174ca3eba1d04c9a775 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Fri, 18 Mar 2022 19:41:03 +0100
Subject: [PATCH] web/admin: default to not include current session in flow
 play, add option to start with current session

closes #2527

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/locales/de.po               |  4 ++++
 web/src/locales/en.po               |  4 ++++
 web/src/locales/es.po               |  4 ++++
 web/src/locales/fr_FR.po            |  4 ++++
 web/src/locales/pl.po               |  4 ++++
 web/src/locales/pseudo-LOCALE.po    |  4 ++++
 web/src/locales/tr.po               |  4 ++++
 web/src/locales/zh-Hans.po          |  4 ++++
 web/src/locales/zh-Hant.po          |  4 ++++
 web/src/locales/zh_TW.po            |  4 ++++
 web/src/pages/flows/FlowListPage.ts | 17 +++++------------
 web/src/pages/flows/FlowViewPage.ts | 15 ++++++++++++++-
 12 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/web/src/locales/de.po b/web/src/locales/de.po
index 705f9778a..d3647da62 100644
--- a/web/src/locales/de.po
+++ b/web/src/locales/de.po
@@ -6181,6 +6181,10 @@ msgstr "Die Referenz wird auf den Standardwert zurückgesetzt"
 msgid "reference will be set to an empty value"
 msgstr "Referenz wird auf einen leeren Wert gesetzt"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "Mit Inspektor"
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index dc4c3e68d..b19a9d1ce 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -6303,6 +6303,10 @@ msgstr "reference will be reset to default value"
 msgid "reference will be set to an empty value"
 msgstr "reference will be set to an empty value"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr "with current user"
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "with inspector"
diff --git a/web/src/locales/es.po b/web/src/locales/es.po
index bd7a615c7..ad17fc867 100644
--- a/web/src/locales/es.po
+++ b/web/src/locales/es.po
@@ -6175,6 +6175,10 @@ msgstr "la referencia se restablecerá al valor predeterminado"
 msgid "reference will be set to an empty value"
 msgstr "la referencia se establecerá en un valor vacío"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "con inspector"
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index cab66c322..e2029a578 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -6236,6 +6236,10 @@ msgstr "la référence sera réinitialisée à sa valeur par défaut"
 msgid "reference will be set to an empty value"
 msgstr "la référence sera réinitialisée à une valeur vide"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr ""
diff --git a/web/src/locales/pl.po b/web/src/locales/pl.po
index d881d9ada..aaa9a17f2 100644
--- a/web/src/locales/pl.po
+++ b/web/src/locales/pl.po
@@ -6172,6 +6172,10 @@ msgstr "odniesienie zostanie zresetowane do wartości domyślnej"
 msgid "reference will be set to an empty value"
 msgstr "referencja zostanie ustawiona na pustą wartość"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "z inspektorem"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index 1a7e6cc9c..bf27c69b9 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -6279,6 +6279,10 @@ msgstr ""
 msgid "reference will be set to an empty value"
 msgstr ""
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr ""
diff --git a/web/src/locales/tr.po b/web/src/locales/tr.po
index 25a997e36..edb442ffb 100644
--- a/web/src/locales/tr.po
+++ b/web/src/locales/tr.po
@@ -6177,6 +6177,10 @@ msgstr "referans varsayılan değere sıfırlanır"
 msgid "reference will be set to an empty value"
 msgstr "referans boş bir değere ayarlanacaktır"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "müfettiş ile"
diff --git a/web/src/locales/zh-Hans.po b/web/src/locales/zh-Hans.po
index c3f2f9400..b2a9feed3 100644
--- a/web/src/locales/zh-Hans.po
+++ b/web/src/locales/zh-Hans.po
@@ -6170,6 +6170,10 @@ msgstr "引用将被重置为默认值"
 msgid "reference will be set to an empty value"
 msgstr "引用将被设置为空值"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "附加检视器"
diff --git a/web/src/locales/zh-Hant.po b/web/src/locales/zh-Hant.po
index e6318b70b..de03eeae2 100644
--- a/web/src/locales/zh-Hant.po
+++ b/web/src/locales/zh-Hant.po
@@ -6170,6 +6170,10 @@ msgstr "引用将被重置为默认值"
 msgid "reference will be set to an empty value"
 msgstr "引用将被设置为空值"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "和检查员一起"
diff --git a/web/src/locales/zh_TW.po b/web/src/locales/zh_TW.po
index c3bfc8457..2cef01606 100644
--- a/web/src/locales/zh_TW.po
+++ b/web/src/locales/zh_TW.po
@@ -6170,6 +6170,10 @@ msgstr "引用将被重置为默认值"
 msgid "reference will be set to an empty value"
 msgstr "引用将被设置为空值"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with current user"
+msgstr ""
+
 #: src/pages/flows/FlowViewPage.ts
 msgid "with inspector"
 msgstr "和检查员一起"
diff --git a/web/src/pages/flows/FlowListPage.ts b/web/src/pages/flows/FlowListPage.ts
index 0d69c3bc8..c0b7e3921 100644
--- a/web/src/pages/flows/FlowListPage.ts
+++ b/web/src/pages/flows/FlowListPage.ts
@@ -6,7 +6,7 @@ import { customElement, property } from "lit/decorators.js";
 import { Flow, FlowsApi } from "@goauthentik/api";
 
 import { AKResponse } from "../../api/Client";
-import { DEFAULT_CONFIG } from "../../api/Config";
+import { AndNext, DEFAULT_CONFIG } from "../../api/Config";
 import { uiConfig } from "../../common/config";
 import "../../elements/buttons/SpinnerButton";
 import "../../elements/forms/ConfirmationForm";
@@ -113,17 +113,10 @@ export class FlowListPage extends TablePage<Flow> {
                 <button
                     class="pf-c-button pf-m-plain"
                     @click=${() => {
-                        new FlowsApi(DEFAULT_CONFIG)
-                            .flowsInstancesExecuteRetrieve({
-                                slug: item.slug,
-                            })
-                            .then((link) => {
-                                window.open(
-                                    `${link.link}?inspector&next=${encodeURIComponent(
-                                        `/#${window.location.href}`,
-                                    )}`,
-                                );
-                            });
+                        const finalURL = `${window.location.origin}/if/flows/${item.slug}/${AndNext(
+                            `${window.location.pathname}#${window.location.hash}`,
+                        )}`;
+                        window.open(finalURL, "_blank");
                     }}
                 >
                     <i class="fas fa-play"></i>
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts
index 75b372932..5753700a3 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/pages/flows/FlowViewPage.ts
@@ -119,6 +119,19 @@ export class FlowViewPage extends LitElement {
                                             <div class="pf-c-description-list__text">
                                                 <button
                                                     class="pf-c-button pf-m-primary"
+                                                    @click=${() => {
+                                                        const finalURL = `${
+                                                            window.location.origin
+                                                        }/if/flows/${this.flow.slug}/${AndNext(
+                                                            `${window.location.pathname}#${window.location.hash}`,
+                                                        )}`;
+                                                        window.open(finalURL, "_blank");
+                                                    }}
+                                                >
+                                                    ${t`Normal`}
+                                                </button>
+                                                <button
+                                                    class="pf-c-button pf-m-secondary"
                                                     @click=${() => {
                                                         new FlowsApi(DEFAULT_CONFIG)
                                                             .flowsInstancesExecuteRetrieve({
@@ -134,7 +147,7 @@ export class FlowViewPage extends LitElement {
                                                             });
                                                     }}
                                                 >
-                                                    ${t`Normal`}
+                                                    ${t`with current user`}
                                                 </button>
                                                 <button
                                                     class="pf-c-button pf-m-secondary"