Merge pull request #5 from darshilbabel/release-1.0.0

kiranharidas187 · web-flow · commit 50a7cbb08dcb · 2026-06-25T15:40:26.000+05:30
QA drop 6
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -1,7 +1,7 @@
 {
     "confirmChanges": "Yes",
     "popUpChanges": "<div class='text-class'>\n    You've been inactive for a while.\n    Do you want to continue?\n</div>",
-    "guestPopUpChanges": "<div class='text-class'>\n   Are you sure you want to leave this conversation?\n    All your progress will be lost\n</div>",
+    "guestPopUpChanges": "<div class='text-class'>\n   Are you sure you want to leave this conversation?\n</div>",
     "comfirmButton": "Yes",
     "denyButton": "No",
     "doLater": "I will do it later",
@@ -149,5 +149,7 @@
     "landing_tagline": "Micro Improvement Mega Impact",
     "landing_login_btn": "Login",
     "sidebarTitle": "SAATHI",
-    "sidebarEmptyText": "Your past conversations will appear here"
+    "sidebarEmptyText": "Your past conversations will appear here",
+    "sessionExpiredMessage": "Session expired. Please log in again to continue.",
+    "profileOnboardingCompleteMessage": "Thank you. I have all the information I need. Redirecting you to Saathi"
     }
diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -1,7 +1,7 @@
 {
   "confirmChanges": "हाँ",
   "popUpChanges": "<div class='text-class'>\n    आप कुछ समय से निष्क्रिय हैं।  \n    क्या आप जारी रखना चाहते हैं?\n</div>",
-  "guestPopUpChanges": "<div class='text-class'>\n   क्या आप वाकई इस बातचीत को छोड़ना चाहते हैं?\n    आपकी सारी प्रगति खो जाएगी\n</div>",
+  "guestPopUpChanges": "<div class='text-class'>\n   क्या आप वाकई इस बातचीत को छोड़ना चाहते हैं?\n</div>",
   "comfirmButton": "हाँ",
   "denyButton": "नहीं",
   "doLater": "मैं इसे बाद में करूंगा",
@@ -26,11 +26,11 @@
   "reportLoader": "आपकी रिपोर्ट बनाने में कुछ समय लग सकता है। कृपया प्रतीक्षा करें...",
   "downloadLoader": "डाउनलोड हो रहा है कृपया प्रतीक्षा करें...",
   "downloadFileError": "आपकी फ़ाइल डाउनलोड नहीं हो सकी। कृपया पुनः प्रयास करें।",
-  "homepageHeading": "स्वागत!",
-  "homepageList": "मैं साथी हूं, आपका विद्यालय सुधार सहयोगी।",
+  "homepageHeading": "स्वागत है!",
+  "homepageList": "मैं साथी हूँ, आपका विद्यालय सुधार सहयोगी।",
   "homepageList1": "आप जिन चुनौतियों का सामना कर रहे हैं, उनके बारे में बताएं या शिक्षा के बारे में मुझसे कुछ भी पूछें —",
   "homepageList2": "मैं इसमें आपकी मदद करूंगा।",
-  "profileHomepageList1": "शुरू करने से पहले, मुझे आपके अनुभव को व्यक्तिगत बनाने में मदद करने के लिए आपसे कुछ जानकारी एकत्र करने की आवश्यकता होगी।",
+  "profileHomepageList1": "शुरू करने से पहले, मुझे आपसे कुछ जानकारी चाहिए ताकि मैं आपके अनुभव को व्यक्तिगत बना सकूँ।",
   "profileHomepageList2": "क्या हम शुरू कर सकते हैं?",
   "la_homepageHeading": "हम आपकी बात सुनने के लिए यहाँ हैं",
   "la_homepageHeading1": "साथी के साथ!",
@@ -137,5 +137,7 @@
   "landing_tagline": "सूक्ष्म सुधार, बड़ा प्रभाव",
   "landing_login_btn": "लॉगिन",
   "sidebarTitle": "साथी",
-  "sidebarEmptyText": "आपकी पिछली बातचीत यहाँ दिखाई देंगी"
+  "sidebarEmptyText": "आपकी पिछली बातचीत यहाँ दिखाई देंगी",
+  "sessionExpiredMessage": "सत्र समाप्त हो गया। कृपया जारी रखने के लिए फिर से लॉग इन करें।",
+  "profileOnboardingCompleteMessage": "धन्यवाद। मुझे ज़रूरी सारी जानकारी मिल गई है। आपको साथी पर रीडायरेक्ट किया जा रहा है।"
 }
