From 677836f6f5e705285ba3c872e70114c804ff2149 Mon Sep 17 00:00:00 2001
From: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Date: Fri, 13 Aug 2021 12:10:48 +0200
Subject: [PATCH] fix: add ids to buttons (#2186)

* fix: add ids to buttons

* fix: add ids to buttons

* fix:  fix name

* fix: button fixes
---
 .../ui/login/handler/external_login_handler.go     |  4 ++--
 internal/ui/login/handler/renderer.go              |  4 ++--
 .../resources/scripts/external_not_found_check.js  | 13 +++++++++----
 .../templates/external_not_found_option.html       | 14 ++++++--------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/internal/ui/login/handler/external_login_handler.go b/internal/ui/login/handler/external_login_handler.go
index 0fbf71f470..acce955aba 100644
--- a/internal/ui/login/handler/external_login_handler.go
+++ b/internal/ui/login/handler/external_login_handler.go
@@ -32,8 +32,8 @@ type externalIDPCallbackData struct {
 }
 
 type externalNotFoundOptionFormData struct {
-	Link         bool `schema:"link"`
-	AutoRegister bool `schema:"autoregister"`
+	Link         bool `schema:"linkbutton"`
+	AutoRegister bool `schema:"autoregisterbutton"`
 	ResetLinking bool `schema:"resetlinking"`
 	TermsConfirm bool `schema:"terms-confirm"`
 }
diff --git a/internal/ui/login/handler/renderer.go b/internal/ui/login/handler/renderer.go
index 92fe60a641..91f61f95df 100644
--- a/internal/ui/login/handler/renderer.go
+++ b/internal/ui/login/handler/renderer.go
@@ -188,8 +188,8 @@ func CreateRenderer(pathPrefix string, staticDir http.FileSystem, staticStorage
 		"changeUsernameUrl": func() string {
 			return path.Join(r.pathPrefix, EndpointChangeUsername)
 		},
-		"externalNotFoundOptionUrl": func() string {
-			return path.Join(r.pathPrefix, EndpointExternalNotFoundOption)
+		"externalNotFoundOptionUrl": func(action string) string {
+			return path.Join(r.pathPrefix, EndpointExternalNotFoundOption+"?"+action+"=true")
 		},
 		"selectedLanguage": func(l string) bool {
 			return false
diff --git a/internal/ui/login/static/resources/scripts/external_not_found_check.js b/internal/ui/login/static/resources/scripts/external_not_found_check.js
index e84eb4b863..a3cd22dc86 100644
--- a/internal/ui/login/static/resources/scripts/external_not_found_check.js
+++ b/internal/ui/login/static/resources/scripts/external_not_found_check.js
@@ -1,5 +1,10 @@
-let button1 = document.getElementById("link-button");
-disableSubmit(undefined, button1);
+let buttons1 = document.getElementsByName("linkbutton");
 
-let button2 = document.getElementById("auto-register-button");
-disableSubmit(undefined, button2);
\ No newline at end of file
+for (let i = 0; i < buttons1.length; i++) {
+    disableSubmit(undefined, buttons1[i]);
+}
+
+let buttons2 = document.getElementsByName("autoregisterbutton");
+for (let i = 0; i < buttons2.length; i++) {
+    disableSubmit(undefined, buttons2[i]);
+}
diff --git a/internal/ui/login/static/templates/external_not_found_option.html b/internal/ui/login/static/templates/external_not_found_option.html
index 81bb533e87..16910d3a0a 100644
--- a/internal/ui/login/static/templates/external_not_found_option.html
+++ b/internal/ui/login/static/templates/external_not_found_option.html
@@ -7,7 +7,7 @@
 </div>
 
 
-<form action="{{ externalNotFoundOptionUrl }}" method="POST">
+<form action="{{ externalNotFoundOptionUrl "none" }}" method="POST">
 
     {{ .CSRF }}
 
@@ -18,9 +18,9 @@
         <div class="lgn-field">
             <label class="lgn-label">{{t "ExternalNotFoundOption.TosAndPrivacyLabel"}}</label>
             <div class="lgn-checkbox">
-                <input type="checkbox" id="register-term-confirmation"
-                       name="register-term-confirmation" required>
-                <label for="register-term-confirmation">
+                <input type="checkbox" id="terms-confirm"
+                       name="terms-confirm" required>
+                <label for="terms-confirm">
                     {{t "ExternalNotFoundOption.TosConfirm"}}
                     {{ if .TOSLink }}
                     <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
@@ -49,16 +49,14 @@
             <i class="lgn-icon-arrow-left-solid"></i>
         </button>
 
-        <button class="lgn-raised-button lgn-primary" name="link" value="true">
+        <button type="submit" formaction="{{ externalNotFoundOptionUrl "linkbutton"}}" class="lgn-raised-button lgn-primary" name="linkbutton" value="true">
             {{t "ExternalNotFoundOption.LinkButtonText"}}
         </button>
             <span class="fill-space"></span>
-        <button class="lgn-raised-button lgn-primary" name="autoregister" value="true">
+        <button type="submit" formaction="{{ externalNotFoundOptionUrl "autoregisterbutton"}}" class="lgn-raised-button lgn-primary" name="autoregisterbutton" value="true">
             {{t "ExternalNotFoundOption.AutoRegisterButtonText"}}
         </button>
     </div>
-
-    {{template "error-message" .}}
 </form>
 
 <script src="{{ resourceUrl "scripts/form_submit.js" }}"></script>