Addressing comments

wso2 · Aug 8, 2024 · 7eaef08 · 7eaef08
1 parent 7785f4e
commit 7eaef08
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -105,8 +105,7 @@ features/themes/
 apps/myaccount/src/main/
 apps/console/src/main/
 apps/*/cache
-apps/*/v8-compile-cache-0
-features/v8-compile-cache-0
+**/*/v8-compile-cache-0
 apps/myaccount/src/themes/
 apps/console/src/themes/
 apps/console/src/login-portal-layouts

diff --git a/...es/admin.server-configurations.v1/forms/password-recovery-form/password-recovery-form.tsx b/...es/admin.server-configurations.v1/forms/password-recovery-form/password-recovery-form.tsx
@@ -17,10 +17,7 @@
  */
 
 import Chip from "@oxygen-ui/react/Chip";
-import {
-    AppConstants,
-    history
-} from "@wso2is/admin.core.v1";
+import { AppConstants, history } from "@wso2is/admin.core.v1";
 import FeatureStatusLabel from "@wso2is/admin.extensions.v1/components/feature-gate/models/feature-gate";
 import {
     PasswordRecoveryConfigurationFormPropsInterface,

diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/password-recovery-otp.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/password-recovery-otp.jsp
@@ -127,14 +127,14 @@
     }
 %>
 <%
-    String user_identifier_claim_key = "http://wso2.org/claims/username";
+    String userIdentifierClaimKey = "http://wso2.org/claims/username";
     final String MULTI_ATTRIBUTE_USER_IDENTIFIER_CLAIM_URI = "internal.user.identifier.claim.uri";
     final RecoveryApiV2 recoveryApiV2 = new RecoveryApiV2();
     
     try {
         PreferenceRetrievalClient preferenceRetrievalClient = new PreferenceRetrievalClient();
         if (preferenceRetrievalClient.checkMultiAttributeLogin(tenantDomain)) {
-            user_identifier_claim_key = MULTI_ATTRIBUTE_USER_IDENTIFIER_CLAIM_URI;
+            userIdentifierClaimKey = MULTI_ATTRIBUTE_USER_IDENTIFIER_CLAIM_URI;
         }
     } catch (PreferenceRetrievalClientException e) {
         IdentityManagementEndpointUtil.addErrorInformation(request, e);
@@ -163,7 +163,7 @@
 
         // Get the username claim string for the tenant
         UserClaim userNameClaim = new UserClaim();
-        userNameClaim.setUri(user_identifier_claim_key);
+        userNameClaim.setUri(userIdentifierClaimKey);
         userNameClaim.setValue(MultitenantUtils.getTenantAwareUsername(username));
         userClaims.add(userNameClaim);
 

diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/sms-otp.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/sms-otp.jsp
@@ -341,8 +341,8 @@
                                         .getRelativePublicURL();
                                     String multiOptionPathWithQuery;
                                     if (urlQuery.contains("&username=")) {
-                                        String regex = "(&username=)[^&]+";
-                                        multiOptionPathWithQuery = urlQuery.replaceAll(regex, "$1" + username);
+                                        multiOptionPathWithQuery =
+                                            urlQuery.replaceAll("(&username=)[^&]+", "$1" + username);
                                     } else {
                                         multiOptionPathWithQuery = urlQuery + "&username=" + username 
                                             + "&selectedOption=SMSOTP";