diff --git a/.github/workflows/all-app-sandbox.yml b/.github/workflows/all-app-sandbox.yml index 63fe9bfc..1ca71065 100644 --- 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 index 78ac4392..7bac2619 100644 --- 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 index 01b39294..d82589ea 100644 --- 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 index 375ea6fc..7891f52b 100644 --- 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 index fb9ef9a6..7cf3cf9f 100644 --- 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]);