feat(Login): add back token login

mission-apprentissage · Mar 21, 2024 · 6fa9856 · 6fa9856
1 parent 2b56d38
commit 6fa9856
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 7 deletions.
diff --git a/ui/src/App.js b/ui/src/App.js
@@ -4,6 +4,7 @@ import OrganismePage from "./organismes/OrganismePage.jsx";
 import Layout from "./common/layout/Layout";
 import DesignPage from "./DesignPage.jsx";
 import OrganismesPage from "./organismes/OrganismesPage.jsx";
+import LoginPage from "./LoginPage.jsx";
 import ConnexionPage from "./ConnexionPage.jsx";
 import TableauDeBordPage from "./tableau-de-bord/TableauDeBordPage.jsx";
 import ValidationPage from "./tableau-de-bord/ValidationPage.jsx";
@@ -41,6 +42,7 @@ function App() {
           <Routes>
             <Route element={<Layout children={<Outlet />} />}>
               <Route path="/" element={<AccueilPage />} />
+              <Route path="/login" element={<LoginPage />} />
               <Route path="/connexion" element={<ConnexionPage />} />
               <Route path="/organismes" element={<OrganismesPage />} />
               <Route path="/organismes/:siret">

diff --git a/ui/src/ConnexionPage.jsx b/ui/src/ConnexionPage.jsx
@@ -77,7 +77,7 @@ export default function Connexion() {
                                 <div
                                   className={usernameError ? "fr-input-group fr-input-group--error" : "fr-input-group"}
                                 >
-                                  <label className="fr-label" for="username-1757">
+                                  <label className="fr-label" htmlFor="username-1757">
                                     Adresse email
                                   </label>
                                   <input
@@ -101,7 +101,7 @@ export default function Connexion() {
                                 <div className="fr-password" id="password-1758">
                                   <label
                                     className={passwordError ? "fr-label--error" : "fr-label"}
-                                    for="password-1758-input"
+                                    htmlFor="password-1758-input"
                                   >
                                     Mot de passe
                                   </label>

diff --git a/ui/src/LoginPage.jsx b/ui/src/LoginPage.jsx
@@ -0,0 +1,29 @@
+import { Navigate, useSearchParams } from "react-router-dom";
+import { useContext, useEffect } from "react";
+import jwt from "jsonwebtoken";
+import { UserContext } from "./common/UserProvider.jsx";
+
+export default function Login() {
+  const [searchParams] = useSearchParams();
+  const [_, setUserContext] = useContext(UserContext);
+
+  const token = searchParams.get("token");
+
+  useEffect(() => {
+    if (token) {
+      const decodedToken = jwt.decode(token);
+      setUserContext({
+        code: decodedToken.code,
+        email: decodedToken.email,
+        nom: decodedToken.nom,
+        type: decodedToken.type,
+        token: token,
+        loading: false,
+        isAnonymous: false,
+      });
+      sessionStorage.setItem("referentiel:token", token);
+    }
+  }, [token]);
+
+  return <Navigate to={token ? "/tableau-de-bord" : "/organismes"} replace={true} />;
+}
diff --git a/ui/src/common/ApiProvider.jsx b/ui/src/common/ApiProvider.jsx
@@ -58,10 +58,10 @@ export default function ApiProvider({ children }) {
           headers: getHeaders(token),
         }).then((res) => handleResponse(path, res));
       },
-      _post(path, body) {
+      _post(path, body, token = null) {
         return fetch(`${path}`, {
           method: "POST",
-          headers: getHeaders(),
+          headers: getHeaders(token),
           body: JSON.stringify(body),
         }).then((res) => handleResponse(path, res));
       },

diff --git a/ui/src/common/UserProvider.jsx b/ui/src/common/UserProvider.jsx
@@ -11,15 +11,20 @@ const UserProvider = (props) => {
   const [user, setUser] = useState(anonymous);
 
   const verifyUser = useCallback(async () => {
+    const tokenFromStorage = sessionStorage.getItem("referentiel:token");
+
     const result = await httpClient._post(`/api/v1/users/refreshToken`);
-    if (result.success) {
-      const decodedToken = jwt.decode(result.token);
+
+    if (result.success || tokenFromStorage) {
+      const token = result.token || tokenFromStorage;
+      const decodedToken = jwt.decode(token);
+
       setUser({
         code: decodedToken.code,
         email: decodedToken.email,
         nom: decodedToken.nom,
         type: decodedToken.type,
-        token: result.token,
+        token: token,
         loading: false,
         isAnonymous: false,
       });