Address comments

wso2 · Jun 20, 2024 · 8132e60 · 8132e60
1 parent f5e241a
commit 8132e60
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 31 deletions.
diff --git a/...a/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ConfirmRequest.java b/...a/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ConfirmRequest.java
@@ -133,10 +133,24 @@ public int hashCode() {
     @Override
     public String toString() {
 
-        return "class ConfirmRequest {" +
-                "    confirmationCode: " + confirmationCode + "\n" +
-                "    otp: " + otp + "\n" +
-                "    properties: " + properties + "\n" +
-                "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ConfirmRequest {").append("\n");
+        sb.append("    confirmationCode: ").append(toIndentedString(confirmationCode)).append("\n");
+        sb.append("    otp: ").append(toIndentedString(otp)).append("\n");
+        sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
 }
diff --git a/.../org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ConfirmResponse.java b/.../org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ConfirmResponse.java
@@ -108,9 +108,23 @@ public int hashCode() {
     @Override
     public String toString() {
 
-        return "class RecoveryResponse {\n" +
-                "    resetCode: " + resetCode + "\n" +
-                "    links: " + links + "\n" +
-                "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("class RecoveryResponse {\n");
+        sb.append("    resetCode: ").append(toIndentedString(resetCode)).append("\n");
+        sb.append("    links: ").append(toIndentedString(links)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
 }
diff --git a/...va/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResendRequest.java b/...va/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResendRequest.java
@@ -112,10 +112,13 @@ public int hashCode() {
     @Override
     public String toString() {
 
-        return "class ResendRequest {\n" +
-                "    resendCode: " + toIndentedString(resendCode) + "\n" +
-                "    properties: " + toIndentedString(properties) + "\n" +
-                "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ResendRequest {\n");
+
+        sb.append("    resendCode: ").append(toIndentedString(resendCode)).append("\n");
+        sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
+        sb.append("}");
+        return sb.toString();
     }
 
     /**

diff --git a/...a/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResendResponse.java b/...a/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResendResponse.java
@@ -214,13 +214,15 @@ public int hashCode() {
     @Override
     public String toString() {
 
-        return "class ResendResponse {\n" +
-                "    code: " + toIndentedString(code) + "\n" +
-                "    message: " + toIndentedString(message) + "\n" +
-                "    notificationChannel: " + toIndentedString(notificationChannel) + "\n" +
-                "    resendCode: " + toIndentedString(resendCode) + "\n" +
-                "    links: " + toIndentedString(links) + "\n" +
-                "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ResendResponse {\n");
+        sb.append("    code: ").append(toIndentedString(code)).append("\n");
+        sb.append("    message: ").append(toIndentedString(message)).append("\n");
+        sb.append("    notificationChannel: ").append(toIndentedString(notificationChannel)).append("\n");
+        sb.append("    resendCode: ").append(toIndentedString(resendCode)).append("\n");
+        sb.append("    links: ").append(toIndentedString(links)).append("\n");
+        sb.append("}");
+        return sb.toString();
     }
 
     /**
@@ -234,6 +236,4 @@ private String toIndentedString(Object o) {
         }
         return o.toString().replace("\n", "\n    ");
     }
-
-
 }
diff --git a/...ava/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResetRequest.java b/...ava/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResetRequest.java
@@ -154,10 +154,24 @@ public int hashCode() {
     @Override
     public String toString() {
 
-        return "class ConfirmRequest {" +
-                "    confirmationCode: " + resetCode + "\n" +
-                "    otp: " + flowConfirmationCode + "\n" +
-                "    properties: " + properties + "\n" +
-                "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ResendResponse {\n");
+        sb.append("    resetCode: ").append(toIndentedString(resetCode)).append("\n");
+        sb.append("    flowConfirmationCode: ").append(toIndentedString(flowConfirmationCode)).append("\n");
+        sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n     ");
     }
 }
diff --git a/...va/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResetResponse.java b/...va/org/wso2/carbon/identity/mgt/endpoint/util/client/model/recovery/v2/ResetResponse.java
@@ -112,10 +112,12 @@ public int hashCode() {
     @Override
     public String toString() {
 
-        return "class ResendResponse {\n" +
-                "    code: " + toIndentedString(code) + "\n" +
-                "    message: " + toIndentedString(message) + "\n" +
-                "}";
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ResendResponse {\n");
+        sb.append("    code: ").append(toIndentedString(code)).append("\n");
+        sb.append("    message: ").append(toIndentedString(message)).append("\n");
+        sb.append("}");
+        return sb.toString();
     }
 
     /**

diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
@@ -2631,4 +2631,10 @@
             <HybridMode>false</HybridMode>
         </MB>
     </CacheInvalidator>
+
+    <ConfigSwitching>
+        <OnInitialUse>
+            <EnableSMSOTPPasswordRecoveryIfConnectorEnabled>false</EnableSMSOTPPasswordRecoveryIfConnectorEnabled>
+        </OnInitialUse>
+    </ConfigSwitching>
 </Server>