Merge pull request #135 from ajinkyapandetekdi/all-1.2

Issueid #223945 fix: When user is log out we are redirecting to home page
Sunbird-ALL · Aug 6, 2024 · e6ba754 · e6ba754
2 parents 4c96377 + c9eabbf
commit e6ba754
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/all-app-sandbox.yml b/.github/workflows/all-app-sandbox.yml
@@ -74,7 +74,7 @@ jobs:
           REACT_APP_POST_LEARNER_PROGRESS: ${{ vars.REACT_APP_POST_LEARNER_PROGRESS }}
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
-          REACT_APP_IS_APP_LANGUAGES: ${{ vars.REACT_APP_IS_APP_LANGUAGES }}
+          REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
           CI: false  # Disabling CI to not treat warnings as errors
         run: npm run build
 

diff --git a/.github/workflows/all-prod-rig.yml b/.github/workflows/all-prod-rig.yml
@@ -74,7 +74,7 @@ jobs:
           REACT_APP_POST_LEARNER_PROGRESS: ${{ vars.REACT_APP_POST_LEARNER_PROGRESS }}
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
-          REACT_APP_IS_APP_LANGUAGES: ${{ vars.REACT_APP_IS_APP_LANGUAGES }}
+          REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
           CI: false  # Disabling CI to not treat warnings as errors
         run: npm run build
 

diff --git a/src/components/Assesment/Assesment.jsx b/src/components/Assesment/Assesment.jsx
@@ -357,7 +357,7 @@ export const ProfileHeader = ({
   const handleLogout = () => {
     localStorage.clear();
     end({});
-    navigate("/Login");
+    navigate("/login");
   };
 
   const CustomIconButton = styled(IconButton)({

diff --git a/src/routes/index.js b/src/routes/index.js
@@ -3,6 +3,12 @@
 import * as reviews from "../views";
 
 const routData = [
+  {
+    id: "route-001",
+    path: "/",
+    component: reviews.DiscoverStart,
+    requiresAuth: true,
+  },
   {
     id: "route-002",
     path: "/discover",
@@ -53,6 +59,12 @@ const routData = [
     component: reviews.PracticeRedirectPage,
     requiresAuth: true,
   },
+  {
+    id: "route-010",
+    path: "/login",
+    component: reviews.LoginPage,
+    requiresAuth: false,
+  },
 ];
 // add login route for test rig
 
@@ -61,12 +73,6 @@ const isLogin = import.meta.env.VITE_APP_IS_IN_APP_AUTHORISATION === 'true';
 
 if (isLogin && !virtualId) {
   routData.push(
-  {
-    id: "route-001",
-    path: "/",
-    component: reviews.LoginPage,
-    requiresAuth: true,
-  },
   {
     id: "route-000",
     path: "*",
@@ -76,12 +82,6 @@ if (isLogin && !virtualId) {
   );
 }else {
   routData.push(
-    {
-    id: "route-001",
-    path: "/",
-    component: reviews.DiscoverStart,
-    requiresAuth: false,
-  },
   {
     id: "route-000",
     path: "*",

diff --git a/src/views/AppContent/AppContent.jsx b/src/views/AppContent/AppContent.jsx
@@ -7,7 +7,7 @@ const PrivateRoute = (props) => {
   const navigate = useNavigate();
   useEffect(() => {
     if (!virtualId && props.requiresAuth) {
-      navigate("/");
+      navigate("/login");
     }
   }, [virtualId]);