From 26e0754b1c7363c79657186e527c8fcd8d2b3542 Mon Sep 17 00:00:00 2001
From: Marco Pedone <m.pedone98@gmail.com>
Date: Thu, 4 Sep 2025 11:32:17 +0200
Subject: [PATCH] d

---
 .../src/middlewares/auth_middleware.ts        |  2 +-
 .../src/server/controllers/auth.controller.ts | 31 ++++++++++++++-----
 apps/infoalloggi/src/server/db.ts             | 12 +++++--
 apps/infoalloggi/src/utils/api.ts             |  6 ++--
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/apps/infoalloggi/src/middlewares/auth_middleware.ts b/apps/infoalloggi/src/middlewares/auth_middleware.ts
index 6392246..5e014ba 100644
--- a/apps/infoalloggi/src/middlewares/auth_middleware.ts
+++ b/apps/infoalloggi/src/middlewares/auth_middleware.ts
@@ -133,7 +133,7 @@ const refreshAuthToken = async (
 
 	const newAccessToken = await signToken(
 		refreshTokenPayload,
-		"1h",
+		"5m",
 		"accessToken",
 	);
 	response.cookies.set(ACCESS_TOKEN_COOKIE_NAME, newAccessToken, {
diff --git a/apps/infoalloggi/src/server/controllers/auth.controller.ts b/apps/infoalloggi/src/server/controllers/auth.controller.ts
index 1b9efec..f9b4f40 100644
--- a/apps/infoalloggi/src/server/controllers/auth.controller.ts
+++ b/apps/infoalloggi/src/server/controllers/auth.controller.ts
@@ -32,14 +32,17 @@ const cookieOptions: OptionsType = {
 	secure: env.NODE_ENV === "production",
 };
 
+const accessTokenExpiry = "1m";
+export const refreshTokenExpiry = "5m";
+
 const accessTokenCookieOptions: OptionsType = {
 	...cookieOptions,
-	expires: add(new Date(), { hours: 1 }),
+	expires: add(new Date(), { minutes: 1 }),
 };
 
 const refreshTokenCookieOptions: OptionsType = {
 	...cookieOptions,
-	expires: add(new Date(), { days: 1 }),
+	expires: add(new Date(), { minutes: 5 }),
 };
 
 export const createUserAdmin = async ({
@@ -147,9 +150,19 @@ export const logIn = async ({
 			nome: user.nome,
 			username: user.username,
 		};
+		console.log("User authenticated, generating tokens for:", user.email);
 
-		const accessToken = await signToken(payload, "1h", "accessToken");
-		const refreshToken = await signToken(payload, "1d", "refreshToken");
+		const accessToken = await signToken(
+			payload,
+			accessTokenExpiry,
+			"accessToken",
+		);
+		const refreshToken = await signToken(
+			payload,
+			refreshTokenExpiry,
+			"refreshToken",
+		);
+		console.log("Generated tokens for user:", user.email);
 
 		try {
 			await setCookie(ACCESS_TOKEN_COOKIE_NAME, accessToken, {
@@ -162,7 +175,7 @@ export const logIn = async ({
 				req,
 				res,
 			});
-
+			console.log("Login successful, cookies set.");
 			return { status: "success" as const };
 		} catch (cookieError) {
 			console.error("Error setting cookies:", cookieError);
@@ -197,8 +210,12 @@ export const swapAuth = async ({
 			});
 		}
 
-		const accessToken = await signToken(user, "1h", "accessToken");
-		const refreshToken = await signToken(user, "1d", "refreshToken");
+		const accessToken = await signToken(user, accessTokenExpiry, "accessToken");
+		const refreshToken = await signToken(
+			user,
+			refreshTokenExpiry,
+			"refreshToken",
+		);
 
 		// Send Access Token in Cookie
 		await setCookie(ACCESS_TOKEN_COOKIE_NAME, accessToken, {
diff --git a/apps/infoalloggi/src/server/db.ts b/apps/infoalloggi/src/server/db.ts
index c1483a6..e26ce89 100644
--- a/apps/infoalloggi/src/server/db.ts
+++ b/apps/infoalloggi/src/server/db.ts
@@ -54,14 +54,20 @@ export const db = new Kysely<Database>({
 });
 
 const DbLogger = (event: LogEvent) => {
-	if (event.level === "query") {
+	if (
+		event.level === "query" &&
+		event.query.sql !== "begin" &&
+		event.query.sql !== "commit"
+	) {
+		console.log();
 		console.log("\x1b[33mquery:\x1b[0m", event.query.sql);
 		console.log("\x1b[36mparams:\x1b[0m", event.query.parameters);
-		console.log("\x1b[32mtaken:\x1b[0m", event.queryDurationMillis, "ms");
+		//console.log("\x1b[32mtaken:\x1b[0m", event.queryDurationMillis, "ms");
 	}
 	if (event.level === "error") {
+		console.error();
 		console.error("\x1b[33mquery:\x1b[0m", event.query.sql);
 		console.error("\x1b[36mparams:\x1b[0m", event.query.parameters);
-		console.error("\x1b[31merror:\x1b[0m", event.error);
+		//console.error("\x1b[31merror:\x1b[0m", event.error);
 	}
 };
diff --git a/apps/infoalloggi/src/utils/api.ts b/apps/infoalloggi/src/utils/api.ts
index a8fdade..950b7b1 100644
--- a/apps/infoalloggi/src/utils/api.ts
+++ b/apps/infoalloggi/src/utils/api.ts
@@ -50,8 +50,10 @@ export const api = createTRPCNext<AppRouter>({
 				errorLink,
 				loggerLink({
 					enabled: (opts) =>
-						(process.env.NODE_ENV === "development" &&
-							typeof window !== "undefined") ||
+						//(
+						//process.env.NODE_ENV === "development" &&
+						typeof window !== "undefined" ||
+						// )
 						(opts.direction === "down" && opts.result instanceof Error),
 				}),