Merge pull request #5827 from ZiyamSanthosh/master-fix-spid-issue-2

Exclude logic related to spId when sp is present in request params
wso2 · Mar 23, 2024 · c118175 · c118175
2 parents 5c98009 + 3317f1e
commit c118175
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.changeset/honest-ties-rhyme.md b/.changeset/honest-ties-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Improve logic to fix conflict on sp and spId params
diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-complete.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-complete.jsp
@@ -124,9 +124,7 @@
     if (StringUtils.isNotBlank(spId)) {
         try {
             ApplicationDataRetrievalClient applicationDataRetrieval = new ApplicationDataRetrievalClient();
-            if (spId.equals("My_Account")) {
-                sp = "My Account";
-            } else {
+            if (!sp.equals("My Account")) {
                 sp = applicationDataRetrieval.getApplicationName(tenantDomain,spId);
             }
         } catch (Exception e) {