Merge remote-tracking branch 'origin/main'

SerpentRace_Backend/src/Api/routers/deckRouter.ts

@@ -195,6 +195,7 @@ deckRouter.get('/:id', authRequired, async (req, res) => {
 	}
 });
 
+deckRouter.patch('/:id', authRequired, async (req, res) => {
 deckRouter.patch('/:id', authRequired, async (req, res) => {
 	try {
 		const deckId = req.params.id;
@@ -228,6 +229,10 @@ deckRouter.patch('/:id', authRequired, async (req, res) => {
 			return res.status(400).json({ error: 'Invalid input data', details: error.message });
 		}
 
+		if (error instanceof Error && error.message.includes('admin')) {
+			return res.status(403).json({ error: 'Forbidden: ' + error.message });
+		}
+
 		if (error instanceof Error && error.message.includes('admin')) {
 			return res.status(403).json({ error: 'Forbidden: ' + error.message });
 		}

SerpentRace_Backend/src/Api/routers/userRouter.ts

@@ -198,6 +198,7 @@ userRouter.post('/logout', authRequired, async (req, res) => {
 		return ErrorResponseService.sendInternalServerError(res);
 	}
 });
+<<<<<<< HEAD
 
 // Refresh token endpoint
 userRouter.post('/refresh-token', async (req, res) => {
@@ -336,4 +337,6 @@ userRouter.post('/reset-password',
 	}
 });
 
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 export default userRouter;