Merge pull request #14416 from mozilla/train-244-uplift-2

Train 244 uplift 2

packages/fxa-auth-server/lib/routes/subscriptions/stripe.ts

@@ -423,7 +423,7 @@ export class StripeHandler {
     >;
 
     const country = request.app.geo.location?.country || 'US';
-    const ipAddress = request.info.remoteAddress;
+    const ipAddress = request.app.clientAddress;
     const automaticTax = this.automaticTax;
 
     const previewInvoice = await this.stripeHelper.previewInvoice({
@@ -485,7 +485,7 @@ export class StripeHandler {
       string
     >;
     const country = request.app.geo.location?.country || 'US';
-    const ipAddress = request.info.remoteAddress;
+    const ipAddress = request.app.clientAddress;
     const automaticTax = this.automaticTax;
 
     const couponDetails = this.stripeHelper.retrieveCouponDetails({

packages/fxa-auth-server/test/local/routes/subscriptions/stripe.js

@@ -661,9 +661,6 @@ describe('DirectStripeRoutes', () => {
         priceId: 'priceId',
       };
       VALID_REQUEST.app.geo = {};
-      VALID_REQUEST.info = {
-        remoteAddress: '1.1.1.1',
-      };
       const actual = await directStripeRoutesInstance.previewInvoice(
         VALID_REQUEST
       );
@@ -677,7 +674,7 @@ describe('DirectStripeRoutes', () => {
         {
           automaticTax: false,
           country: 'US',
-          ipAddress: '1.1.1.1',
+          ipAddress: '127.0.0.1',
           promotionCode: 'promotionCode',
           priceId: 'priceId',
         }
@@ -818,10 +815,6 @@ describe('DirectStripeRoutes', () => {
         priceId: 'priceId',
       };
       VALID_REQUEST.app.geo = {};
-      VALID_REQUEST.info = {
-        remoteAddress: '1.1.1.1',
-      };
-
       const actual = await directStripeRoutesInstance.retrieveCouponDetails(
         VALID_REQUEST
       );
@@ -831,7 +824,7 @@ describe('DirectStripeRoutes', () => {
         {
           automaticTax: false,
           country: 'US',
-          ipAddress: '1.1.1.1',
+          ipAddress: '127.0.0.1',
           promotionCode: 'promotionCode',
           priceId: 'priceId',
         }