Merge remote-tracking branch 'origin/main' into backend_complete

SerpentRace_Backend/src/Api/routers/userRouter.ts

@@ -32,7 +32,11 @@ 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) {
@@ -48,9 +52,12 @@ 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');
 			}
@@ -87,8 +94,12 @@ 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')) {
@@ -97,10 +108,13 @@ 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);
@@ -173,6 +187,7 @@ userRouter.patch('/profile', authRequired, async (req, res) => {
 	}
 });
 
+<<<<<<< HEAD
 //Soft delete user (current user)
 userRouter.delete('/profile', authRequired, async (req, res) => {
 	try {
@@ -310,4 +325,6 @@ userRouter.post('/reset-password',
 	}
 });
 
+=======
+>>>>>>> origin/main
 export default userRouter;