Use request-ip (#29)

* feat(auth): implement Google sign-in and linking with password accounts

* Change Contact Mail ID

* use request-ip

Author: jayantkageri

lib/rate-limit.ts

@@ -1,19 +1,16 @@
+import requestIp from "request-ip";
 import dbConnect from "@/lib/db";
 import RateLimit from "@/models/RateLimit";
 
 /**
- * Resolve the real client IP. On Netlify the only trustworthy value is
- * x-nf-client-connection-ip (set by the edge). x-forwarded-for is
- * client-spoofable, so it's a last resort and we take the left-most hop only.
+ * Resolve the real client IP.
  */
 export function getClientIp(request: Request): string {
   const netlify = request.headers.get("x-nf-client-connection-ip");
   if (netlify) return netlify.trim();
 
-  const xff = request.headers.get("x-forwarded-for");
-  if (xff) return xff.split(",")[0].trim();
-
-  return request.headers.get("x-real-ip")?.trim() || "unknown";
+  const headers = Object.fromEntries(request.headers);
+  return requestIp.getClientIp({ headers })?.trim() || "unknown";
 }
 
 /**

package-lock.json

@@ -79,6 +79,7 @@
     "react-spinners": "^0.15.0",
     "react-toastify": "^11.0.5",
     "recharts": "^2.12.7",
+    "request-ip": "^3.3.0",
     "sonner": "^1.5.0",
     "tailwind-merge": "^2.6.0",
     "tailwindcss": "3.3.3",
@@ -91,6 +92,7 @@
   },
   "devDependencies": {
     "@types/locomotive-scroll": "^4.1.4",
+    "@types/request-ip": "^0.0.41",
     "@types/three": "^0.184.1",
     "@types/webpack": "^5.28.5"
   }