From 6ff5428edf74176a53a8d2a2e843969646d199de Mon Sep 17 00:00:00 2001
From: Arne Gudermann <ag@mausbrand.de>
Date: Thu, 13 Jul 2023 21:55:10 +0200
Subject: [PATCH 1/8] Add Templates

---
 deploy/html/user_secondfactor_add.html         | 18 ++++++++++++++++++
 deploy/html/user_secondfactor_add_success.html | 16 ++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 deploy/html/user_secondfactor_add.html
 create mode 100644 deploy/html/user_secondfactor_add_success.html

diff --git a/deploy/html/user_secondfactor_add.html b/deploy/html/user_secondfactor_add.html
new file mode 100644
index 0000000..725bd98
--- /dev/null
+++ b/deploy/html/user_secondfactor_add.html
@@ -0,0 +1,18 @@
+{%- extends "viur_base.html" %}
+
+{%- block content %}
+<h1 class="headline">Add Second Factor</h1>
+	<p>Please scan the QR code with your Authenticator App and Enter the OTP token in the input below</p>
+		{{otp_uri_to_qrcode(otp_uri)}}
+
+<form method="POST" action="/user/f2_authenticatorotp/add">
+		<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
+
+		<div class="input-group">
+			<label class="label" for="otp">OTP Token</label>
+			<input class="input" id="otp" name="otp" type="text" placeholder="OTP Token">
+		</div>
+
+		<input class="btn btn--primary" type="submit" value="Validate Second Factor">
+	</form>
+{%- endblock content %}
diff --git a/deploy/html/user_secondfactor_add_success.html b/deploy/html/user_secondfactor_add_success.html
new file mode 100644
index 0000000..5ad2fae
--- /dev/null
+++ b/deploy/html/user_secondfactor_add_success.html
@@ -0,0 +1,16 @@
+{% extends "viur_base.html" %}
+
+{% block content %}
+	<h1 class="headline">Second Factor</h1>
+
+	<div class="msg msg--success is-active">
+		{{ embedSvg("icon-check") }}
+		<div class="msg-content">
+			<h3 class="msg-headline">Second Factor Add success !</h3>
+			<p>Your Second Factor has been added successfully.</p>
+		</div>
+	</div>
+
+	<a href="/user/auth_userpassword/login">Login</a>
+
+{% endblock %}

From 800977986a07333294ed70f72bece6e0e62d7820 Mon Sep 17 00:00:00 2001
From: Arne Gudermann <ag@mausbrand.de>
Date: Fri, 25 Aug 2023 17:55:22 +0200
Subject: [PATCH 2/8] Add href for otp_uri

---
 deploy/html/user_secondfactor_add.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deploy/html/user_secondfactor_add.html b/deploy/html/user_secondfactor_add.html
index 725bd98..fcc95f6 100644
--- a/deploy/html/user_secondfactor_add.html
+++ b/deploy/html/user_secondfactor_add.html
@@ -3,7 +3,10 @@
 {%- block content %}
 <h1 class="headline">Add Second Factor</h1>
 	<p>Please scan the QR code with your Authenticator App and Enter the OTP token in the input below</p>
-		{{otp_uri_to_qrcode(otp_uri)}}
+
+<a href="{{ otp_uri }}">
+  {{otp_uri_to_qrcode(otp_uri)}}
+</a>
 
 <form method="POST" action="/user/f2_authenticatorotp/add">
 		<input name="skey" type="hidden" value="{{ getSecurityKey() }}">

From 54e95f304289d8b0e4541ea1be13f93032ef8143 Mon Sep 17 00:00:00 2001
From: Sven Eberth <mail@sveneberth.de>
Date: Wed, 30 Aug 2023 21:31:26 +0200
Subject: [PATCH 3/8] Adjust template `user_login_secondfactor`

---
 deploy/html/user_login_secondfactor.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/deploy/html/user_login_secondfactor.html b/deploy/html/user_login_secondfactor.html
