Update identifier label

wso2 · Sep 3, 2021 · 6dc16b7 · 6dc16b7
1 parent f44c7b8
commit 6dc16b7
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 23 deletions.
diff --git a/...es/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/...es/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties
@@ -21,7 +21,7 @@ welcome=Welcome
 account.linking=Account Linking
 username=Username
 email.username=Email address
-identifier.username=Identifier
+user.identifier=User Identifier
 password=Password
 confirm.password=Confirm Password
 email=Email

diff --git a/.../wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/.../wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties
@@ -21,7 +21,7 @@ welcome=Bienvenue
 account.linking=Liaison de compte
 username=Nom d'utilisateur
 email.username=Courriel (Nom d'utilisateur)
-identifier.username=Identifiant
+user.identifier=Identifiant de l'utilisateur
 password=Mot de passe
 confirm.password=Confirmer le mot de passe
 email=Courriel

diff --git a/apps/authentication-portal/src/main/webapp/basicauth.jsp b/apps/authentication-portal/src/main/webapp/basicauth.jsp
@@ -118,10 +118,10 @@
     Boolean isEmailUsernameEnabled = false;
     String usernameLabel = "username";
 
-    Boolean isSelfSignUpEnabledInTenant = false;
-    Boolean isUsernameRecoveryEnabledInTenant = false;
-    Boolean isPasswordRecoveryEnabledInTenant = false;
-    Boolean isMultiAttributeLoginEnabledInTenant = false;
+    Boolean isSelfSignUpEnabledInTenant;
+    Boolean isUsernameRecoveryEnabledInTenant;
+    Boolean isPasswordRecoveryEnabledInTenant;
+    Boolean isMultiAttributeLoginEnabledInTenant;
 
     if (StringUtils.isNotBlank(emailUsernameEnable)) {
         isEmailUsernameEnabled = Boolean.valueOf(emailUsernameEnable);
@@ -147,7 +147,7 @@
     if (isEmailUsernameEnabled == true) {
         usernameLabel = "email.username";
     } else if (isMultiAttributeLoginEnabledInTenant) {
-        usernameLabel = "identifier.username";
+        usernameLabel = "user.identifier";
     }
 
     String resendUsername = request.getParameter("resend_username");

diff --git a/apps/authentication-portal/src/main/webapp/identifierauth.jsp b/apps/authentication-portal/src/main/webapp/identifierauth.jsp
@@ -37,9 +37,9 @@
 
 <%
     String emailUsernameEnable = application.getInitParameter("EnableEmailUserName");
-    Boolean isEmailUsernameEnabled = false;
+    Boolean isEmailUsernameEnabled;
     String usernameLabel = "username";
-    Boolean isMultiAttributeLoginEnabledInTenant = false;
+    Boolean isMultiAttributeLoginEnabledInTenant;
 
     if (StringUtils.isNotBlank(emailUsernameEnable)) {
         isEmailUsernameEnabled = Boolean.valueOf(emailUsernameEnable);
@@ -62,7 +62,7 @@
     if (isEmailUsernameEnabled == true) {
         usernameLabel = "email.username";
     } else if (isMultiAttributeLoginEnabledInTenant) {
-        usernameLabel = "identifier.username";
+        usernameLabel = "user.identifier";
     }
 %>
 

diff --git a/...c/main/resources/org/wso2/carbon/identity/mgt/recovery/endpoint/i18n/Resources.properties b/...c/main/resources/org/wso2/carbon/identity/mgt/recovery/endpoint/i18n/Resources.properties
@@ -26,7 +26,7 @@ Recover.password=Recover Password
 email.username=Email address
 Enter.detail.to.recover.pwd=Enter below details to recover your password
 Username=Username
-Identifier=Identifier
+User.identifier=User Identifier
 Recover.with.mail=Recover with Mail
 Recover.with.question=Recover with Security Questions
 Submit=Submit
@@ -101,7 +101,7 @@ Need.to.select.all.mandatory.attributes=You need to select all mandatory attribu
 Ok=Ok
 Start.signing.up=Start Signing Up
 Enter.your.username.here=Enter your username here
-Enter.your.identifier.here=Enter your identifier here
+Enter.your.user.identifier.here=Enter your user identifier here
 If.you.specify.tenant.domain.you.registered.under.super.tenant=If you do not specify a tenant domain, you will be registered under super tenant
 Proceed.to.self.register=Proceed to Self Register
 Confirm.Privacy.Policy=Please confirm that you have read and understood the Privacy Policy

diff --git a/.../resources/org/wso2/carbon/identity/mgt/recovery/endpoint/i18n/Resources_fr_FR.properties b/.../resources/org/wso2/carbon/identity/mgt/recovery/endpoint/i18n/Resources_fr_FR.properties
@@ -25,7 +25,7 @@ Identity.server=Identity Server
 Recover.password=Récupérez son mot de passe
 Enter.detail.to.recover.pwd=Entrer les détails ci-dessous pour récupérer votre mot de passe
 Username=Nom d'utilisateur
-Identifier=Identifiant
+User.identifier=Identifiant de l'utilisateur
 Recover.with.mail=récupérer avec l'adresse mail
 Recover.with.question=récupérer avec les questions de sécurité
 Submit=Soumettre
@@ -98,7 +98,7 @@ Need.to.select.all.mandatory.attributes=Vous devez sélectionner tous les attrib
 Ok=Ok
 Start.signing.up=Commencer la connexion
 Enter.your.username.here=Entrer votre nom d'utilisateur ici
-Enter.your.identifier.here=Entrez votre identifiant ici
+Enter.your.user.identifier.here=Entrez votre identifiant ici
 If.you.specify.tenant.domain.you.registered.under.super.tenant=Si vous ne spécifiez aucun domaine, vous allez être enregistré en tant que hôte
 Proceed.to.self.register=Procéder à l'auto-inscription
 Confirm.Privacy.Policy=Veuillez confirmer que vous avez lu et compris la politique de confidentialité

diff --git a/apps/recovery-portal/src/main/webapp/password-recovery-username-request.jsp b/apps/recovery-portal/src/main/webapp/password-recovery-username-request.jsp
@@ -38,7 +38,7 @@
         tenantDomain = IdentityManagementEndpointConstants.SUPER_TENANT;
     }
 
-    Boolean isMultiAttributeLoginEnabledInTenant = false;
+    Boolean isMultiAttributeLoginEnabledInTenant;
     try {
         PreferenceRetrievalClient preferenceRetrievalClient = new PreferenceRetrievalClient();
         isMultiAttributeLoginEnabledInTenant = preferenceRetrievalClient.checkMultiAttributeLogin(tenantDomain);
@@ -48,13 +48,14 @@
                 .i18n(recoveryResourceBundle, "something.went.wrong.contact.admin"));
         IdentityManagementEndpointUtil.addErrorInformation(request, e);
         request.getRequestDispatcher("error.jsp").forward(request, response);
+        return;
     }
 
     String usernameLabel = "Username";
     String enterUsernameHereText = "Enter.your.username.here";
     if (isMultiAttributeLoginEnabledInTenant) {
-        usernameLabel = "Identifier";
-        enterUsernameHereText = "Enter.your.identifier.here";
+        usernameLabel = "User.identifier";
+        enterUsernameHereText = "Enter.your.user.identifier.here";
     }
 %>
 

diff --git a/apps/recovery-portal/src/main/webapp/password-recovery.jsp b/apps/recovery-portal/src/main/webapp/password-recovery.jsp
@@ -86,9 +86,9 @@
         reCaptchaEnabled = true;
     }
 
