refactor: improve login error handling and user feedback in FormLogin and auth.controller

apps/infoalloggi/src/forms/FormLogin.tsx

@@ -49,15 +49,25 @@ export const FormLogin = () => {
 		onError: ({ message }) => {
 			toast.error(`${t.auth.login.fail}\n${message}`);
 		},
-		onSuccess: async () => {
+		onSuccess: async (data) => {
+			switch (data.status) {
+				case "not-found":
+					setUserNotFound(true);
+					toast.error(data.message);
+					return;
+				case "fail":
+					toast.error(data.message);
+					return;
+				case "success":
 					await utils.auth.getSession.invalidate();
-			setAlreadyRequested(true);
 					toast.success(t.auth.login.success);
 					await router.push(redirect ? (redirect as string) : "/");
 					//window.location.replace(redirect ? (redirect as string) : "/");
+					return;
+			}
 		},
 	});
-	const [altreadyRequested, setAlreadyRequested] = useState(false);
+	const [userNotFound, setUserNotFound] = useState(false);
 	function onSubmit(fields: LoginFormValues) {
 		mutate({
 			email: fields.email,
@@ -89,7 +99,24 @@ export const FormLogin = () => {
 						TEMP DEV LOGIN
 					</button>
 				)}
-
+				{userNotFound ? (
+					<div className="rounded-md bg-red-50 p-4">
+						<div className="flex">
+							<div className="ml-3">
+								<h3 className="font-medium text-lg text-red-800">
+									Account non trovato
+								</h3>
+								<div className="mt-2 text-lg text-red-700">
+									<p>
+										Devi avere un account per effettuare il login. Se non hai un
+										account, contattaci per accedere al servizio.
+									</p>
+								</div>
+							</div>
+						</div>
+					</div>
+				) : (
+					<>
 						<Form {...form}>
 							<form
 								autoComplete="on"
@@ -102,7 +129,9 @@ export const FormLogin = () => {
 									render={({ field }) => (
 										<FormItem>
 											<div className="flex flex-wrap items-center gap-x-2">
-										<FormLabel htmlFor="email">{t.auth.login.email}</FormLabel>{" "}
+												<FormLabel htmlFor="email">
+													{t.auth.login.email}
+												</FormLabel>{" "}
 												<FormMessage />
 											</div>
 
@@ -174,7 +203,7 @@ export const FormLogin = () => {
 								/>
 								<Button
 									className="w-full rounded-lg bg-indigo-600 px-4 py-2 font-medium text-white duration-150 hover:bg-indigo-500 active:bg-indigo-600"
-							disabled={isPending || altreadyRequested}
+									disabled={isPending}
 									type="submit"
 								>
 									{isPending ? (
@@ -187,7 +216,6 @@ export const FormLogin = () => {
 								</Button>
 							</form>
 						</Form>
-
 						<br />
 						<div className="px-2 pt-2 text-left text-sm">
 							<span>{t.auth.login.psa_1}</span>
@@ -206,6 +234,8 @@ export const FormLogin = () => {
 							</Link>
 							.
 						</div>
+					</>
+				)}
 			</div>
 		</>
 	);

apps/infoalloggi/src/middlewares/api_middleware.ts

@@ -27,13 +27,13 @@ export const apisMiddleware = async (req: NextRequest) => {
 		)?.value;
 
 		if (!accessToken) {
-			console.log("No access token found");
+			console.log("No access token found, path:", pathname);
 			return new NextResponse("Unauthorized", { status: 401 });
 		}
 
 		const payload = await verifyToken(accessToken);
 		if (!payload) {
-			console.log("Invalid token");
+			console.log("Invalid token, path:", pathname);
 			return new NextResponse("Unauthorized", { status: 401 });
 		}
 	}

apps/infoalloggi/src/server/controllers/annunci.controller.ts

@@ -110,7 +110,7 @@ export const getAnnunciMetaByCod = async ({ cod }: { cod: string }) => {
 		}
 		const ogImage =
 			annuncio.images && annuncio.images.length > 0 && annuncio.images[0]
-				? `${env.BASE_URL}/storage-api/get/${annuncio.images[0]}?image=true`
+				? `${env.BASE_URL}/storage-api/get/${annuncio.images[0].img}?image=true`
 				: `${env.BASE_URL}/og.jpg`;
 
 		return {

apps/infoalloggi/src/server/controllers/auth.controller.ts

@@ -84,19 +84,19 @@ export const logIn = async ({
 		const user = await findUser_byEmail({ email });
 
 		if (!user) {
-			console.error("User not found in login for email:", email);
+			return {
-			throw new TRPCError({
+				status: "not-found" as const,
-				code: "NOT_FOUND",
+				message:
-				message: "Errore in Login: Utente non trovato",
+					"Questo utente non esiste. Devi avere un account per effettuare il login.",
-			});
+			};
 		}
 		//Check if user is blocked or unverified
 
 		if (user.isBlocked) {
-			throw new TRPCError({
+			return {
-				code: "FORBIDDEN",
+				status: "fail" as const,
-				message: "Errore in Login: Utente bloccato",
+				message: "Errore in Login, non è possibile effettuare il login.",
-			});
+			};
 		}
 
 		// If Admin and password is "changeme", skip password check
@@ -110,10 +110,10 @@ export const logIn = async ({
 			});
 
 			if (!passworIsMatch) {
-				throw new TRPCError({
+				return {
-					code: "BAD_REQUEST",
+					status: "fail" as const,
-					message: "Errore in Login: Invalid email or password",
+					message: "Password errata, riprova.",
-				});
+				};
 			}
 		}