From 33ffc2aeb4ea13bd3408dee2260cdd1e9eee4b72 Mon Sep 17 00:00:00 2001
From: slawk0 <justgetahouse4@pm.me>
Date: Sun, 5 Jan 2025 15:19:58 +0100
Subject: [PATCH] return username and id in login and signup page

---
 client/src/pages/Login.tsx  |  7 ++++---
 client/src/pages/Signup.tsx |  8 +++++---
 server/server.js            | 12 ++++++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/client/src/pages/Login.tsx b/client/src/pages/Login.tsx
index 74952ac..cf20efa 100644
--- a/client/src/pages/Login.tsx
+++ b/client/src/pages/Login.tsx
@@ -13,7 +13,7 @@ export type Inputs = {
 };
 
 export default function Login() {
-  const { setAuthorized } = useContext(AuthContext);
+  const { setUser, setAuthorized } = useContext(AuthContext);
   const [message, setMessage] = useState('');
   const navigate = useNavigate();
   const [IsLoading, setIsLoading] = useState<boolean>(false);
@@ -27,11 +27,12 @@ export default function Login() {
       .post('/api/auth/login', data, {
         withCredentials: true,
       })
-      .then(() => {
+      .then((res) => {
+        setUser({ username: res.data.username, id: res.data.user_id });
         setAuthorized(true);
         setIsLoading(false);
         console.log('redirecting');
-        navigate('/');
+        navigate('/chat');
       })
       .catch((err) => {
         if (err.response) {
diff --git a/client/src/pages/Signup.tsx b/client/src/pages/Signup.tsx
index 591bdb1..5d19749 100644
--- a/client/src/pages/Signup.tsx
+++ b/client/src/pages/Signup.tsx
@@ -13,7 +13,8 @@ type Inputs = {
 };
 
 export default function Signup() {
-  const { setAuthorized } = useContext(AuthContext);
+  const { setUser, setAuthorized } = useContext(AuthContext);
+
   const {
     register,
     handleSubmit,
@@ -41,10 +42,11 @@ export default function Signup() {
       .post(`/api/auth/signup`, data, {
         withCredentials: true,
       })
-      .then(() => {
+      .then((res) => {
+        setUser({ username: res.data.username, id: res.data.user_id });
         setAuthorized(true);
         setIsLoading(false);
-        navigate('/');
+        navigate('/chat');
         console.log('Signed up');
       })
       .catch((err) => {
diff --git a/server/server.js b/server/server.js
index cf1cf26..f52079d 100644
--- a/server/server.js
+++ b/server/server.js
@@ -139,7 +139,11 @@ app.post("/api/auth/signup", async (req, res) => {
       // secure: true,
     });
 
-    return res.status(200).json({ message: "Successfully signed up" });
+    return res.status(200).json({
+      message: "Successfully signed up",
+      username: username,
+      user_id: user_id,
+    });
   } catch (e) {
     console.error("Signup error: ", e);
     return res.status(500).json({ message: "internal server error" });
@@ -185,7 +189,11 @@ app.post("/api/auth/login", async (req, res) => {
         res.cookie("token", token, {
           maxAge: 30 * 24 * 60 * 60 * 1000, // 30 days
         });
-        return res.status(200).json({ message: "Successfully logged In" });
+        return res.status(200).json({
+          message: "Successfully logged In",
+          username: username,
+          user_id: user_id,
+        });
       })
       .catch((e) => {
         console.error("Failed to compare password: ", e);