index 75eb91d..11199fa 100644
--- a/deploy/html/user_login_secondfactor.html
+++ b/deploy/html/user_login_secondfactor.html
@@ -1,17 +1,26 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
-	{% if action == "otp" %}
-		<h1 class="headline">OTP</h1>
+	{% if action == "otp" or action == "authenticatorOTP"  %}
+		<h1 class="headline">{{ action }}</h1>
 
-		<form action="/user/f2_timebasedotp/otp" method="POST" class="">
+		<form action="/user/f2_{{ action|lower }}/otp" method="POST" class="">
 			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
+			{% for error in skel["errors"] %}
+				<div class="msg msg--error is-active">
+					{{ embedSvg("icon-cross") }}
+					<div class="msg-content">
+						<h3 class="msg-headline">{{ error["errorMessage"] }}</h3>
+					</div>
+				</div>
+			{% endfor %}
+
 			<div class="msg msg--error {{ "is-active" if secondFactorFailed }}">
 				{{ embedSvg("icon-cross") }}
 				<div class="msg-content">
 					<h3 class="msg-headline">Error!</h3>
-					<p>The entered token was invaild!</p>
+					<p>The entered token was invalid!</p>
 				</div>
 			</div>
 

From a9791c6c06faa4b7e5bb5ffc9b0a48d41e74906e Mon Sep 17 00:00:00 2001
From: Arne Gudermann <ag@mausbrand.de>
Date: Tue, 5 Sep 2023 15:18:47 +0200
Subject: [PATCH 4/8] Change Template

---
 deploy/html/user_login_secondfactor.html |  8 ++---
 deploy/html/user_secondfactor_add.html   | 40 ++++++++++++++++--------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/deploy/html/user_login_secondfactor.html b/deploy/html/user_login_secondfactor.html
index 11199fa..efd983e 100644
--- a/deploy/html/user_login_secondfactor.html
+++ b/deploy/html/user_login_secondfactor.html
@@ -1,10 +1,10 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
-	{% if action == "otp" or action == "authenticatorOTP"  %}
+
 		<h1 class="headline">{{ action }}</h1>
 
-		<form action="/user/f2_{{ action|lower }}/otp" method="POST" class="">
+		<form action="{{action}}" method="POST" class="">
 			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
 			{% for error in skel["errors"] %}
@@ -31,7 +31,5 @@ <h3 class="msg-headline">Error!</h3>
 
 			<button type="submit" id="submitbtn" name="submit" class="btn btn--primary">Login</button>
 		</form>
-	{% else %}
-		<div>Unimplemented second factor action: {{ action }}</div>
-	{% endif %}
+
 {%- endblock content %}
diff --git a/deploy/html/user_secondfactor_add.html b/deploy/html/user_secondfactor_add.html
index fcc95f6..76ac0b7 100644
--- a/deploy/html/user_secondfactor_add.html
+++ b/deploy/html/user_secondfactor_add.html
@@ -1,21 +1,35 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
-<h1 class="headline">Add Second Factor</h1>
-	<p>Please scan the QR code with your Authenticator App and Enter the OTP token in the input below</p>
 
-<a href="{{ otp_uri }}">
-  {{otp_uri_to_qrcode(otp_uri)}}
-</a>
+		<h1 class="headline">SecondFactor</h1>
 
