Merge branch 'master' into feature/myopportunity_verify_import

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/info.ftl

@@ -0,0 +1,24 @@
+<#import "template.ftl" as layout>
+<@layout.registrationLayout displayMessage=false; section>
+    <#if section = "header">
+        <#if messageHeader??>
+            ${kcSanitize(msg("${messageHeader}"))?no_esc}
+        <#else>
+        ${message.summary}
+        </#if>
+    <#elseif section = "form">
+    <div id="kc-info-message">
+        <p class="instruction">${message.summary}<#if requiredActions??><#list requiredActions>: <b><#items as reqActionItem>${kcSanitize(msg("requiredAction.${reqActionItem}"))?no_esc}<#sep>, </#items></b></#list><#else></#if></p>
+        <#if skipLink??>
+        <#else>
+            <#if pageRedirectUri?has_content>
+                <p><a href="${pageRedirectUri}">${kcSanitize(msg("backToApplication"))?no_esc}</a></p>
+            <#elseif actionUri?has_content>
+                <p><a href="${actionUri}">${kcSanitize(msg("proceedWithAction"))?no_esc}</a></p>
+            <#elseif (client.baseUrl)?has_content>
+                <p><a href="${client.baseUrl}">${kcSanitize(msg("backToApplication"))?no_esc}</a></p>
+            </#if>
+        </#if>
+    </div>
+    </#if>
+</@layout.registrationLayout>

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/login-reset-password.ftl

@@ -84,7 +84,7 @@
                           </div>
 
                           <#-- LABEL: code send success -->
-                          <span v-if="isCodeSent && !phoneVerified && !messagePhoneNumberError" aria-live="polite" style="color: green;">
+                          <span v-if="isCodeSent && !messagePhoneNumberError" aria-live="polite" style="color: green;">
                             <span style="margin-right: 5px;">✅</span> {{ messageCodeSent }}
                           </span>
 
