Donat/SerpentRace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Donát
2025-09-26 17:01:45 +02:00
parent 8f6634b03f
commit 8980d98394
14 changed files with 3 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SerpentRace_Backend/src/Application/Services/AuthMiddleware.ts
-8
View File
@@ -79,11 +79,7 @@ export async function authRequired(req: Request, res: Response, next: NextFuncti
orgId: payload.orgId
}, req);
<<<<<<< HEAD
const refreshed = jwtService.refreshIfNeeded(payload, res, req);
=======
const refreshed = jwtService.refreshIfNeeded(payload, res);
>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
if (refreshed) {
logAuth('Token refreshed', payload.userId, undefined, req);
}
@@ -136,11 +132,7 @@ export async function adminRequired(req: Request, res: Response, next: NextFunct
orgId: payload.orgId
}, req);
<<<<<<< HEAD
const refreshed = jwtService.refreshIfNeeded(payload, res, req);
=======
const refreshed = jwtService.refreshIfNeeded(payload, res);
>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
if (refreshed) {
logAuth('Admin token refreshed', payload.userId, undefined, req);
}