diff --git a/public/locales/kn/translation.json b/public/locales/kn/translation.json
@@ -1,7 +1,7 @@
 {
   "confirmChanges": "ಹೌದು",
   "popUpChanges": "<div class='text-class'>\n    ನೀವು ಸ್ವಲ್ಪ ಸಮಯದಿಂದ ನಿಷ್ಕ್ರಿಯರಾಗಿದ್ದೀರಿ.\n    ನೀವು ಮುಂದುವರಿಸಲು ಬಯಸುತ್ತೀರಾ?\n</div>",
-  "guestPopUpChanges": "<div class='text-class'>\n   ನೀವು ಈ ಸಂಭಾಷಣೆಯನ್ನು ತ್ಯಜಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುತ್ತೀರಾ?\n    ನಿಮ್ಮ ಎಲ್ಲಾ ಪ್ರಗತಿ ಕಳೆದುಹೋಗುತ್ತದೆ\n</div>",
+  "guestPopUpChanges": "<div class='text-class'>\n   ನೀವು ಈ ಸಂಭಾಷಣೆಯನ್ನು ತ್ಯಜಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುತ್ತೀರಾ?\n</div>",
   "comfirmButton": "ಹೌದು",
   "denyButton": "ಇಲ್ಲ",
   "doLater": "ನಾನು ಅದನ್ನು ನಂತರ ಮಾಡುತ್ತೇನೆ.",
@@ -118,5 +118,7 @@
   "landing_tagline": "ಮೈಕ್ರೋ ಇಂಪ್ರೂವ್ಮೆಂಟ್ ಮೆಗಾ ಇಂಪ್ಯಾಕ್ಟ್",
   "landing_login_btn": "ಲಾಗಿನ್",
   "sidebarTitle": "ಸಾಥಿ",
-  "sidebarEmptyText": "ನಿಮ್ಮ ಹಿಂದಿನ ಸಂಭಾಷಣೆಗಳು ಇಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ"
+  "sidebarEmptyText": "ನಿಮ್ಮ ಹಿಂದಿನ ಸಂಭಾಷಣೆಗಳು ಇಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ",
+  "sessionExpiredMessage": "ಅವಧಿ ಮುಗಿದಿದೆ. ಮುಂದುವರಿಯಲು ದಯವಿಟ್ಟು ಮತ್ತೆ ಲಾಗಿನ್ ಮಾಡಿ.",
+  "profileOnboardingCompleteMessage": "ಧನ್ಯವಾದಗಳು. ನನಗೆ ಬೇಕಾದ ಎಲ್ಲಾ ಮಾಹಿತಿ ನನ್ನಲ್ಲಿದೆ. ನಿಮ್ಮನ್ನು ಸಾಥಿಗೆ ಮರುನಿರ್ದೇಶಿಸುತ್ತಿದ್ದೇನೆ."
 }
diff --git a/src/api/endpoints/user.js b/src/api/endpoints/user.js
@@ -1,6 +1,9 @@
 import { API_ENDPOINTS } from "constants/urls"
 import { apiClient } from "../client"
 import env from "utils/env"
+import Swal from "sweetalert2"
+import i18n from "i18next"
+import ROUTES from "../../url"
 
 /**
  * Creates a new user profile
@@ -94,16 +97,31 @@ export const acceptTncApi = async profileId => {
  */
 export const readElevateProfileApi = async accessToken => {
   try {
-    const authUrl = env.AUTH_ROUTE();
+    const authUrl = env.AUTH_ROUTE()
     const response = await apiClient.get(authUrl, {
       headers: {
         "Content-Type": "application/json",
-        "x-auth-token": accessToken
+        "x-auth-token": accessToken,
       },
       withCredentials: true,
-    });
-    return response?.data;
+    })
+    return response?.data
   } catch (error) {
-    return error?.response?.data
+    console.log("[readElevateProfileApi] error status:", error?.response?.status)
+    if (error?.response?.status === 401) {
+      const result = await Swal.fire({
+        text: i18n.t("sessionExpiredMessage"),
+        confirmButtonText: i18n.t("confirmChanges"),
+        allowOutsideClick: false,
+      })
+      if (result.isConfirmed) {
+        const flowName = env.FLOW_NAME()
+        const search = flowName ? `?${new URLSearchParams({ flow: flowName }).toString()}` : ""
+        window.location.href = ROUTES.SHIKSHALOKAM_HOME_PAGE + search
+      }
+    }
+    else {
+      throw error
+    }
   }
 }