@@ -248,7 +248,6 @@
                   event.target.submit(); // Programmatically submit the form
                 },
                 resetPhoneVerification() {
-                  this.phoneVerified = false;
                   this.isCodeSent = false;
                   this.resetSendCodeButton = true;
                   this.clearMessages();

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/login-update-phone-number.ftl

@@ -192,7 +192,6 @@
               event.target.submit(); // Programmatically submit the form
             },
             resetPhoneVerification() {
-              this.phoneVerified = false;
               this.isCodeSent = false;
               this.resetSendCodeButton = true;
               this.clearMessages();

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/login-verify-email.ftl

@@ -0,0 +1,16 @@
+<#import "template.ftl" as layout>
+<@layout.registrationLayout displayInfo=true; section>
+    <#if section = "header">
+        ${msg("emailVerifyTitle")}
+    <#elseif section = "form">
+        <p class="instruction">${msg("emailVerifyInstruction1",user.email)}</p>
+    <#elseif section = "info">
+        <p class="instruction">
+            ${msg("emailVerifyInstruction2")}
+            <br/>
+            <br/>
+            ${msg("emailVerifyInstruction3")}
+            <a href="${url.loginAction}" class="form-link">${msg("doClickHere")}</a> ${msg("emailVerifyInstruction4")}
+        </p>
+    </#if>
+</@layout.registrationLayout>

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/login.ftl

@@ -91,7 +91,7 @@
                       </div>
 
                       <#-- LABEL: code send success -->
-                      <span v-if="isCodeSent && !phoneVerified && !messagePhoneNumberError" aria-live="polite" style="color: green;">
+                      <span v-if="isCodeSent && !messagePhoneNumberError" aria-live="polite" style="color: green;">
                         <span style="margin-right: 5px;">✅</span> {{ messageCodeSent }}
                       </span>
 

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/messages/messages_en.properties

@@ -191,10 +191,10 @@ oauth2DeviceVerificationFailedMessage=You may close this browser window and go b
 oauth2DeviceConsentDeniedMessage=Consent denied for connecting the device.
 oauth2DeviceAuthorizationGrantDisabledMessage=Client is not allowed to initiate OAuth 2.0 Device Authorization Grant. The flow is disabled for the client.
 
-# emailVerifyInstruction1=An email with instructions to verify your email address has been sent to your address {0}.
-emailVerifyInstruction1=We''ve sent a verification link to
+emailVerifyInstruction1=We''ve sent a verification link to {0}.
 emailVerifyInstruction2=If you haven''t spotted the verification email yet, take a look in your ''spam'' or ''bulk email'' folder.
-emailVerifyInstruction3=Still can''t find it?  Just hit the button below, and we''ll happily send another one your way.
+emailVerifyInstruction3=Still can''t find it?
+emailVerifyInstruction4=to re-send the email.
 
 emailLinkIdpTitle=Link {0}
 emailLinkIdp1=An email with instructions to link {0} account {1} with your {2} account has been sent to you.

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/messages/messages_es.properties

@@ -132,9 +132,10 @@ loginTotpDeviceName=Nombre del dispositivo
 oauthGrantRequest=¿Quieres permitir estos privilegios de acceso?
 inResource=en
 
-emailVerifyInstruction1=Te hemos enviado un email con instrucciones para verificar tu email.
-emailVerifyInstruction2=¿No has recibido un código de verificación en tu email?
-emailVerifyInstruction3=para reenviar el email.
+emailVerifyInstruction1=Hemos enviado un enlace de verificación a {0}.
+emailVerifyInstruction2=Si aún no has encontrado el correo de verificación, revisa tu carpeta de ''spam'' o ''correo no deseado''.
+emailVerifyInstruction3=¿Aún no lo encuentras?
+emailVerifyInstruction4=para reenviar el correo electrónico.
 
 backToLogin=« Volver a la identificación
 

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/messages/messages_fr.properties

@@ -174,9 +174,10 @@ oauth2DeviceVerificationFailedMessage=Vous pouvez fermer cette fenêtre de navig
 oauth2DeviceConsentDeniedMessage=Consentement refusé pour connecter l''appareil.
 oauth2DeviceAuthorizationGrantDisabledMessage=Le client n''est pas autorisé à initier OAuth 2.0 Device Authorization Grant. Le flux est désactivé pour ce client.
 
-emailVerifyInstruction1=Un courriel avec des instructions à suivre vous a été envoyé.
-emailVerifyInstruction2=Vous n''avez pas reçu de code dans le courriel ?
-emailVerifyInstruction3=pour renvoyer le courriel.
+emailVerifyInstruction1=Nous avons envoyé un lien de vérification à {0}.
+emailVerifyInstruction2=Si vous n''avez pas encore trouvé l''e-mail de vérification, vérifiez votre dossier ''spam'' ou ''courrier indésirable''.
+emailVerifyInstruction3=Vous ne le trouvez toujours pas ?
+emailVerifyInstruction4=pour renvoyer l''e-mail.
 
 emailLinkIdpTitle=Association avec {0}
 emailLinkIdp1=Un courriel avec des instructions pour associer le compte {1} sur {0} avec votre compte {2} vous a été envoyé.

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/messages/messages_pt.properties

@@ -191,9 +191,10 @@ oauth2DeviceVerificationFailedMessage=Você pode fechar esta janela do navegador
 oauth2DeviceConsentDeniedMessage=Consentimento negado para conectar o dispositivo.
 oauth2DeviceAuthorizationGrantDisabledMessage=O cliente não tem permissão para iniciar a Autorização OAuth 2.0 do Dispositivo. O fluxo está desativado para o cliente.
 
-emailVerifyInstruction1=Enviamos um link de verificação para
-emailVerifyInstruction2=Se você ainda não encontrou o email de verificação, verifique sua pasta de ''spam'' ou ''lixo eletrônico''.
-emailVerifyInstruction3=Ainda não encontrou? Basta clicar no botão abaixo e enviaremos outro com prazer.
+emailVerifyInstruction1=Tumetuma kiungo cha uthibitisho kwa {0}.
+emailVerifyInstruction2=Kama bado hujaona barua pepe ya uthibitisho, angalia folda yako ya ''taka'' au ''barua pepe nyingi''.
+emailVerifyInstruction3=Bado hujaipata?
+emailVerifyInstruction4=kutuma tena barua pepe.
 
 emailLinkIdpTitle=Vincular {0}
 emailLinkIdp1=Um email com instruções para vincular a conta {0} {1} com sua conta {2} foi enviado para você.

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/messages/messages_sw.properties

@@ -191,9 +191,9 @@ oauth2DeviceVerificationFailedMessage=Unaweza kufunga dirisha hili la kivinjari
 oauth2DeviceConsentDeniedMessage=Idhini imekataliwa kwa kuunganisha kifaa.
 oauth2DeviceAuthorizationGrantDisabledMessage=Mteja haruhusiwi kuanzisha Idhini ya Uthibitishaji wa Kifaa cha OAuth 2.0. Mtiririko umezimwa kwa mteja.
 
-emailVerifyInstruction1=Tumekutumia kiungo cha uthibitisho
-emailVerifyInstruction2=Kama hujaona barua pepe ya uthibitisho, tafadhali angalia kwenye folda ya ''spam'' au ''barua taka''.
-emailVerifyInstruction3=Bado hujaiona? Bofya kitufe hapo chini, na tutakutumia nyingine kwa furaha.
+emailVerifyInstruction1=Tumetuma kiungo cha uthibitisho kwa {0}.
+emailVerifyInstruction2=Hujapokea nambari ya uthibitisho kwenye barua pepe yako?
+emailVerifyInstruction3=kutuma tena barua pepe.
 
 emailLinkIdpTitle=Unganisha {0}
 emailLinkIdp1=Barua pepe yenye maagizo ya kuunganisha akaunti ya {0} {1} na akaunti yako ya {2} imetumwa kwako.

src/keycloak/providers/keycloak-phone-provider.resources/src/main/resources/theme/phone/login/resources/css/styles.css

@@ -132,12 +132,8 @@ h1,
   font-size: 16px;
 }
 
-.verify-instructions {
-  display: flex;
-  flex-direction: column;
-  gap: 0px;
-  align-items: center;
-  justify-content: center;
+.instruction a {
+  display: inline;
 }
 
 #forget-password-text {