Add primary domain to username if realm is passed as primary.

wso2-extensions · Feb 1, 2024 · 21775e7 · 21775e7
1 parent 6e10a48
commit 21775e7
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...n/java/org/wso2/carbon/identity/recovery/endpoint/impl/RecoverPasswordApiServiceImpl.java b/...n/java/org/wso2/carbon/identity/recovery/endpoint/impl/RecoverPasswordApiServiceImpl.java
@@ -21,6 +21,7 @@
 import org.wso2.carbon.identity.recovery.internal.IdentityRecoveryServiceDataHolder;
 import org.wso2.carbon.identity.recovery.password.NotificationPasswordRecoveryManager;
 import org.wso2.carbon.identity.recovery.util.Utils;
+import org.wso2.carbon.user.core.UserCoreConstants;
 import org.wso2.carbon.user.core.util.UserCoreUtil;
 
 import javax.ws.rs.core.Response;
@@ -53,7 +54,14 @@ public Response recoverPasswordPost(RecoveryInitiatingRequestDTO recoveryInitiat
             if (IdentityRecoveryServiceDataHolder.getInstance().getMultiAttributeLoginService()
                     .isEnabled(user.getTenantDomain())) {
                 if (StringUtils.isNotBlank(user.getRealm())) {
-                    String userDomainQualifiedUsername = UserCoreUtil.addDomainToName(user.getUsername(), user.getRealm());
+                    String userDomainQualifiedUsername = UserCoreUtil.addDomainToName(user.getUsername(),
+                            user.getRealm());
+                    // the PRIMARY domain is not appended by UserCoreUtil.addDomainToName() method. Adding it here.
+                    // This is done to avoid user being resolved when PRIMARY is wrongly passed as the user's realm.
+                    if(!userDomainQualifiedUsername.contains(UserCoreConstants.DOMAIN_SEPARATOR)) {
+                        userDomainQualifiedUsername = UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME +
+                                UserCoreConstants.DOMAIN_SEPARATOR + userDomainQualifiedUsername;
+                    }
                     user.setUsername(userDomainQualifiedUsername);
                 }
                 ResolvedUserResult resolvedUserResult =