diff --git a/src/clients/php-client.ts b/src/clients/php-client.ts index 29d193bd526c800702d806f9a41cecf58637db29..6f34e9e1fdd3bc773b506b5d6a658125009be9e6 100644 --- a/src/clients/php-client.ts +++ b/src/clients/php-client.ts @@ -49,8 +49,7 @@ const phpRequest = async ( } const phpResponseDataParser = (data : string) : object => { - console.log(data) - return JSON.parse("{}"); + return JSON.parse(data); } export default phpClient; \ No newline at end of file diff --git a/src/controllers/auth-controller.ts b/src/controllers/auth-controller.ts index 1dc437d3f0cb7a72bf312dc3482ddfc36ee47349..c0cb9d9b6c33f1d18b7e77bdd239aebca8d84d32 100644 --- a/src/controllers/auth-controller.ts +++ b/src/controllers/auth-controller.ts @@ -24,6 +24,7 @@ const login = async ( next: NextFunction, ): Promise<void> => { try { + console.log(req.body) const accessTokenAndFingerPrint = await AuthService.login(req.body); setFingerprintCookie(res, accessTokenAndFingerPrint.fingerprint); generateResponse(res, StatusCodes.OK, {accessToken: accessTokenAndFingerPrint.accessToken}); @@ -36,11 +37,10 @@ const setFingerprintCookie = ( res: Response, fingerprint: string, ): void => { - res.cookie("__Secure-fingerprint", fingerprint, { + res.cookie("Secure-fingerprint", fingerprint, { + maxAge: 60 * 15 * 1000, // 15 minutes max age (same as access token expiry) httpOnly: true, secure: true, - sameSite: "strict", - maxAge: 60 * 15, // 15 minutes max age (same as access token expiry) }); }; diff --git a/src/cores/app.ts b/src/cores/app.ts index 9c3aeec04297200fed6a907f525bcd632b2b1fd8..4a3946038c60fa74f52cb601bcfc754e2712b66e 100644 --- a/src/cores/app.ts +++ b/src/cores/app.ts @@ -3,7 +3,6 @@ import cookieParser from "cookie-parser"; import cors from "cors"; import dotenv from "dotenv"; import apiRouter from "../routers/api"; -import path from "path"; dotenv.config(); diff --git a/src/middlewares/verify-token.ts b/src/middlewares/verify-token.ts index 137a4a254b789d927ad6fa2ae9c159287d00178d..68d69e311b83a454c252995c88c361a46ba554c7 100644 --- a/src/middlewares/verify-token.ts +++ b/src/middlewares/verify-token.ts @@ -36,7 +36,7 @@ const verifyToken = async (req: Request, res: Response, next: NextFunction) => { throw new StandardError(ErrorType.ACCESS_TOKEN_MISSING); } - const fingerprint = req.cookies["__Secure-fingerprint"]; + const fingerprint = req.cookies["Secure-fingerprint"]; if (!fingerprint) { throw new StandardError(ErrorType.FINGERPRINT_MISSING); diff --git a/src/routers/subscription-router.ts b/src/routers/subscription-router.ts index f90dc46b210dde4e5df54f239b2be31f15813521..0cee04ff668ffa4312930128d4eb6650f7450b15 100644 --- a/src/routers/subscription-router.ts +++ b/src/routers/subscription-router.ts @@ -13,7 +13,7 @@ subscriptionRouter.post( ); subscriptionRouter.get( - "/api/subscriptions", + "/api/subscription", verifyToken, SubscriptionController.searchSubscription, handleStandardError, diff --git a/src/utils/file-processing.ts b/src/utils/file-processing.ts index 6730d37f6158c818273537678bcb4c48af0b2a8c..a459c42d2d2f86900ebcb0929fdd05220fad7624 100644 --- a/src/utils/file-processing.ts +++ b/src/utils/file-processing.ts @@ -1,4 +1,3 @@ -// TODO : save file to local storage import fs from "fs"; const saveFile = async (file : Express.Multer.File, path : string) => { diff --git a/src/utils/token.ts b/src/utils/token.ts index 14e892deab16c4d59993796472260c1a7b3f1e31..3aee8b72a5d9a451c51e5c3eeb36b8fbcd5fb514 100644 --- a/src/utils/token.ts +++ b/src/utils/token.ts @@ -31,7 +31,7 @@ const generateAccessTokenAndFingerprint = async (data: { process.env.JWT_SHARED_SECRET as string, { algorithm: "HS256", // Only use HS256 to generate JWTs - expiresIn: "15m", // Valid for 15 minutes + expiresIn: "24h", // The token expires after 1 hour notBefore: "0ms", // The token is valid right away issuer: "Tonality REST Service", }, diff --git a/src/validation/subscription-validation.ts b/src/validation/subscription-validation.ts index 17902d6f7482f2d52c0a6e9a98c9f4f7487cdc51..20302f5ad82f573e11489b0c444f915803ecc461 100644 --- a/src/validation/subscription-validation.ts +++ b/src/validation/subscription-validation.ts @@ -7,9 +7,9 @@ const updateSubscriptionSchema = z.object({ }); const searchSubscriptionSchema = z.object({ - status: z.string().min(1).max(255), - searchInput: z.optional(z.string().min(1).max(255)), - orderBy: z.optional(z.string().min(1).max(255)), + status: z.optional(z.string().min(1).max(255)), + searchInput: z.optional(z.string()), + orderBy: z.optional(z.string()), page: z.number().int().min(1), size: z.number().int().min(1), });