Handle association not exist case

wso2 · Feb 28, 2025 · bedf344 · bedf344
1 parent 2b1c577
commit bedf344
Showing 1 changed file with 36 additions and 11 deletions.
diff --git a/apps/console/src/auth.html b/apps/console/src/auth.html
@@ -306,6 +306,13 @@
                      * @returns {string} Constructed URL
                      */
                     function deploymentUnitSignInRedirectURL(tenantDomain) {
+
+                        var contextPath = (!proxyContextPathGlobal || proxyContextPathGlobal === "null") ? "" : "/" + proxyContextPathGlobal;
+
+                        if (tenantDomain === startupConfig.superTenant) {
+                            return applicationDomain.replace(/\/+$/, '') + contextPath
+                                + "<%= htmlWebpackPlugin.options.basename ? '/' + htmlWebpackPlugin.options.basename : ''%>";
+                        }
                         return `${applicationDomain}/${tenantPrefixGlobal}/${tenantDomain}` 
                             + "<%= htmlWebpackPlugin.options.basename ? '/' + htmlWebpackPlugin.options.basename : ''%>";
                     }
@@ -436,16 +443,32 @@
                                 auth.signIn({callOnlyOnRedirect: true})
                                     .then((response) => {
                                         auth.getDecodedIDToken().then((token) => {
-                                            var loginTenant = token["default_tenant"]
-                                            var associatedOrganizationsString = token["org_user_associations"];
-                                            var orgUserAssociations = JSON.parse(associatedOrganizationsString);
-                                            var requestedTenant = localStorage.getItem("user_requested_tenant");
+                                            let loginTenant = token["default_tenant"];
+                                            const associatedOrgJson = token["org_user_associations"]?.join(",");
+                                            const orgUserAssociations = associatedOrgJson ? JSON.parse(associatedOrgJson) : undefined;
+                                            const requestedTenant = localStorage.getItem("user_requested_tenant");
+
                                             localStorage.removeItem("user_requested_tenant");
-                                            if (requestedTenant && orgUserAssociations.array.forEach(element => {
-                                                element.orgHandle === requestedTenant
-                                            })) {
-                                                loginTenant = requestedTenant;
+
+                                            let loginTenantAssociation;
+
+                                            if (requestedTenant) {
+                                                loginTenantAssociation = orgUserAssociations?.find((org) => org.orgHandle === requestedTenant);
+                                                if (loginTenantAssociation) {
+                                                    loginTenant = requestedTenant;
+                                                }
+                                            } else {
+                                                loginTenantAssociation = orgUserAssociations?.find((org) => org.orgHandle === loginTenant);
                                             }
+
+                                            if (!loginTenantAssociation && orgUserAssociations?.length) {
+                                                loginTenantAssociation = orgUserAssociations[0];
+                                            }
+
+                                            if (!loginTenantAssociation) {
+                                                loginTenant = superTenantGlobal;
+                                            }
+
                                             var authConfigRegion = {
                                                 signInRedirectURL: deploymentUnitSignInRedirectURL(loginTenant),
                                                 signOutRedirectURL: getSignOutRedirectURL(),
@@ -471,9 +494,11 @@
                                             var authSecondary = AsgardeoAuth.AsgardeoSPAClient.getInstance("secondary");
 
                                             authSecondary.initialize(authConfigRegion);
-
-                                            authSecondary.signIn({prompt: "login",fidp: "PlatformIDP"})
-
+                                            if (loginTenant !== superTenantGlobal) {
+                                                authSecondary.signIn({prompt: "login",fidp: "PlatformIDP"})
+                                            } else {
+                                                authSecondary.signIn(getAuthParams({}));
+                                            }
                                         })
                                     })
                             } else {