-<form method="POST" action="/user/f2_authenticatorotp/add">
-		<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
+		<form action="{{action}}" method="POST" class="">
+			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
-		<div class="input-group">
-			<label class="label" for="otp">OTP Token</label>
-			<input class="input" id="otp" name="otp" type="text" placeholder="OTP Token">
-		</div>
+			{% for error in skel["errors"] %}
+				<div class="msg msg--error is-active">
+					{{ embedSvg("icon-cross") }}
+					<div class="msg-content">
+						<h3 class="msg-headline">{{ error["errorMessage"] }}</h3>
+					</div>
+				</div>
+			{% endfor %}
+
+			<div class="msg msg--error {{ "is-active" if secondFactorFailed }}">
+				{{ embedSvg("icon-cross") }}
+				<div class="msg-content">
+					<h3 class="msg-headline">Error!</h3>
+					<p>The entered token was invalid!</p>
+				</div>
+			</div>
+
+			<div class="input-group">
+				<label class="label has-icon" for="otptoken">{{ embedSvg("icon-token") }}OTP Token</label>
+				<input id="username" name="otptoken" type="text" class="input js-focus" placeholder="OTP Token">
+			</div>
+
+			<button type="submit" id="submitbtn" name="submit" class="btn btn--primary">Login</button>
+		</form>
 
-		<input class="btn btn--primary" type="submit" value="Validate Second Factor">
-	</form>
 {%- endblock content %}

From 0cfde71f06edd44f73c303c20668ee126c477392 Mon Sep 17 00:00:00 2001
From: Arne Gudermann <ag@mausbrand.de>
Date: Tue, 5 Sep 2023 15:19:51 +0200
Subject: [PATCH 5/8] Change Template

---
 deploy/html/user_login_secondfactor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/html/user_login_secondfactor.html b/deploy/html/user_login_secondfactor.html
index efd983e..76ac0b7 100644
--- a/deploy/html/user_login_secondfactor.html
+++ b/deploy/html/user_login_secondfactor.html
@@ -2,7 +2,7 @@
 
 {%- block content %}
 
-		<h1 class="headline">{{ action }}</h1>
+		<h1 class="headline">SecondFactor</h1>
 
 		<form action="{{action}}" method="POST" class="">
 			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">

From 912345edea774963f4e92a4ef38ede438f24047e Mon Sep 17 00:00:00 2001
From: Sven Eberth <mail@sveneberth.de>
Date: Fri, 8 Sep 2023 21:26:17 +0200
Subject: [PATCH 6/8] Revert "Change Template"

This reverts commit 0cfde71f06edd44f73c303c20668ee126c477392.
---
 deploy/html/user_login_secondfactor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/html/user_login_secondfactor.html b/deploy/html/user_login_secondfactor.html
index 76ac0b7..efd983e 100644
--- a/deploy/html/user_login_secondfactor.html
+++ b/deploy/html/user_login_secondfactor.html
@@ -2,7 +2,7 @@
 
 {%- block content %}
 
-		<h1 class="headline">SecondFactor</h1>
+		<h1 class="headline">{{ action }}</h1>
 
 		<form action="{{action}}" method="POST" class="">
 			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">

From 0d1098807a57f3e769309901aa52cd974fedb837 Mon Sep 17 00:00:00 2001
From: Sven Eberth <mail@sveneberth.de>
Date: Fri, 8 Sep 2023 21:26:20 +0200
Subject: [PATCH 7/8] Revert "Change Template"

This reverts commit a9791c6c06faa4b7e5bb5ffc9b0a48d41e74906e.
---
 deploy/html/user_login_secondfactor.html |  8 +++--
 deploy/html/user_secondfactor_add.html   | 40 ++++++++----------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/deploy/html/user_login_secondfactor.html b/deploy/html/user_login_secondfactor.html
index efd983e..11199fa 100644
--- a/deploy/html/user_login_secondfactor.html
+++ b/deploy/html/user_login_secondfactor.html
@@ -1,10 +1,10 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
-
+	{% if action == "otp" or action == "authenticatorOTP"  %}
 		<h1 class="headline">{{ action }}</h1>
 
-		<form action="{{action}}" method="POST" class="">
+		<form action="/user/f2_{{ action|lower }}/otp" method="POST" class="">
 			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
 			{% for error in skel["errors"] %}
