Merge pull request #109 from Sunbird-ALL/all-1.2

All 1.2
Sunbird-ALL · Jul 12, 2024 · 3203e98 · 3203e98
2 parents c77d531 + 9c8d30b
commit 3203e98
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/all-app-sandbox.yml b/.github/workflows/all-app-sandbox.yml
@@ -73,7 +73,7 @@ jobs:
           REACT_APP_IS_AUDIOPREPROCESSING: ${{ vars.REACT_APP_IS_AUDIOPREPROCESSING }}
           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_APP_TEST_RIG: ${{ vars.REACT_APP_IS_APP_TEST_RIG }}
+          REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_IS_APP_LANGUAGES: ${{ vars.REACT_APP_IS_APP_LANGUAGES }}
           CI: false  # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/.github/workflows/all-dev-rig.yml b/.github/workflows/all-dev-rig.yml
@@ -3,7 +3,7 @@ name: ALL rig dev Deployment
 on:
   push:
     branches:
-      - test-rig-1.1
+      - all-1.2
 
 jobs:
   deploy:
@@ -73,7 +73,7 @@ jobs:
           REACT_APP_IS_AUDIOPREPROCESSING: ${{ vars.REACT_APP_IS_AUDIOPREPROCESSING }}
           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_APP_TEST_RIG: ${{ vars.REACT_APP_IS_APP_TEST_RIG }}
+          REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_IS_APP_LANGUAGES: ${{ vars.REACT_APP_IS_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
@@ -73,7 +73,7 @@ jobs:
           REACT_APP_IS_AUDIOPREPROCESSING: ${{ vars.REACT_APP_IS_AUDIOPREPROCESSING }}
           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_APP_TEST_RIG: ${{ vars.REACT_APP_IS_APP_TEST_RIG }}
+          REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_IS_APP_LANGUAGES: ${{ vars.REACT_APP_IS_APP_LANGUAGES }}
           CI: false  # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/src/routes/index.js b/src/routes/index.js
@@ -54,9 +54,12 @@ const routData = [
     requiresAuth: true,
   },
 ];
-
 // add login route for test rig
-if (process.env.REACT_APP_IS_APP_TEST_RIG === 'true') {
+
+const virtualId = localStorage.getItem('virtualId');
+const isLogin = process.env.REACT_APP_IS_IN_APP_AUTHORISATION === 'true';
+
+if (isLogin && !virtualId) {
   routData.push(
   {
     id: "route-001",

diff --git a/src/views/AppContent/AppContent.jsx b/src/views/AppContent/AppContent.jsx
@@ -1,14 +1,13 @@
 import React, { useEffect, Fragment } from "react";
-import { Routes, Route } from "react-router-dom";
+import { Routes, Route, useNavigate } from "react-router-dom";
 import CustomizedSnackbars from "../../views/Snackbar/CustomSnackbar";
-import { useSelector } from "react-redux";
 
 const PrivateRoute = (props) => {
-  const { virtualId } = useSelector((state) => state.user);
-  // const navigate = useNavigate();
+  const virtualId = localStorage.getItem('virtualId');
+  const navigate = useNavigate();
   useEffect(() => {
     if (!virtualId && props.requiresAuth) {
-      // navigate("/");
+      navigate("/");
     }
   }, [virtualId]);