diff --git a/src/components/Header.jsx b/src/components/Header.jsx
@@ -17,12 +17,10 @@ const Header = ({
     return (
       <>
         {/* Desktop Language Selector */}
-        <LanguageSelector
-          // userLanguage={userLanguage}
-          // onLanguageChange={onLanguageChange}
+        {/* <LanguageSelector
           className="absolute top-6 right-6 hidden sm:block"
           isVisible={!!languageButtonSelect}
-        />
+        /> */}
 
         {/* Desktop Header */}
         <div className="px-5 hidden sm:block">
@@ -45,14 +43,12 @@ const Header = ({
     <>
       <div className="justify-center w-full flex sm:hidden">
         <div className="w-full">
-          <div className={`${languageButtonSelect && ![null, ""].includes(languageButtonSelect) ? "justify-between" : "justify-center"} w-full flex sm:hidden items-center p-2`}>
+          <div className="justify-center w-full flex sm:hidden items-center p-2">
             <img src={t("pageLogo")} className={`h-[50px] object-contain ${chatLanguage === "en" ? "w-[140px]" : "w-[100px]"}`} alt="shikshalokam_logo" />
-            <LanguageSelector
-              // userLanguage={userLanguage}
-              // onLanguageChange={onLanguageChange}
+            {/* <LanguageSelector
               className="w-[140px] flex justify-end p-2"
               isVisible={languageButtonSelect && ![null, ""].includes(languageButtonSelect)}
-            />
+            /> */}
           </div>
         </div>
       </div>
diff --git a/src/pages/Login/commonPage.jsx b/src/pages/Login/commonPage.jsx
@@ -22,7 +22,8 @@ import { useUserDataLocalStore, useChatDataLocalStore } from "store"
 import { useTranslation } from "react-i18next"
 import PrivacyPolicyPopup from "../../components/TnC/privacyPolicyPopup"
 import ProfileChatPopup from "../../components/ProfileChatPopup/ProfileChatPopup"
-import { getProfileApi, acceptTncApi } from "api/endpoints/user"
+import { getProfileApi, acceptTncApi, readElevateProfileApi } from "api/endpoints/user"
+import { clearFromStorage } from "../../services/storage_service"
 import { getSessionDetails } from "../../services/api.service"
 
 function CommonHomePage({ usecaseType }) {
@@ -48,9 +49,12 @@ function CommonHomePage({ usecaseType }) {
 
   const isSaathiHome = !usecaseType
 
+  const [isTokenValidating, setIsTokenValidating] = useState(() => isSaathiHome && !!accessToken)
+
   const showLanding =
     isSaathiHome &&
-    !Boolean(accessToken)
+    !Boolean(accessToken) &&
+    !isTokenValidating
 
   const ptm_case = sessionFlowName.megaPTM === usecaseType
   const ylc_case = sessionFlowName.YLC === usecaseType
@@ -85,6 +89,31 @@ function CommonHomePage({ usecaseType }) {
     isTncAccepted === false &&
     !isProfileLoading
 
+  useEffect(() => {
+    if (!isSaathiHome || !accessToken) return
+
+    const storedToken = accessToken
+    ;(async () => {
+      try {
+        const data = await readElevateProfileApi(storedToken)
+        if (data) {
+          clearFromStorage()
+          const profile = data.profile_details
+          const store = useUserDataLocalStore.getState()
+          store.setAccessToken(env.AUTH_METHOD() === "url" ? storedToken : true)
+          store.setProfileId(profile?.profileid)
+          store.setFirstName(profile?.first_name)
+          store.setCompanyName(profile?.company)
+          store.setState(profile?.state)
+        }
+      } catch (error) {
+        console.error("[CommonHomePage] Token validation failed:", error)
+      } finally {
+        setIsTokenValidating(false)
+      }
+    })()
+  }, []) // eslint-disable-line react-hooks/exhaustive-deps
+
   useEffect(() => {
     if (zustandProfileId || !profileId) return
     useUserDataLocalStore.getState().setProfileId(profileId)
@@ -125,6 +154,7 @@ function CommonHomePage({ usecaseType }) {
   }, [urlFlow])
 
   useEffect(() => {
+    if (isTokenValidating) return
     if (showLanding) return
     if (isSaathiOnboarding && !saathiOnboardingDone) return
 
@@ -134,10 +164,11 @@ function CommonHomePage({ usecaseType }) {
       pathname: ROUTES.COMMON_CHAT,
       search: new URLSearchParams({ [URL_PARAMS.FLOW]: urlFlow }).toString(),
     })
-  }, [urlFlow, hasSelectedLanguage, showLanding, isSaathiOnboarding, saathiOnboardingDone])
+  }, [isTokenValidating, urlFlow, hasSelectedLanguage, showLanding, isSaathiOnboarding, saathiOnboardingDone])
 
   // Process language selection
   useEffect(() => {
+    if (isTokenValidating) return
     if (showLanding) return
     if (!urlLanguage && !hasSelectedLanguage) {
       setIsLoading(false)
@@ -176,7 +207,7 @@ function CommonHomePage({ usecaseType }) {
       pathname: ROUTES.COMMON_CHAT,
       search: new URLSearchParams({ [URL_PARAMS.FLOW]: urlFlow }).toString(),
     })
-  }, [chatLanguage, urlLanguage, urlFlow, hasSelectedLanguage, showLanding, isSaathiOnboarding, saathiOnboardingDone])
+  }, [isTokenValidating, chatLanguage, urlLanguage, urlFlow, hasSelectedLanguage, showLanding, isSaathiOnboarding, saathiOnboardingDone])
 
   useEffect(() => {
     handleLanguageChange(chatLanguage, audioRef, stopAllAudio, setStopAudioTriggered)
diff --git a/src/pages/ShikshalokamVoiceChat/chat-container.js b/src/pages/ShikshalokamVoiceChat/chat-container.js
@@ -130,7 +130,15 @@ function ChatContainer() {
   }
 
   const setFinalLanguage = async () => {
-    if (accessToken) return
+    if (accessToken) {
+      try {const session = await getSessionDetails()
+      setSessionId(session.sessionid)}
+      catch (error) {
+        console.log("[ChatContainer] authenticated session bootstrap failed:", error)
+        navigate(ROUTES.SHIKSHALOKAM_HOME_PAGE)
+      }
+      return
+    }
 
     await initialSetup()
     const storedLanguage = chatLanguage || languageList[0].value
@@ -169,7 +177,7 @@ function ChatContainer() {
 
   return (
     <>
-      {companyName && !isLoading && <DynamicVoiceChat />}
+      {(companyName || accessToken) && !isLoading && <DynamicVoiceChat />}
       {(isLoading || !ipFetched) && (
         <div className="loader-load-spinner">
           <div className="div67">
diff --git a/src/pages/ShikshalokamVoiceChat/dynamic-voice-chat.js b/src/pages/ShikshalokamVoiceChat/dynamic-voice-chat.js
@@ -4,8 +4,8 @@ import { AiOutlineEye } from "react-icons/ai"
 import { API_ENDPOINTS } from "../../constants/urls"
 import { BiLoader } from "react-icons/bi"
 import { clearFromStorage, handleS3Upload } from "../../services/storage_service"
-import { createMessage } from "../interview-voice"
 import { createUserProfileApi } from "api/endpoints/user"
+import { createMessage } from "../interview-voice"
 import { getChatsFromDB, endStoryV2Api, getStoryBySessionAPI, updateStoryMediaApi, updateReflectionStatusApi, getAI4BharatAudioApi, ai4BharatASRApi, getFlowInfoApi } from "../../api/endpoints"
 import { extractStoryData, extractTextBlocks, getEditorContentBlocks, handleMultipleUploads } from "../../utils/story"
 import { FaCircle } from "react-icons/fa6"
@@ -335,14 +335,14 @@ const DynamicVoiceChat = ({
     setChatHistory([
       ...currentHistory,
       {
-        msg: "Thank you. I have all the information I need. Redirecting you to Saathi",
+        msg: t("profileOnboardingCompleteMessage"),
         source: "bot",
         updated_at: Date.now(),
         received: true,
       },
     ])
     onProfileExtractedRef.current?.()
-  }, [])
+  }, [t])
 
   const onWebSocketMessage = useCallback(
     event => {
@@ -1123,16 +1123,18 @@ const DynamicVoiceChat = ({
         setChatLanguage(languageList[0].value)
         stopAllAudio()
         if (accessToken) {
-          clearFromStorage()
-          navigateSsoFlow(ssoRerouteURL)
+          navigate({
+            pathname: ROUTES.SHIKSHALOKAM_HOME_PAGE,
+            search: new URLSearchParams({ flow: env.FLOW_NAME() }).toString(),
+          }, { replace: true })
         } else {
           navigate(ROUTES.SHIKSHALOKAM_VOICE_CHAT_LOGIN)
         }
       }
     }
-    // Check if we already pushed a custom state
+
     if (!window.history.state?.isCustom) {
-      window.history.pushState({ isCustom: true }, "", window.location.href)
+      window.history.replaceState({ isCustom: true }, "", window.location.href)
     }
 
     window.addEventListener("popstate", handleBack)
@@ -1249,12 +1251,38 @@ const DynamicVoiceChat = ({
     }
 
     if (!profileToUse && accessToken) {
-      createUserProfile()
+      // createUserProfile()
       setShouldFetchIntro(true)
       setIsStreamingComplete(true)
     }
   }, [accessToken, profileToUse])
 
+  /**
+   * Initialize popup mode: generate session and open new chat
+   * Runs when popup renders with an already-known profile (chat-container bypassed)
+   */
+  useEffect(() => {
+    if (!isPopupMode) return
+    if (!accessToken || !profileToUse) return
+
+    ;(async () => {
+      try {
+        setIsLoading(true)
+        if (!sessionId) {
+          const session = await getSessionDetails()
+          setSessionId(session.sessionid)
+        }
+        setIsNewChatOpen(true)
+        setShouldFetchIntro(true)
+        setIsStreamingComplete(true)
+      } catch (error) {
+        console.error("[DynamicVoiceChat popup] session init failed:", error)
+      } finally {
+        setIsLoading(false)
+      }
+    })()
+  }, [isPopupMode, accessToken, profileToUse])
+
   /**
    * Fetch chat session for Reflection flow based on projectId
    * Retrieves existing session for project-based reflections
@@ -2004,29 +2032,14 @@ const DynamicVoiceChat = ({
   }
 
   const navigateBack = () => {
-    let rerouteUrl = previousUrl
-    const currentFlow = storageFlow
     stopAllAudio()
-    if (accessToken) {
-      console.log("clearing storage")
-      clearFromStorage()
-      navigateSsoFlow(ssoRerouteURL)
-      return
-    }
-    console.log("clearing storage")
-    clearFromStorage()
-    setLanguage(LANGUAGE_ENUMS.ENGLISH)
-    setChatLanguage(LANGUAGE_ENUMS.ENGLISH)
-    setHasSelectedLanguage(false)
-    if (rerouteUrl && rerouteUrl !== null && rerouteUrl !== undefined && rerouteUrl !== "") {
-      window.location.href = rerouteUrl
-    } else {
-      navigate({
+    navigate(
+      {
         pathname: ROUTES.SHIKSHALOKAM_HOME_PAGE,
-        search: currentFlow ? new URLSearchParams({ flow: currentFlow }).toString() : ''   
-      })
-      window.location.reload()
-    }
+        search: new URLSearchParams({ flow: env.FLOW_NAME() }).toString(),
+      },
+      { replace: true }
+    )
   }
 
   function navigateSsoFlow() {
diff --git a/src/pages/ssoFlow.jsx b/src/pages/ssoFlow.jsx
