From a7a13d5e4c90fb46b46a8b8985fc701ac011126d Mon Sep 17 00:00:00 2001
From: Malith-19 <malith.19@cse.mrt.ac.lk>
Date: Mon, 4 Nov 2024 09:45:14 +0530
Subject: [PATCH] Update the logic of handling the username recovery configs.

---
 .../identity/governance/IdentityGovernanceServiceImpl.java  | 6 +++++-
 .../governance/IdentityGovernanceServiceImplTest.java       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImpl.java b/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImpl.java
index ee67bdf26..63b51ed0e 100644
--- a/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImpl.java
+++ b/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImpl.java
@@ -435,7 +435,11 @@ private void updateUsernameRecoveryPropertyValues(Map<String, String> configurat
 
             if(usernameRecoveryProperty) {
                 configurationDetails.put(USERNAME_RECOVERY_EMAIL_ENABLE,
-                        String.valueOf(usernameRecoveryEmailProperty || StringUtils.isBlank(usernameRecoveryEmailProp)));
+                        String.valueOf(usernameRecoveryEmailProperty ||
+                                StringUtils.isBlank(usernameRecoveryEmailProp)));
+                configurationDetails.put(USERNAME_RECOVERY_SMS_ENABLE,
+                        String.valueOf(usernameRecoverySmsProperty ||
+                                StringUtils.isBlank(usernameRecoverySmsProp)));
             } else if (StringUtils.isBlank(usernameRecoveryProp)) {
                 // Connector is not explicitly enabled or disabled. The connector state is derived from new and existing
                 // configurations.
diff --git a/components/org.wso2.carbon.identity.governance/src/test/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImplTest.java b/components/org.wso2.carbon.identity.governance/src/test/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImplTest.java
index 4c3d2c956..4ece16c52 100644
--- a/components/org.wso2.carbon.identity.governance/src/test/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImplTest.java
+++ b/components/org.wso2.carbon.identity.governance/src/test/java/org/wso2/carbon/identity/governance/IdentityGovernanceServiceImplTest.java
@@ -175,7 +175,7 @@ public Object[][] buildConfigurations() {
 
         IdentityProviderProperty[] identityProviderProperties10 = getIdentityProviderProperties(
                 false, false, false);
-        Map<String, String> expected10 = getExpectedPropertyValues(true, true, false);
+        Map<String, String> expected10 = getExpectedPropertyValues(true, true, true);
 
         // Only username config false. Preconditions: all the configs true.
         Map<String, String> usernameConfig11 = new HashMap<>();