@@ -31,5 +31,7 @@ <h3 class="msg-headline">Error!</h3>
 
 			<button type="submit" id="submitbtn" name="submit" class="btn btn--primary">Login</button>
 		</form>
-
+	{% else %}
+		<div>Unimplemented second factor action: {{ action }}</div>
+	{% endif %}
 {%- endblock content %}
diff --git a/deploy/html/user_secondfactor_add.html b/deploy/html/user_secondfactor_add.html
index 76ac0b7..fcc95f6 100644
--- a/deploy/html/user_secondfactor_add.html
+++ b/deploy/html/user_secondfactor_add.html
@@ -1,35 +1,21 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
+<h1 class="headline">Add Second Factor</h1>
+	<p>Please scan the QR code with your Authenticator App and Enter the OTP token in the input below</p>
 
-		<h1 class="headline">SecondFactor</h1>
+<a href="{{ otp_uri }}">
+  {{otp_uri_to_qrcode(otp_uri)}}
+</a>
 
-		<form action="{{action}}" method="POST" class="">
-			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
+<form method="POST" action="/user/f2_authenticatorotp/add">
+		<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
-			{% for error in skel["errors"] %}
-				<div class="msg msg--error is-active">
-					{{ embedSvg("icon-cross") }}
-					<div class="msg-content">
-						<h3 class="msg-headline">{{ error["errorMessage"] }}</h3>
-					</div>
-				</div>
-			{% endfor %}
-
-			<div class="msg msg--error {{ "is-active" if secondFactorFailed }}">
-				{{ embedSvg("icon-cross") }}
-				<div class="msg-content">
-					<h3 class="msg-headline">Error!</h3>
-					<p>The entered token was invalid!</p>
-				</div>
-			</div>
-
-			<div class="input-group">
-				<label class="label has-icon" for="otptoken">{{ embedSvg("icon-token") }}OTP Token</label>
-				<input id="username" name="otptoken" type="text" class="input js-focus" placeholder="OTP Token">
-			</div>
-
-			<button type="submit" id="submitbtn" name="submit" class="btn btn--primary">Login</button>
-		</form>
+		<div class="input-group">
+			<label class="label" for="otp">OTP Token</label>
+			<input class="input" id="otp" name="otp" type="text" placeholder="OTP Token">
+		</div>
 
+		<input class="btn btn--primary" type="submit" value="Validate Second Factor">
+	</form>
 {%- endblock content %}

From 6d6eac9cdaf929a5b51dc2232067baaa7b8b0a94 Mon Sep 17 00:00:00 2001
From: Sven Eberth <mail@sveneberth.de>
Date: Fri, 8 Sep 2023 23:30:22 +0200
Subject: [PATCH 8/8] Adjust templates for latest core

