Fixed Wrong IP being loged

apps/hub/app/(auth)/login/_components/Login.tsx

@@ -48,9 +48,11 @@ export const Login = () => {
 						return;
 					}
 
-					console.log("data", data);
+					const ip = await fetch("https://api.ipify.org/?format=json")
+						.then((res) => res.json())
+						.then((data) => data.ip);
 
-					await logAction("LOGIN");
+					await logAction("LOGIN", { ip });
 					redirect(searchParams.get("redirect") || "/");
 				} catch (error) {
 					showBoundary(error);

apps/hub/app/(auth)/login/_components/action.ts

@@ -26,6 +26,7 @@ export async function getOrSetDeviceId() {
 export const logAction = async (
 	type: LOG_TYPE,
 	otherValues?: {
+		ip: string;
 		field?: string;
 		oldValue?: string;
 		newValue?: string;
@@ -35,13 +36,6 @@ export const logAction = async (
 	const headersList = await headers();
 	const user = await getServerSession();
 
-	console.log(Array.from(headersList.entries()));
-
-	const ip =
-		headersList.get("X-Forwarded-For") ||
-		headersList.get("Forwarded") ||
-		headersList.get("X-Real-IP");
-
 	const deviceId = await getOrSetDeviceId();
 	if (type == "LOGIN" || type == "REGISTER") {
 		const existingLogs = await prisma.log.findMany({
@@ -52,7 +46,7 @@ export const logAction = async (
 				},
 				OR: [
 					{
-						ip: ip,
+						ip: otherValues?.ip,
 					},
 					{
 						deviceId: deviceId,
@@ -82,7 +76,7 @@ export const logAction = async (
 			browser: headersList.get("user-agent") || "unknown",
 			userId: user?.user.id || otherValues?.userId,
 			deviceId: deviceId,
-			ip,
+			ip: otherValues?.ip,
 			...otherValues,
 		},
 	});