Merge pull request #1579 from GluuFederation/admin-ui-test-1575

feat(admin-ui): fetch sessionTimeout from config response #1575

Author: duttarnab

admin-ui/.env

@@ -1,5 +1,4 @@
 BASE_PATH=/
 CONFIG_API_BASE_URL=http://localhost:8080/jans-config-api
 API_BASE_URL=http://localhost:8080/jans-config-api/admin-ui
-NPM_TOKEN=
-SESSION_TIMEOUT_IN_MINUTES=30
+NPM_TOKEN=

admin-ui/.env.adminuitest

@@ -1,5 +1,4 @@
 BASE_PATH=/admin/
 CONFIG_API_BASE_URL=https://admin-ui-test.gluu.org/jans-config-api
 API_BASE_URL=https://admin-ui-test.gluu.org/jans-config-api/admin-ui
-NPM_TOKEN=
-SESSION_TIMEOUT_IN_MINUTES=30
+NPM_TOKEN=

admin-ui/.env.goldencrane

@@ -1,5 +1,4 @@
 BASE_PATH=/admin/
 CONFIG_API_BASE_URL=https://jv18creator-golden-crane/jans-config-api
 API_BASE_URL=https://jv18creator-golden-crane/jans-config-api/admin-ui
-NPM_TOKEN=
-SESSION_TIMEOUT_IN_MINUTES=30
+NPM_TOKEN=

admin-ui/.env.test

@@ -1,4 +1,3 @@
 BASE_PATH=/
 CONFIG_API_BASE_URL=http://localhost:8080/jans-config-api
-API_BASE_URL=http://localhost:8080/jans-config-api/admin-ui
-SESSION_TIMEOUT_IN_MINUTES=30
+API_BASE_URL=http://localhost:8080/jans-config-api/admin-ui

admin-ui/.env.tmp

@@ -1,5 +1,4 @@
 BASE_PATH=/admin/
 CONFIG_API_BASE_URL=https://%(hostname)s/jans-config-api
 API_BASE_URL=https://%(hostname)s/jans-config-api/admin-ui
-NPM_TOKEN=
-SESSION_TIMEOUT_IN_MINUTES=30
+NPM_TOKEN=

admin-ui/app/routes/Apps/Gluu/GluuSessionTimeout.js

@@ -2,6 +2,7 @@ import React, { useRef, useState } from 'react'
 import SessionTimeoutDialog from './GluuSessionTimeoutDialog'
 import { useNavigate } from 'react-router-dom'
 import { withIdleTimer } from 'react-idle-timer'
+import { useSelector } from 'react-redux'
 
 let countdownInterval
 let timeout
@@ -13,7 +14,7 @@ const SessionTimeout = ({ isAuthenticated }) => {
   const [timeoutModalOpen, setTimeoutModalOpen] = useState(false)
   const [timeoutCountdown, setTimeoutCountdown] = useState(0)
   const idleTimer = useRef(null)
-  const SESSION_TIMEOUT_IN_MINUTES = process.env.SESSION_TIMEOUT_IN_MINUTES
+  const sessionTimeout = useSelector((state) => state.authReducer?.config?.sessionTimeoutInMins) || 5
   const navigate =useNavigate()
 
   const clearSessionTimeout = () => {
@@ -73,7 +74,7 @@ const SessionTimeout = ({ isAuthenticated }) => {
         onActive={onActive}
         onIdle={onIdle}
         debounce={250}
-        timeout={SESSION_TIMEOUT_IN_MINUTES * 60 * 1000}
+        timeout={sessionTimeout * 60 * 1000}
       />
       <SessionTimeoutDialog
         countdown={timeoutCountdown}

admin-ui/build/webpack.config.client.dev.js

@@ -10,7 +10,6 @@ require('dotenv').config({
 })
 
 const BASE_PATH = process.env.BASE_PATH || '/'
-const SESSION_TIMEOUT_IN_MINUTES = process.env.SESSION_TIMEOUT_IN_MINUTES || 2
 const CONFIG_API_BASE_URL =
   process.env.CONFIG_API_BASE_URL || 'https://sample.com'
 
@@ -74,7 +73,6 @@ module.exports = {
         BASE_PATH: JSON.stringify(BASE_PATH),
         API_BASE_URL: JSON.stringify(process.env.API_BASE_URL),
         CONFIG_API_BASE_URL: JSON.stringify(CONFIG_API_BASE_URL),
-        SESSION_TIMEOUT_IN_MINUTES: SESSION_TIMEOUT_IN_MINUTES,
       },
     }),
     new MiniCssExtractPlugin(),

admin-ui/build/webpack.config.client.prod.js

@@ -15,7 +15,6 @@ const CONFIG_API_BASE_URL =
   process.env.CONFIG_API_BASE_URL || 'https://sample.com'
 const API_BASE_URL =
   process.env.API_BASE_URL || 'https://bank.gluu.org/admin-ui-api'
-const SESSION_TIMEOUT_IN_MINUTES = process.env.SESSION_TIMEOUT_IN_MINUTES || 2
 
 module.exports = {
   devtool: false,
@@ -89,7 +88,6 @@ module.exports = {
         BASE_PATH: JSON.stringify(BASE_PATH),
         API_BASE_URL: JSON.stringify(API_BASE_URL),
         CONFIG_API_BASE_URL: JSON.stringify(CONFIG_API_BASE_URL),
-        SESSION_TIMEOUT_IN_MINUTES: JSON.stringify(SESSION_TIMEOUT_IN_MINUTES),
       },
     }),
     new BundleAnalyzerPlugin({ analyzerMode: 'disabled' }) //* switch mode to "server" to activate BundleAnalyzerPlugin