Dialog closes when token expires

Author: c-simpson

src/client/src/App.js

@@ -82,7 +82,7 @@ function AuthenticatedApp() {
     console.log("expTime:" + String(expTime).fixed(1))
     const jwtExpired = expTime <= 0
 
-    const popRefreshAlert = expTime < 30;
+    const popRefreshAlert = expTime > 0 && expTime < 30;
     if (popRefreshAlert) console.log("Time to refresh !!!!!!!!!!! ");
 
     const hdr = userRole === 'admin' ?  <AdminHeader /> : <Header /> // If we're going to display a header, which one?
@@ -93,7 +93,9 @@ function AuthenticatedApp() {
 
             { !jwtExpired && hdr ?  hdr : '' /* Above-chosen header, or if logged out, no header */ } 
 
-            {popRefreshAlert && <CDialog setToken={setToken} /> }
+            {popRefreshAlert && <CDialog shouldOpen={true} setToken={setToken} /> }  {/* Pop up the refresh dialog */}
+
+            {jwtExpired &&  <CDialog shouldOpen={false} setToken={setToken} /> }     { /* Too late, expired: close the dialog */}
 
 
             {  /* If not logged in, show login screen */

src/client/src/components/CDialog.js

@@ -10,21 +10,23 @@ import useToken from '../components/Login/useToken';
 
 import Refresh from './Refresh';
 
-export default function  CDialog({setToken}) {
-  const [open, setOpen] = React.useState(true);
-  const { access_token, setT } = useToken();
+export default function  CDialog(props) {
+  const [open, setOpen] = React.useState(props.shouldOpen);
+  const { access_token, setT } = useToken();  // We want to use the passed-in top-level setToken
 
 
   const handleClickOpen = () => {
     setOpen(true);
   };
 
+
   const handleClose = async (shouldRefresh) => {
+    // Could be closed with Yes, No, outclick (which equals No)
     setOpen(false);
-    console.log("Refresh? " + String(shouldRefresh));
-    if (shouldRefresh){
+    console.log("Refresh? " + String(props.shouldOpen));
+    if (props.shouldOpen){
       const new_at =  await Refresh(access_token);
-      setToken(new_at);
+      props.setToken(new_at);
     }
   };
 

src/client/src/pages/Check/Check.js

@@ -8,7 +8,7 @@ var jwt = require('jsonwebtoken');
 
 export default function Check({access_token}) {
 
-    const { local_a_t, setToken } = useToken();
+    const {  setToken } = useToken();
 
     const [processStatus, setProcessStatus] = React.useState('loading');
     const [error, setError] = React.useState('');