Revert "ISTE-11: Fixed Redirect logout url, Fixed breadcrumb need to …

…hide (#424)" This reverts commit ae27835.
egovernments · Jun 10, 2024 · 54645fa · 54645fa
1 parent ef1dd9d
commit 54645fa
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/User/index.js
@@ -3,26 +3,26 @@ import { Request, ServiceRequest } from "../../atoms/Utils/Request";
 import { Storage } from "../../atoms/Utils/Storage";
 
 export const UserService = {
-  authenticate: async (details) => {
+  authenticate: async(details) => {
     const data = new URLSearchParams();
     Object.entries(details).forEach(([key, value]) => data.append(key, value));
     data.append("scope", "read");
     data.append("grant_type", "password");
-
-    let authResponse = await ServiceRequest({
+    
+    let authResponse= await ServiceRequest({
       serviceName: "authenticate",
       url: Urls.Authenticate,
       data,
       headers: {
-        authorization: `Basic ${window?.globalConfigs?.getConfig("JWT_TOKEN") || "ZWdvdi11c2VyLWNsaWVudDo="}`,
+        authorization: `Basic ${window?.globalConfigs?.getConfig("JWT_TOKEN")||"ZWdvdi11c2VyLWNsaWVudDo="}`,
         "Content-Type": "application/x-www-form-urlencoded",
       },
     });
-    const invalidRoles = window?.globalConfigs?.getConfig("INVALIDROLES") || [];
-    if (invalidRoles && invalidRoles.length > 0 && authResponse && authResponse?.UserRequest?.roles?.some((role) => invalidRoles.includes(role.code))) {
-      throw new Error("ES_ERROR_USER_NOT_PERMITTED");
-    }
-    return authResponse;
+      const invalidRoles = window?.globalConfigs?.getConfig("INVALIDROLES") || [];
+      if (invalidRoles && invalidRoles.length > 0 && authResponse && authResponse?.UserRequest?.roles?.some((role) => invalidRoles.includes(role.code))) {
+        throw new Error("ES_ERROR_USER_NOT_PERMITTED");
+      }
+      return authResponse;
   },
   logoutUser: () => {
     let user = UserService.getUser();
@@ -48,16 +48,18 @@ export const UserService = {
   },
   logout: async () => {
     const userType = UserService.getType();
-    const logoutRedirectURL = window?.globalConfigs?.getConfig("LOGOUT_REDIRECT_URL") || `/${window?.contextPath}/${userType === "citizen"?"citizen":"employee/user/language-selection"}`;
     try {
       await UserService.logoutUser();
     } catch (e) {
     }
-    finally {
+    finally{
       window.localStorage.clear();
       window.sessionStorage.clear();
-      window.location.replace(`/${logoutRedirectURL}`);
-
+      if (userType === "citizen") {
+        window.location.replace(`/${window?.contextPath}/citizen`);
+      } else {
+        window.location.replace(`/${window?.contextPath}/employee/user/language-selection`);
+      }
     }
   },
   sendOtp: (details, stateCode) =>
@@ -123,7 +125,7 @@ export const UserService = {
     });
   },
   userSearch: async (tenantId, data, filters) => {
-
+    
     return ServiceRequest({
       url: Urls.UserSearch,
       params: { ...filters },