Merge pull request #15422 from mozilla/fxa-6858

fix(ip): Set x-forwarded-for header from gql to auth-server

packages/fxa-graphql-api/src/decorators.ts

@@ -45,6 +45,13 @@ export const GqlXHeaders = createParamDecorator(
     // We don't need to propagate the authorization token because
     // it needs to be updated to originate from gql server.
     delete headers['authorization'];
+
+    // Set the x-forwarded-for header since the auth-server will use this
+    // to determine client geolocation
+    if (ctx.req?.ip) {
+     headers['x-forwarded-for'] = ctx.req?.ip;
+    }
+
     return new Headers(headers);
   }
 );