From 2a21ebf7b0b4859b758df0bf1af3a106808cf991 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Thu, 4 Nov 2021 15:39:10 +0100
Subject: [PATCH] web/flows: fix authenticator_validate not allowing
 alpha-numeric codes due to empty pattern

closes #1663

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .../AuthenticatorValidateStageCode.ts                       | 6 ++++--
 web/src/locales/en.po                                       | 4 ++++
 web/src/locales/fr_FR.po                                    | 4 ++++
 web/src/locales/pseudo-LOCALE.po                            | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
index adb747b43..42db1d0d1 100644
--- a/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+++ b/web/src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
@@ -67,7 +67,9 @@ export class AuthenticatorValidateStageWebCode extends BaseStage<
                         ? html`<p>${t`A code has been sent to you via SMS.`}</p>`
                         : html``}
                     <ak-form-element
-                        label="${t`Code`}"
+                        label="${this.deviceChallenge?.deviceClass === DeviceClassesEnum.Static
+                            ? t`Static token`
+                            : t`Code`}"
                         ?required="${true}"
                         class="pf-c-form__group"
                         .errors=${(this.challenge?.responseErrors || {})["code"]}
@@ -82,7 +84,7 @@ export class AuthenticatorValidateStageWebCode extends BaseStage<
                                 : "numeric"}"
                             pattern="${this.deviceChallenge?.deviceClass ===
                             DeviceClassesEnum.Static
-                                ? ""
+                                ? "[0-9a-zA-Z]*"
                                 : "[0-9]*"}"
                             placeholder="${t`Please enter your Code`}"
                             autofocus=""
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 05d222c8b..3ca13bff9 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -4218,6 +4218,10 @@ msgstr "Static Tokens"
 msgid "Static authenticator"
 msgstr "Static authenticator"
 
+#: src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+msgid "Static token"
+msgstr "Static token"
+
 #: src/user/user-settings/mfa/MFADevicesPage.ts
 msgid "Static tokens"
 msgstr "Static tokens"
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index 9bdee46ca..76577abc2 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -4176,6 +4176,10 @@ msgstr "Jetons statiques"
 msgid "Static authenticator"
 msgstr ""
 
+#: src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+msgid "Static token"
+msgstr ""
+
 #: src/user/user-settings/mfa/MFADevicesPage.ts
 msgid "Static tokens"
 msgstr "Jetons statiques"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index 3bdb85ce7..588acbb3a 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -4210,6 +4210,10 @@ msgstr ""
 msgid "Static authenticator"
 msgstr ""
 
+#: src/flows/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+msgid "Static token"
+msgstr ""
+
 #: src/user/user-settings/mfa/MFADevicesPage.ts
 msgid "Static tokens"
 msgstr ""