Browse Source

Добавлен eventCode в хедер

Vadim 3 months ago
parent
commit
c4726de370

+ 6 - 1
src/middlewares/auth-middleware.ts

@@ -10,10 +10,14 @@ export default function () {
       const authorizationHeader = req.headers.authorization;
       const eventCode = req.headers["event-code"];
 
-      if (!authorizationHeader || !eventCode || typeof eventCode !== "string") {
+      if (!authorizationHeader) {
         return next(ApiError.UnauthorizedError());
       }
 
+      if (!eventCode || typeof eventCode !== "string") {
+        return next(ApiError.BadRequest("neEventCode", "event-code не указан"));
+      }
+
       const accessToken = authorizationHeader.split(" ")[1];
       if (!accessToken) {
         return next(ApiError.UnauthorizedError());
@@ -26,6 +30,7 @@ export default function () {
 
       req.user = userData;
       req.eventCode = eventCode;
+
       next();
     } catch (e) {
       logger.silly(e);

+ 3 - 1
src/modules/users/auth/services/session-service.ts

@@ -5,7 +5,6 @@ import { z } from "zod";
 import { selPool } from "#db/db.js";
 import { sql } from "slonik";
 import { DbSchema } from "#db/db-schema.js";
-
 class SessionService {
   // getUserFromCookies(cookies: {
   //   userData: {
@@ -45,6 +44,9 @@ class SessionService {
 
   // TODO: Добавить ограничение в БД что только один ивент может быть актуальным
   async getCurrentEventFromReq(req: Request) {
+    if (!req.eventCode) {
+      throw ApiError.UnauthorizedError();
+    }
     const eventCodeSafe = z.string().safeParse(req.eventCode);
 
     if (!eventCodeSafe.success) {