-    Boolean isQuestionBasedPasswordRecoveryEnabledByTenant = false;
-    Boolean isNotificationBasedPasswordRecoveryEnabledByTenant = false;
-    Boolean isMultiAttributeLoginEnabledInTenant = false;
+    Boolean isQuestionBasedPasswordRecoveryEnabledByTenant;
+    Boolean isNotificationBasedPasswordRecoveryEnabledByTenant;
+    Boolean isMultiAttributeLoginEnabledInTenant;
     try {
         PreferenceRetrievalClient preferenceRetrievalClient = new PreferenceRetrievalClient();
         isQuestionBasedPasswordRecoveryEnabledByTenant = preferenceRetrievalClient.checkQuestionBasedPasswordRecovery(tenantDomain);
@@ -100,11 +100,12 @@
                         .i18n(recoveryResourceBundle, "something.went.wrong.contact.admin"));
         IdentityManagementEndpointUtil.addErrorInformation(request, e);
         request.getRequestDispatcher("error.jsp").forward(request, response);
+        return;
     }
 
     String enterUsernameHereText = "Enter.your.username.here";
     if (isMultiAttributeLoginEnabledInTenant) {
-        enterUsernameHereText = "Enter.your.identifier.here";
+        enterUsernameHereText = "Enter.your.user.identifier.here";
     }
 %>
 

diff --git a/pom.xml b/pom.xml
@@ -657,8 +657,7 @@
         <carbon.extension.identity.authenticator.version>3.0.0</carbon.extension.identity.authenticator.version>
         <org.wso2.carbon.identity.association.account>5.1.5</org.wso2.carbon.identity.association.account>
         <identity.extension.utils>1.0.8</identity.extension.utils>
-        <!-- TODO: Bump Framework version-->
-        <carbon.identity.framework.version>5.20.142</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.20.180</carbon.identity.framework.version>
         <carbon.identity.framework.imp.pkg.version.range>[5.0.0, 6.0.0)</carbon.identity.framework.imp.pkg.version.range>
         <carbon.identity.oauth.version>6.5.3</carbon.identity.oauth.version>
         <carbon.identity.oauth.imp.pkg.version.range>[6.1.0, 7.0.0)</carbon.identity.oauth.imp.pkg.version.range>