final changes

SerpentRace_Backend/src/Api/routers/userRouter.ts

@@ -32,11 +32,7 @@ userRouter.post('/login',
 			logAuth('User login successful', result.user.id, { username: result.user.username }, req, res);
 			res.json(result);
 		} else {
-<<<<<<< HEAD
 			throw new Error(`Login failed: ${result}`);
-=======
-			return ErrorResponseService.sendUnauthorized(res, 'Invalid username or password');
->>>>>>> origin/main
 		}
 		
 	} catch (error) {
@@ -52,12 +48,9 @@ userRouter.post('/login',
 			if (error.message.includes('not verified')) {
 				return ErrorResponseService.sendUnauthorized(res, 'Please verify your email address');
 			}
-<<<<<<< HEAD
 			if (error.message.includes('restriction')) {
 				return ErrorResponseService.sendUnauthorized(res, 'Please verify your email address');
 			}
-=======
->>>>>>> origin/main
 			if (error.message.includes('deactivated')) {
 				return ErrorResponseService.sendUnauthorized(res, 'Account has been deactivated');
 			}
@@ -94,12 +87,8 @@ userRouter.post('/create',
 		res.status(201).json(result);
 		
 	} catch (error) {
-<<<<<<< HEAD
 		// Don't log here since CreateUserCommandHandler already logs system errors
 		// Only log validation/user input errors at router level
-=======
-		logError('Create user endpoint error', error as Error, req, res);
->>>>>>> origin/main
 		
 		if (error instanceof Error) {
 			if (error.message.includes('already exists')) {
@@ -108,13 +97,10 @@ userRouter.post('/create',
 			if (error.message.includes('validation')) {
 				return ErrorResponseService.sendBadRequest(res, error.message);
 			}
-<<<<<<< HEAD
 			// Log unexpected errors that weren't handled by the command handler
 			if (!error.message.includes('Failed to create user')) {
 				logError('Unexpected create user endpoint error', error as Error, req, res);
 			}
-=======
->>>>>>> origin/main
 		}
 		
 		return ErrorResponseService.sendInternalServerError(res);
@@ -187,7 +173,6 @@ userRouter.patch('/profile', authRequired, async (req, res) => {
 	}
 });
 
-<<<<<<< HEAD
 //Soft delete user (current user)
 userRouter.delete('/profile', authRequired, async (req, res) => {
 	try {
@@ -214,6 +199,32 @@ userRouter.post('/logout', authRequired, async (req, res) => {
 	}
 });
 
+// Refresh token endpoint
+userRouter.post('/refresh-token', async (req, res) => {
+	try {
+		logRequest('Token refresh endpoint accessed', req, res);
+		
+		const jwtService = container.jwtService;
+		const newTokenPair = jwtService.attemptTokenRefresh(req, res);
+		
+		if (newTokenPair) {
+			logRequest('Token refresh successful', req, res);
+			res.json({ 
+				success: true, 
+				message: 'Tokens refreshed successfully',
+				accessToken: newTokenPair.accessToken,
+				refreshToken: newTokenPair.refreshToken
+			});
+		} else {
+			logWarning('Token refresh failed - invalid or missing refresh token', undefined, req, res);
+			return ErrorResponseService.sendUnauthorized(res, 'Invalid or expired refresh token');
+		}
+	} catch (error) {
+		logError('Refresh token endpoint error', error as Error, req, res);
+		return ErrorResponseService.sendInternalServerError(res);
+	}
+});
+
 // Email verification endpoint
 userRouter.get('/verify-email/:token', async (req, res) => {
 	try {
@@ -325,6 +336,4 @@ userRouter.post('/reset-password',
 	}
 });
 
-=======
->>>>>>> origin/main
 export default userRouter;