Merge pull request #1116 from Bonymol-aot/FWF-5971/PR-comments-resolve

Code optimized

Author: arun-s-aot

forms-flow-nav/src/services/user/index.js

@@ -2,59 +2,60 @@ import { RequestService,StorageService } from "@formsflow/service";
 import API from "../../endpoints/index";
 import { WEB_BASE_CUSTOM_URL } from "../../constants/constants";
 
-const extractUserIdFromToken = (token) => {
-    if (!token) return "";
-    const raw = String(token).replace(/^Bearer\s+/i, "").trim();
-    const parts = raw.split(".");
-    if (parts.length < 2) return "";
-    try {
-      const base64Url = parts[1];
-      const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-      const padded = base64.padEnd(base64.length + ((4 - (base64.length % 4)) % 4), "=");
-      const atobFn = typeof atob === "function" ? atob : (typeof window !== "undefined" ? window.atob : null);
-      if (!atobFn) return "";
-      const json = JSON.parse(atobFn(padded));
-      return json?.sub || "";
-    } catch (e) {
-      return "";
-    }
-  };
- export const fetchUserLoginDetails = () => {
-    const userId = extractUserIdFromToken(StorageService.get(StorageService.User.AUTH_TOKEN));
-    if (!userId) return;
-    const apiUserLoginDetails = API.USER_LOGIN_DETAILS(userId);
-    RequestService.httpGETRequest(apiUserLoginDetails, null, StorageService.get(StorageService.User.AUTH_TOKEN))
+const getUserId = () => {
+  try {
+    const userDetail =
+      JSON.parse(StorageService.get(StorageService.User.USER_DETAILS)) || {};
+    return userDetail?.sub || "";
+  } catch {
+    return "";
+  }
+};
+
+export const fetchUserLoginDetails = () => {
+  const userId = getUserId();
+  if (!userId) return;
+
+  const apiUserLoginDetails = API.USER_LOGIN_DETAILS(userId);
+
+  return RequestService.httpGETRequest(
+    apiUserLoginDetails,
+    null,
+    StorageService.get(StorageService.User.AUTH_TOKEN)
+  )
     .then((res) => {
-        localStorage.setItem("USER_LOGIN_DETAILS", JSON.stringify(res.data));
+      localStorage.setItem("USER_LOGIN_DETAILS", JSON.stringify(res.data));
     })
     .catch((error) => {
       console.error(error);
     });
 };
 
+
 /**
  * Trigger a reset password email/link for the current user.
  */
 
 export const requestResetPassword = () => {
+  const userId = getUserId();
   const token = StorageService.get(StorageService.User.AUTH_TOKEN);
-  const userId = extractUserIdFromToken(token);
+
   if (!userId) {
-    return Promise.reject(new Error("User id not found in token"));
+    return Promise.reject(new Error("User id not found in user details"));
   }
+  
+
   const redirectUri =
     (WEB_BASE_CUSTOM_URL && String(WEB_BASE_CUSTOM_URL).trim()) ||
     (typeof window !== "undefined" ? window.location.origin : "");
-  const urlWithRedirect = `${API.RESET_PASSWORD(userId)}?redirect_uri=${encodeURIComponent(
-    redirectUri
-  )}`;
-  return RequestService.httpPUTRequest(
-    urlWithRedirect,
-    {},
-    token
-  );
+
+  const urlWithRedirect =
+    `${API.RESET_PASSWORD(userId)}?redirect_uri=${encodeURIComponent(redirectUri)}`;
+
+  return RequestService.httpPUTRequest(urlWithRedirect, {}, token);
 };
 
+
 /**
  * @param {string} userId 
  * @param {Object} profileData