Merge pull request #18967 from mozilla/fxa-11708-handle-empty-ip-address

fix(next): undefined tax location results in error

Author: StaberindeZA

libs/payments/cart/src/lib/tax.service.ts

@@ -23,8 +23,8 @@ export class TaxService {
     private customerManager: CustomerManager,
     private geodbManager: GeoDBManager,
     private subscriptionManager: SubscriptionManager,
-    private currencyManager: CurrencyManager
-  ) {}
+    private currencyManager: CurrencyManager,
+  ) { }
 
   async getTaxAddress(ipAddress: string, uid?: string) {
     if (uid) {

libs/payments/ui/src/lib/actions/getTaxAddress.ts

@@ -6,5 +6,7 @@
 import { getApp } from '../nestapp/app';
 
 export const getTaxAddressAction = async (ipAddress: string, uid?: string) => {
-  return getApp().getActionsService().getTaxAddress({ ipAddress, uid });
+  const { result } = await getApp().getActionsService().getTaxAddress({ ipAddress, uid });
+
+  return result;
 };

libs/payments/ui/src/lib/nestapp/nextjs-actions.service.ts

@@ -98,7 +98,7 @@ export class NextJSActionsService {
     private eligibilityService: EligibilityService,
     private productConfigurationManager: ProductConfigurationManager,
     @Inject(StatsDService) public statsd: StatsD
-  ) {}
+  ) { }
 
   @SanitizeExceptions()
   @NextIOValidator(GetCartStateActionArgs, GetCartStateActionResult)
@@ -240,7 +240,9 @@ export class NextJSActionsService {
       args.uid
     );
 
-    return result;
+    return {
+      result
+    }
   }
 
   @SanitizeExceptions()
@@ -402,13 +404,13 @@ export class NextJSActionsService {
     uid?: string;
   }): Promise<
     | {
-        ok: true;
-        taxAddress: TaxAddress;
-      }
+      ok: true;
+      taxAddress: TaxAddress;
+    }
     | {
-        ok: false;
-        error: string;
-      }
+      ok: false;
+      error: string;
+    }
   > {
     const { cartId, version, offeringId, taxAddress, uid } = args;
 

libs/payments/ui/src/lib/nestapp/validators/GetTaxAddressResult.ts

@@ -6,9 +6,17 @@ import { IsOptional, ValidateNested } from 'class-validator';
 import { Type } from 'class-transformer';
 import { TaxAddress } from './common/TaxAddress';
 
-export class GetTaxAddressResult {
+// Additional nesting is required to support undefined results;
+class TaxAddressResult {
   @IsOptional()
   @ValidateNested()
   @Type(() => TaxAddress)
-  taxAddress?: TaxAddress;
+  result?: TaxAddress;
+}
+
+export class GetTaxAddressResult {
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => TaxAddressResult)
+  taxAddress?: TaxAddressResult
 }