(including bugfixes #844, #845, #846)
---
 deploy/html/user_login_secondfactor.html      | 69 +++++++++++--------
 deploy/html/user_second_factor_choice.html    | 17 +++++
 deploy/html/user_secondfactor_add.html        | 38 ++++++----
 .../html/user_secondfactor_add_success.html   | 19 +++--
 4 files changed, 92 insertions(+), 51 deletions(-)
 create mode 100644 deploy/html/user_second_factor_choice.html

diff --git a/deploy/html/user_login_secondfactor.html b/deploy/html/user_login_secondfactor.html
index 11199fa..d07a42b 100644
--- a/deploy/html/user_login_secondfactor.html
+++ b/deploy/html/user_login_secondfactor.html
@@ -1,37 +1,50 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
-	{% if action == "otp" or action == "authenticatorOTP"  %}
-		<h1 class="headline">{{ action }}</h1>
+    <h1 class="headline">{{ name }}</h1>
 
-		<form action="/user/f2_{{ action|lower }}/otp" method="POST" class="">
-			<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
+    {% if action_name == "otp" or action_name == "authenticator_otp" %}
+        {% if action_name == "otp" -%}
+            <p>{% translate "user_second_factor_otp_text", "Please enter your OTP token from your generator." %}</p>
+        {%- elif action_name == "authenticator_otp" -%}
+            <p>{% translate "user_second_factor_authenticator_otp_text", "Please enter your OTP token from your authenticator app." %}</p>
+        {%- endif %}
 
-			{% for error in skel["errors"] %}
-				<div class="msg msg--error is-active">
-					{{ embedSvg("icon-cross") }}
-					<div class="msg-content">
-						<h3 class="msg-headline">{{ error["errorMessage"] }}</h3>
-					</div>
-				</div>
-			{% endfor %}
+        <form action="{{ action_url }}" method="POST" class="">
+            <input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
-			<div class="msg msg--error {{ "is-active" if secondFactorFailed }}">
-				{{ embedSvg("icon-cross") }}
-				<div class="msg-content">
-					<h3 class="msg-headline">Error!</h3>
-					<p>The entered token was invalid!</p>
-				</div>
-			</div>
+            {% for error in skel["errors"] %}
+                <div class="msg msg--error is-active">
+                    {{ embedSvg("icon-cross") }}
+                    <div class="msg-content">
+                        <h3 class="msg-headline">{{ error["errorMessage"] }}</h3>
+                    </div>
+                </div>
+            {% endfor %}
 
-			<div class="input-group">
-				<label class="label has-icon" for="otptoken">{{ embedSvg("icon-token") }}OTP Token</label>
-				<input id="username" name="otptoken" type="text" class="input js-focus" placeholder="OTP Token">
-			</div>
+            <div class="msg msg--error {{ "is-active" if secondFactorFailed }}">
+                {{ embedSvg("icon-cross") }}
+                <div class="msg-content">
+                    <h3 class="msg-headline">{% translate "error", "Error!" %}</h3>
+                    <p>{% translate "user_second_factor_invalid_token", "The entered token was invalid!" %}</p>
+                </div>
+            </div>
 
-			<button type="submit" id="submitbtn" name="submit" class="btn btn--primary">Login</button>
-		</form>
-	{% else %}
-		<div>Unimplemented second factor action: {{ action }}</div>
-	{% endif %}
+            <div class="input-group">
+                <label class="label has-icon" for="otptoken">
+                    {{ embedSvg("icon-token") }}{% translate "user_second_factor_token", "OTP Token" %}
+                </label>
+                <input id="otptoken" name="otptoken" type="text" class="input js-focus"
+                       placeholder="{% translate "user_second_factor_token", "OTP Token" %}">
+            </div>
+
+            <button type="submit" id="submitbtn" name="submit"
+                    class="btn btn--primary">{% translate "user_second_factor_submit", "Login" %}</button>
+        </form>
+    {% else %}
+        <p>
+            {% translate "user_second_factor_unimplemented", "Unimplemented second factor action:" %} {{ name }}
+            ({{ action_name }})
+        </p>
+    {% endif %}
 {%- endblock content %}
diff --git a/deploy/html/user_second_factor_choice.html b/deploy/html/user_second_factor_choice.html
new file mode 100644
index 0000000..78abe13
--- /dev/null
+++ b/deploy/html/user_second_factor_choice.html
@@ -0,0 +1,17 @@
+{%- extends "viur_base.html" %}
+
+{%- block content %}
+    <h1 class="headline">{% translate "user_second_factor_choice_headline", "Second Factor" %}</h1>
+
+    <p>{% translate "user_second_factor_choice_text", "Your account is secured by a second factor. Please choose with which one you want to continue the login." %}</p>
+
+    <p>
+        <strong>{% translate "user_second_factor_choice_list", "Available factors" %}</strong><br>
+
+        {% for second_factor in second_factors %}
+            <a href="{{ second_factor.start_url }}">{{ translate(second_factor.NAME) }}</a>
+            {% if not loop.last %}<br>{% endif %}
+        {% endfor %}
+    </p>
+
+{%- endblock content %}
diff --git a/deploy/html/user_secondfactor_add.html b/deploy/html/user_secondfactor_add.html
index fcc95f6..310dfa6 100644
--- a/deploy/html/user_secondfactor_add.html
+++ b/deploy/html/user_secondfactor_add.html
@@ -1,21 +1,33 @@
 {%- extends "viur_base.html" %}
 
 {%- block content %}
-<h1 class="headline">Add Second Factor</h1>
-	<p>Please scan the QR code with your Authenticator App and Enter the OTP token in the input below</p>
+    <h1 class="headline">{% translate "user_second_factor_add_headline", "Add Second Factor" %}: {{ name }}</h1>
 
-<a href="{{ otp_uri }}">
-  {{otp_uri_to_qrcode(otp_uri)}}
-</a>
+    {% if action_name == "authenticator_otp" %}
+        <p>{% translate "user_second_factor_add_authenticator_otp_text", "Please scan the QR code below with your authentication app (Google Authenticator, Authy, ...) and then enter the OTP token in the field below to confirm successful setup." %}</p>
 
-<form method="POST" action="/user/f2_authenticatorotp/add">
-		<input name="skey" type="hidden" value="{{ getSecurityKey() }}">
+        <a href="{{ otp_uri }}">
+            {{ qrcode(otp_uri) }}
+        </a>
 
-		<div class="input-group">
-			<label class="label" for="otp">OTP Token</label>
-			<input class="input" id="otp" name="otp" type="text" placeholder="OTP Token">
-		</div>
+        <form method="POST" action="{{ add_url }}">
+            <input name="skey" type="hidden" value="{{ getSecurityKey() }}">
 
-		<input class="btn btn--primary" type="submit" value="Validate Second Factor">
-	</form>
+            <div class="input-group">
+                <label class="label" for="otp">
+                    {% translate "user_second_factor_token", "OTP Token" %}
+                </label>
+                <input class="input" id="otp" name="otp" type="text"
+                       placeholder="{% translate "user_second_factor_token", "OTP Token" %}">
+            </div>
+
+            <input class="btn btn--primary" type="submit"
+                   value="{% translate "user_second_factor_add_submit", "Validate Second Factor" %}">
+        </form>
+    {% else %}
+        <p>
+            {% translate "user_second_factor_unimplemented", "Unimplemented second factor action:" %} {{ name }}
+            ({{ action_name }})
+        </p>
+    {% endif %}
 {%- endblock content %}
diff --git a/deploy/html/user_secondfactor_add_success.html b/deploy/html/user_secondfactor_add_success.html
index 5ad2fae..2664f69 100644
--- a/deploy/html/user_secondfactor_add_success.html
+++ b/deploy/html/user_secondfactor_add_success.html
@@ -1,16 +1,15 @@
 {% extends "viur_base.html" %}
 
 {% block content %}
-	<h1 class="headline">Second Factor</h1>
+    <h1 class="headline">{% translate "user_second_factor_add_headline", "Add Second Factor" %}</h1>
 
-	<div class="msg msg--success is-active">
-		{{ embedSvg("icon-check") }}
-		<div class="msg-content">
-			<h3 class="msg-headline">Second Factor Add success !</h3>
-			<p>Your Second Factor has been added successfully.</p>
-		</div>
-	</div>
-
-	<a href="/user/auth_userpassword/login">Login</a>
+    <div class="msg msg--success is-active">
+        {{ embedSvg("icon-check") }}
+        <div class="msg-content">
+            <h3 class="msg-headline">{% translate "user_second_factor_add_success_msg", "Done" %}</h3>
+            <p>{% translate "user_second_factor_add_success_text", "Your second factor has been successfully added." %}</p>
+        </div>
+    </div>
 
+    <a href="/user/login">{% translate "login", "Login" %}</a>
 {% endblock %}