#170 - on landing media home page, if token has expired, it will take…

… it back to avni web app home and hence to login screen

client/Makefile

@@ -42,4 +42,4 @@ build-app-rwb-prod:
 
 build-app-rwb-staging:
 	$(call _create_env,rwb.staging)
-	npm run build
+	npm run build

client/components/Navbar.tsx

@@ -2,6 +2,7 @@ import { Disclosure } from "@headlessui/react";
 import Box from "@mui/material/Box";
 import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
 import Link from "next/link";
+import {getAppHomeUrl} from "@/utils/ConfigUtil";
 
 function HomeIcon(props: SvgIconProps) {
   return (
@@ -15,8 +16,6 @@ export default function Navbar() {
   return (
     <Disclosure as="nav" className="navbg-color">
       {() => {
-          const env = process.env.NEXT_PUBLIC_ENVIRONMENT;
-          const homeUrl:any = env === "dev" ? process.env.NEXT_PUBLIC_WEBAPP_BASE_URL : "/";
           return (
               <>
                   <div className="relative flex justify-between h-16">
@@ -37,7 +36,7 @@ export default function Navbar() {
                                   <HomeIcon
                                       sx={{fontSize: 30}}
                                       onClick={() => {
-                                          window.location.href = homeUrl;
+                                          window.location.href = getAppHomeUrl();
                                       }}
                                   />
                               </Box>

client/env-templates/development.template

@@ -2,3 +2,4 @@ NEXT_PUBLIC_ETL=http://localhost:8022/etl
 NEXT_PUBLIC_MEDIA_VIEWER=http://localhost:3010/media-viewer
 NEXT_PUBLIC_WEB=http://localhost:8021
 NEXT_PUBLIC_ENVIRONMENT=dev
+NEXT_PUBLIC_WEBAPP_BASE_URL=http://localhost:6010

client/pages/index.tsx

@@ -1,14 +1,14 @@
 import ImageList from '@/components/ImageList';
 import Navbar from '@/components/Navbar';
 import {redirectIfNotValid} from '@/utils/helpers';
-
 import {storeToken} from "../utils/helpers";
 import {useRouter} from 'next/router';
+import {isDevMode} from "@/utils/ConfigUtil";
+
 
 export default function Home() {
-    const env = process.env.NEXT_PUBLIC_ENVIRONMENT;
     const router = useRouter();
-    if (env === "dev") {
+    if (isDevMode()) {
         //useSearchParams doesn't seem to work
         if (router.asPath.includes("/?authToken=")) {
             const authToken = router.asPath.replace("/?authToken=", "");

client/utils/ConfigUtil.ts

@@ -0,0 +1,8 @@
+export function getAppHomeUrl() {
+    return isDevMode() ? `${process.env.NEXT_PUBLIC_WEBAPP_BASE_URL}` : "/";
+}
+
+export function isDevMode() {
+    const env = process.env.NEXT_PUBLIC_ENVIRONMENT;
+    return env === "dev";
+}

client/utils/helpers.tsx

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import jwt from 'jwt-decode';
 import jwt_decode from 'jwt-decode';
-import {imageType} from '../model/ImageType';
+import {getAppHomeUrl} from "@/utils/ConfigUtil";
 
 const AuthTokenName = "authToken";
 
@@ -16,9 +16,9 @@ export const validateAccessToken = () => {
 
         const tokenData: any = jwt(token);
         const timeNowInSeconds = Math.floor(Date.now() / 1000);
-        const expired = tokenData.exp >= timeNowInSeconds;
+        const valid = tokenData.exp >= timeNowInSeconds;
         console.log("Token expires in :", tokenData.exp - timeNowInSeconds)
-        return expired;
+        return valid;
     } catch (err) {
         console.log('Error occurred--', err);
         return false;
@@ -38,7 +38,7 @@ export const redirectIfNotValid = function() {
     }
 
     if (!validateAccessToken()) {
-        window.location.href = `${process.env.NEXT_PUBLIC_WEBAPP_BASE_URL}`;
+        window.location.href = getAppHomeUrl();
         return;
     }
 }