Extracted extractClientIp and used it login.magic and admin.server.ts

Author: D-K-P

apps/webapp/app/models/admin.server.ts

@@ -9,16 +9,14 @@ import {
   setImpersonationId,
 } from "~/services/impersonation.server";
 import { requireUser } from "~/services/session.server";
-
-function extractClientIp(xff: string | null): string | null {
-  if (!xff) return null;
-  const parts = xff.split(",").map((p) => p.trim());
-  return parts[parts.length - 1]; // ALB appends the real client IP
-}
+import { extractClientIp } from "~/utils/extractClientIp.server";
 
 const pageSize = 20;
 
-export async function adminGetUsers(userId: string, { page, search }: SearchParams) {
+export async function adminGetUsers(
+  userId: string,
+  { page, search }: SearchParams,
+) {
   page = page || 1;
 
   search = search ? decodeURIComponent(search) : undefined;

apps/webapp/app/routes/login.magic/route.tsx

@@ -30,6 +30,7 @@ import {
 } from "~/services/magicLinkRateLimiter.server";
 import { logger, tryCatch } from "@trigger.dev/core/v3";
 import { env } from "~/env.server";
+import { extractClientIp } from "~/utils/extractClientIp.server";
 
 export const meta: MetaFunction = ({ matches }) => {
   const parentMeta = matches
@@ -169,13 +170,6 @@ export async function action({ request }: ActionFunctionArgs) {
   }
 }
 
-const extractClientIp = (xff: string | null) => {
-  if (!xff) return null;
-
-  const parts = xff.split(",").map((p) => p.trim());
-  return parts[parts.length - 1]; // take last item, ALB appends the real client IP by default
-};
-
 export default function LoginMagicLinkPage() {
   const { magicLinkSent, magicLinkError } = useTypedLoaderData<typeof loader>();
   const navigate = useNavigation();

apps/webapp/app/utils/extractClientIp.server.ts

@@ -0,0 +1,10 @@
+/**
+ * Extracts the client IP address from the X-Forwarded-For header.
+ * Takes the last item in the header since ALB appends the real client IP by default.
+ */
+export function extractClientIp(xff: string | null): string | null {
+  if (!xff) return null;
+
+  const parts = xff.split(",").map((p) => p.trim());
+  return parts[parts.length - 1]; // take last item, ALB appends the real client IP by default
+}