Merge branch 'login-register' of github.com:Karol-2/Mercury-Project i…

…nto login-register

backend/src/routes/authRoute.ts

@@ -1,23 +1,14 @@
-import { Router, Request, Response } from "express";
+import { Router, Request } from "express";
 
 import driver from "../driver/driver";
 import { generateAccessToken, generateRefreshToken } from "../misc/jwt";
-import {
-  CustomResponse,
-  JWTResponse,
-  AuthResponse,
-  ErrorResponse,
-  OkResponse,
-} from "../models/Response";
 
 import jwt, { JwtPayload } from "jsonwebtoken";
+import { TokenErrorResponse } from "../types/authResponse";
+import { CustomResponse, OkResponse } from "../models/Response";
 
 const authRouter = Router();
 
-type TokenErrorResponse = CustomResponse<
-  JWTResponse | AuthResponse | ErrorResponse
->;
-
 function generateTokens(res: TokenErrorResponse, userId: string) {
   const token = generateAccessToken(userId);
   const refreshToken = generateRefreshToken(userId);

backend/src/routes/usersRoute.ts

@@ -4,19 +4,17 @@ import { Session } from "neo4j-driver";
 
 import chatRouter from "./chatsRoute";
 import driver from "../driver/driver";
-import {
-  CustomResponse,
-  ErrorResponse,
-  OkResponse,
-  UserResponse,
-  UsersResponse,
-  FriendsResponse,
-  UsersSearchResponse,
-} from "../models/Response";
 
 import wordToVec from "../misc/wordToVec";
 import User from "../models/User";
 import { JWTRequest, authenticateToken } from "../misc/jwt";
+import {
+  FriendsErrorResponse,
+  OkErrorResponse,
+  UserErrorResponse,
+  UsersErrorResponse,
+  UsersSearchErrorResponse,
+} from "../types/userResponse";
 
 const usersRouter = Router();
 
@@ -39,14 +37,6 @@ async function userExists(
   return userExistsResult.records[0].get("u").properties as User;
 }
 
-type UsersErrorResponse = CustomResponse<UsersResponse | ErrorResponse>;
-type UserErrorResponse = CustomResponse<UserResponse | ErrorResponse>;
-type OkErrorResponse = CustomResponse<OkResponse | ErrorResponse>;
-type FriendsErrorResponse = CustomResponse<FriendsResponse | ErrorResponse>;
-type UsersSearchErrorResponse = CustomResponse<
-  UsersSearchResponse | ErrorResponse
->;
-
 usersRouter.get("/", async (_req: Request, res: UsersErrorResponse) => {
   try {
     const session = driver.session();

backend/src/types/authResponse.ts

@@ -0,0 +1,10 @@
+import {
+  CustomResponse,
+  JWTResponse,
+  AuthResponse,
+  ErrorResponse,
+} from "../models/Response";
+
+export type TokenErrorResponse = CustomResponse<
+  JWTResponse | AuthResponse | ErrorResponse
+>;

backend/src/types/userResponse.ts

@@ -0,0 +1,19 @@
+import {
+  CustomResponse,
+  ErrorResponse,
+  OkResponse,
+  UserResponse,
+  UsersResponse,
+  FriendsResponse,
+  UsersSearchResponse,
+} from "../models/Response";
+
+export type UsersErrorResponse = CustomResponse<UsersResponse | ErrorResponse>;
+export type UserErrorResponse = CustomResponse<UserResponse | ErrorResponse>;
+export type OkErrorResponse = CustomResponse<OkResponse | ErrorResponse>;
+export type FriendsErrorResponse = CustomResponse<
+  FriendsResponse | ErrorResponse
+>;
+export type UsersSearchErrorResponse = CustomResponse<
+  UsersSearchResponse | ErrorResponse
+>;

frontend/src/components/LoginBox.tsx

@@ -17,15 +17,15 @@ function LoginBox() {
   };
 
   useEffect(() => {
-    if (userId === null) return;
+    if (userId === undefined) return;
 
-    if (userId === "") {
+    if (userId === null) {
       setLoginMsg("Bad credentials");
     } else {
       if (window.history.state && window.history.state.idx > 0) {
         navigate(-1 as any, { replace: true });
       } else {
-        navigate("/", { replace: true });
+        navigate("/messages", { replace: true });
       }
       setLoginMsg("Logging in...");
     }

frontend/src/helpers/UserProvider.tsx

@@ -11,9 +11,9 @@ import { fetchData } from "../services/fetchData";
 import User from "../models/user.model";
 
 export interface UserContextValue {
-  userId: string | null;
-  user: User | null;
-  setUser: React.Dispatch<React.SetStateAction<User | null>>;
+  userId: string | null | undefined;
+  user: User | null | undefined;
+  setUser: React.Dispatch<React.SetStateAction<User | null | undefined>>;
   login: (mail: string, password: string) => Promise<void>;
   logout: () => Promise<boolean>;
   updateUser: () => Promise<boolean>;
@@ -32,8 +32,12 @@ function useUser() {
 }
 
 function UserProvider({ children }: { children: React.ReactNode }) {
-  const [userId, setUserId] = useState<string | null>(null);
-  const [user, setUser] = useState<User | null>(null);
+  // userId:
+  // undefined -> user state is loading
+  // null -> user not logged in
+  // string -> user logged in, userID correct
+  const [userId, setUserId] = useState<string | null | undefined>(undefined);
+  const [user, setUser] = useState<User | null | undefined>(null);
   const [token, setToken] = useState<object | null>(null);
   const firstRefresh = useRef(true);
 
@@ -57,15 +61,19 @@ function UserProvider({ children }: { children: React.ReactNode }) {
 
     // Try to use refresh token from cookies
     const refreshTokenStr = Cookies.get("refreshToken");
-    if (!refreshTokenStr) return;
+    if (refreshTokenStr) {
+      const response = await fetchData("/auth/refresh", "POST", {
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
 
-    const response = await fetchData("/auth/refresh", "POST", {
-      headers: {
-        "Content-Type": "application/json",
-      },
-    });
+      if (trySetToken(response.token)) {
+        return;
+      }
+    }
 
-    trySetToken(response.token);
+    setUserId(null);
   };
 
   const login = async (mail: string, password: string) => {
@@ -82,7 +90,7 @@ function UserProvider({ children }: { children: React.ReactNode }) {
     });
 
     if (response.status != "ok") {
-      setUserId("");
+      setUserId(null);
       return;
     }
 
@@ -125,6 +133,7 @@ function UserProvider({ children }: { children: React.ReactNode }) {
 
     const response = await fetchData(`/users/${user.id}`, "DELETE");
     if (response.status === "ok") {
+      setUserId(null);
       setUser(null);
       return true;
     }
@@ -137,8 +146,8 @@ function UserProvider({ children }: { children: React.ReactNode }) {
     if (token) {
       const newUserId = (token as any).userId;
       fetchData(`/users/${newUserId}`, "GET").then((response) => {
-        setUser(response.user as any);
         setUserId(newUserId);
+        setUser(response.user as any);
       });
     }
   }, [token]);
@@ -148,6 +157,10 @@ function UserProvider({ children }: { children: React.ReactNode }) {
     getAccessToken();
   }
 
+  useEffect(() => {
+    console.log(userId);
+  }, [userId]);
+
   return (
     <UserContext.Provider
       value={{ userId, user, setUser, login, logout, updateUser, deleteUser }}

frontend/src/pages/ProfilePage.tsx

@@ -31,7 +31,7 @@ function ProfilePage() {
   };
 
   useEffect(() => {
-    if (!userId) navigate("/login");
+    if (userId === null) navigate("/login");
   }, [userId]);
 
   return (