Merge pull request #262 from dedis/aelalamy-login-redirect

Improve login Redirection

Author: Khadija21102

web/frontend/src/pages/session/HandleLogin.tsx

@@ -7,6 +7,12 @@ const handleLogin = async (fctx: FlashState) => {
   try {
     const res = await fetch(ENDPOINT_GET_TEQ_KEY);
 
+    const d = new Date();
+    d.setTime(d.getTime() + 120000);
+    let expires = d.toUTCString();
+    document.cookie =
+      'redirect' + '=' + window.location.pathname + '; expires=' + expires + ';path=/';
+
     if (res.status !== 200) {
       const txt = await res.text();
       throw new Error(`unexpected status: ${res.status} - ${txt}`);

web/frontend/src/pages/session/Logged.tsx

@@ -1,5 +1,5 @@
 import { AuthContext, FlashContext, FlashLevel } from 'index';
-import React, { FC, useContext, useEffect } from 'react';
+import { FC, useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
@@ -12,14 +12,20 @@ const Logged: FC = () => {
   const authCtx = useContext(AuthContext);
   const fctx = useContext(FlashContext);
 
+  const getCookie = () => {
+    let decodedCookies = decodeURIComponent(document.cookie);
+    const redirectCookie = decodedCookies.split('; ').find((row) => row.startsWith('redirect'));
+    return redirectCookie ? redirectCookie.split('=')[1] : '/'; // default value is the home page
+  };
+
   useEffect(() => {
     if (authCtx.isLogged) {
       fctx.addMessage(t('loggedIn'), FlashLevel.Info);
     } else {
       fctx.addMessage(t('notLoggedIn'), FlashLevel.Error);
     }
-
-    navigate('/');
+    const redir = getCookie();
+    navigate(redir);
   });
 
   return <></>;

web/frontend/src/pages/session/Login.tsx

@@ -1,4 +1,4 @@
-import React, { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';