slawk0/relay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return username and id in login and signup page

Browse Source
This commit is contained in:
slawk0
2025-01-05 15:19:58 +01:00
parent 892b394836
commit 33ffc2aeb4
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/pages/Login.tsx
View File

@@ -13,7 +13,7 @@ export type Inputs = {
}; };
export default function Login() { export default function Login() {
const { setAuthorized } = useContext(AuthContext); const { setUser, setAuthorized } = useContext(AuthContext);
const [message, setMessage] = useState(''); const [message, setMessage] = useState('');
const navigate = useNavigate(); const navigate = useNavigate();
const [IsLoading, setIsLoading] = useState<boolean>(false); const [IsLoading, setIsLoading] = useState<boolean>(false);
@@ -27,11 +27,12 @@ export default function Login() {
.post('/api/auth/login', data, { .post('/api/auth/login', data, {
withCredentials: true, withCredentials: true,
}) })
.then(() => { .then((res) => {
setUser({ username: res.data.username, id: res.data.user_id });
setAuthorized(true); setAuthorized(true);
setIsLoading(false); setIsLoading(false);
console.log('redirecting'); console.log('redirecting');
navigate('/'); navigate('/chat');
}) })
.catch((err) => { .catch((err) => {
if (err.response) { if (err.response) {

8
client/src/pages/Signup.tsx
View File

@@ -13,7 +13,8 @@ type Inputs = {
}; };
export default function Signup() { export default function Signup() {
const { setAuthorized } = useContext(AuthContext); const { setUser, setAuthorized } = useContext(AuthContext);
const { const {
register, register,
handleSubmit, handleSubmit,
@@ -41,10 +42,11 @@ export default function Signup() {
.post(`/api/auth/signup`, data, { .post(`/api/auth/signup`, data, {
withCredentials: true, withCredentials: true,
}) })
.then(() => { .then((res) => {
setUser({ username: res.data.username, id: res.data.user_id });
setAuthorized(true); setAuthorized(true);
setIsLoading(false); setIsLoading(false);
navigate('/'); navigate('/chat');
console.log('Signed up'); console.log('Signed up');
}) })
.catch((err) => { .catch((err) => {

12
server/server.js
View File

@@ -139,7 +139,11 @@ app.post("/api/auth/signup", async (req, res) => {
// secure: true, // 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) { } catch (e) {
console.error("Signup error: ", e); console.error("Signup error: ", e);
return res.status(500).json({ message: "internal server error" }); 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, { res.cookie("token", token, {
maxAge: 30 * 24 * 60 * 60 * 1000, // 30 days 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) => { .catch((e) => {
console.error("Failed to compare password: ", e); console.error("Failed to compare password: ", e);