Involuntary logout issue resolved.

Arquisoft · Apr 7, 2024 · e33819b · e33819b
1 parent fc9024f
commit e33819b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -60,6 +60,27 @@ app.post('/login', async (req, res) => {
     res.status(500).json({ error: 'Service down' });
   }
 });
+app.get('/verify', async (req, res) => {
+  try {
+    if (req.headers.authorization) {
+      try{
+        const authResponse = await axios.get(authServiceUrl+'/verify', {
+          headers: {
+            Authorization: req.headers.authorization
+          }
+        });
+        res.json(authResponse.data);
+      } catch (error) {
+        res.status(error.response.status).json(error.response.data);
+      }
+    } else {
+      res.status(401).json({ error: 'Unauthorized' });
+    }
+  } catch (error) {
+    res.status(500).json({ error: 'Service down' });
+  }
+});
+
 
 app.post('/adduser', async (req, res) => {
   try {

diff --git a/webapp/src/components/Login.js b/webapp/src/components/Login.js
@@ -6,7 +6,7 @@ import { SessionContext } from '../SessionContext';
 
 const Login = ({ goTo }) => {
 
-  const { saveSessionData } = useContext(SessionContext);
+  const { saveSessionData, sessionData } = useContext(SessionContext);
 
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
@@ -36,10 +36,29 @@ const Login = ({ goTo }) => {
       setError(error.response.data.error);
     }
   };
+  const autologin = async () => {
+    try {
+      const response = await axios.get(`${apiEndpoint}/verify`, {
+        headers: {
+          Authorization: 'Bearer '+sessionData.token
+        }
+      });
+      if(response.status && response.status===200){
+        goTo(1);
+      }
+    } catch (error) {
+    }
+  };
 
   const handleCloseSnackbar = () => {
     setOpenSnackbar(false);
   };
+  useEffect(() => {
+    if (sessionData && sessionData.token) {
+      autologin();
+    }
+    //eslint-disable-next-line
+  }, []);
 
   useEffect(() => {
     if (loginSuccess) {

diff --git a/webapp/src/components/Nav.jsx b/webapp/src/components/Nav.jsx
@@ -20,7 +20,7 @@ const gatewayUrl = process.env.REACT_APP_API_ENDPOINT || "http://localhost:8000"
 
 function Nav({ goTo }) {
 
-  const { sessionData } = useContext(SessionContext);
+  const { sessionData, clearSessionData } = useContext(SessionContext);
   const username = sessionData ? sessionData.username : 'noUser';
   const profileImgSrc = sessionData && sessionData.profileImage ? 
         require(`../assets/${sessionData.profileImage}`) : defaultProfileImg;
@@ -49,7 +49,8 @@ function Nav({ goTo }) {
     handleCloseUserMenu();
   }
 
-  const logoutClic = () => {
+  const logoutClic = async() => {
+    clearSessionData();
     goTo(0);
     handleCloseUserMenu();
   }