Changeset 6eba109 for reactapp/src

Timestamp:

08/17/22 16:21:10 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

702ca77

Parents:

800779d

Message:

implemented authentication in react

Location:

reactapp/src

Files:

• App.js (modified) (1 diff)
• Components/Logout.js (added)
• Components/Search.js (modified) (1 diff)
• Pages/Home.js (modified) (1 diff)
• Pages/Login.js (modified) (3 diffs)
• Pages/Professor.js (modified) (1 diff)
• Pages/User.js (added)
• api/AuthApi.js (added)
• api/axios.js (modified) (1 diff)

reactapp/src/App.js

@@ -2 +2 @@
 import SearchResults from "./Pages/SearchResults";
 import Login from "./Pages/Login";
-import { BrowserRouter, Routes, Route } from "react-router-dom";
+import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
 import Home from "./Pages/Home";
+import User from "./Pages/User";
+import { useEffect, useState, useMemo } from "react";
+import AuthApi from "./api/AuthApi";
+import Cookies from "js-cookie";
 
 export default function App() {
+  const [auth, setAuth] = useState(false);
+  const variableAuth = useMemo(() => ({ auth, setAuth }), [auth]);
+
+  const readCookie = () => {
+    const session = Cookies.get("JSESSIONID");
+    if (session) {
+      setAuth(true); // go stava true ako postoi takvo cookie (zasto auth=false na sekoe renderiranje)
+    }
+  };
+
+  useEffect(() => {
+    readCookie();
+  }, []);
+
+  const ProtectedRoute = ({ auth, children }) => {
+    if (!auth) {
+      return <Navigate to="/login" replace />;
+    }
+    return children;
+  };
+
   return (
-    <BrowserRouter>
-      <Routes>
-        <Route path="/" element={<Home />}>
-          <Route path="login" element={<Login />}></Route>
-          <Route path="professor">
-            <Route path=":professorId" element={<Professor />} />
+    <AuthApi.Provider value={variableAuth}>
+      <BrowserRouter>
+        <Routes>
+          <Route path="/" element={<Home />}>
+            <Route path="login" element={<Login />}></Route>
+            <Route path="professor">
+              <Route path=":professorId" element={<Professor />} />
+            </Route>
+            <Route path="search" element={<SearchResults />}></Route>
+            <Route
+              path="user"
+              element={
+                <ProtectedRoute auth={auth}>
+                  <User />
+                </ProtectedRoute>
+              }
+            ></Route>
           </Route>
-          <Route path="search" element={<SearchResults />}></Route>
-        </Route>
-      </Routes>
-    </BrowserRouter>
+        </Routes>
+      </BrowserRouter>
+    </AuthApi.Provider>
   );
 }

reactapp/src/Components/Search.js

@@ -15 +15 @@
 
   useEffect(() => {
-    const url = `http://192.168.0.17:8080/public/professors/nameContains/${transliterate(
+    const url = `http://192.168.0.18:8080/public/professors/nameContains/${transliterate(
       query
     )}`;

reactapp/src/Pages/Home.js

@@ -20 +20 @@
       </a>{" "}
       <Search />
+      <div style={{ marginTop: "140px" }}></div>
       <Outlet />
     </MainWrapper>

reactapp/src/Pages/Login.js

@@ -1 @@
-import React, { useRef, useState, useEffect } from "react";
+import React, { useRef, useState, useEffect, useContext } from "react";
+import { Navigate } from "react-router-dom";
+import AuthApi from "../api/AuthApi";
 import axios from "../api/axios";
+import Cookies from "js-cookie";
 const LOGIN_URL = "/login";
 
 const Login = () => {
+  const { auth, setAuth } = useContext(AuthApi);
   const userRef = useRef();
   const errRef = useRef();
@@ -10 +14 @@
   const [password, setPassword] = useState("");
   const [errMsg, setErrMsg] = useState("");
-  const [success, setSuccess] = useState(false);
 
   useEffect(() => {
     userRef.current.focus();
   }, []);
-
-  useEffect(() => {
-    setErrMsg("");
-  }, [username, password]);
 
   const handleSubmit = async (e) => {
@@ -33 +32 @@
       }
     );
+    if (!response.request.responseURL.includes("error")) {
+      // ako NE redirektira na /login?error
+      Cookies.set("JSESSIONID", response.data.sessionId);
+      setAuth(true);
+      setErrMsg("");
+    } else {
+      setErrMsg("Погрешно корисиничко име и/или лозинка");
+    }
+
     setUsername("");
     setPassword("");
-    setSuccess(true);
   };
 
-  return success ? (
+  const handleLogout = () => {
+    setAuth(false);
+    Cookies.remove("JSESSIONID");
+  };
+
+  return auth ? (
+    /*
     <div style={{ marginTop: "140px" }}>
       <h1>Успешна најава!</h1>
       <br />
       <p>
-        <a href="/">Оди на почетната страница</a>
+        <a href="/user">Оди на protected</a>
       </p>
+      <button onClick={handleLogout}>Одјави се</button>
     </div>
+    */
+    <Navigate to="/user" />
   ) : (
     <div style={{ marginTop: "140px" }}>

reactapp/src/Pages/Professor.js

@@ -18 +18 @@
 
   useEffect(() => {
-    const url = `http://192.168.0.17:8080/public/professor/${params.professorId}`;
+    const url = `http://192.168.0.18:8080/public/professor/${params.professorId}`;
 
     const fetchData = async () => {

reactapp/src/api/axios.js

@@ -2 +2 @@
 
 export default axios.create({
-  baseURL: "http://192.168.0.17:8080",
+  baseURL: "http://192.168.0.18:8080",
 });