Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions src/controllers/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,33 @@ export const logoutUserController = async (req, res) => {
// res.status(error.status || 500).json({ message: error.message });
// }
// };
export const refreshUserSessionController = async (req, res) => {
const session = await refreshUsersSession({
sessionId: req.cookies.sessionId,
refreshToken: req.cookies.refreshToken,
});
const user = await UsersCollection.findOne({ _id: session.userId });
setupSession(res, session);
export const refreshUserSessionController = async (req, res, next) => {
try {
const { sessionId, refreshToken } = req.cookies;

if (!sessionId || !refreshToken) {
return res.status(400).json({
status: 400,
message: 'Missing session ID or refresh token',
});
}

res.json({
status: 200,
message: 'Successfully refreshed a session!',
data: {
accessToken: session.accessToken,
user,
},
});
const session = await refreshUsersSession({ sessionId, refreshToken });
const user = await UsersCollection.findOne({ _id: session.userId });

setupSession(res, session);

res.json({
status: 200,
message: 'Successfully refreshed a session!',
data: {
accessToken: session.accessToken,
user,
},
});
} catch (error) {
next(error);
}
};

export const getUserInfoController = async (req, res) => {
Expand Down
8 changes: 1 addition & 7 deletions src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,7 @@ export const setupServer = () => {
limit: '100kb',
}),
);
// app.use(
// cors({
// origin: 'https://frontend-inter-mafia.vercel.app',
// // origin: 'http://localhost:5173', // URL вашого фронтенда
// credentials: true,
// }),
// );

const allowedOrigins = [
'http://localhost', // Для будь-якого порту на localhost
'https://frontend-inter-mafia.vercel.app', // Ваш розгорнутий фронтенд
Expand Down
1 change: 0 additions & 1 deletion src/utils/refreshSession.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import createHttpError from 'http-errors';
import { SessionsCollection } from '../db/models/sessionsSchema.js';
import { createSession } from './createSession.js';
import mongoose from 'mongoose';

// Функція для оновлення сесії користувача
export const refreshUsersSession = async ({ sessionId, refreshToken }) => {
Expand Down
2 changes: 2 additions & 0 deletions src/utils/setupSession.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ export const setupSession = (res, session) => {
res.cookie('refreshToken', session.refreshToken, {
httpOnly: true,
secure: true,
sameSite: 'none', // Дозволяє передачу між різними доменами
expires: new Date(Date.now() + THIRTY_DAYS),
});
res.cookie('sessionId', session._id, {
httpOnly: true,
secure: true,
sameSite: 'none', // Дозволяє передачу між різними доменами
expires: new Date(Date.now() + THIRTY_DAYS),
});
};