Merge pull request #18258 from mozilla/add-subscribed-plans-to-capability-logs

fix(capability): add stripe and iap subscribed plans to mismatch logs

Author: julianpoy

packages/fxa-auth-server/lib/payments/capability.ts

@@ -397,13 +397,17 @@ export class CapabilityService {
         return stripeEligibilityResult;
 
       this.log.error(`capability.getPlanEligibility.eligibilityMismatch`, {
+        stripeSubscribedPlans,
+        iapSubscribedPlans,
         eligibilityManagerResult,
         stripeEligibilityResult,
         uid,
         targetPlanId: targetPlan.plan_id,
       });
       Sentry.withScope((scope) => {
         scope.setContext('getPlanEligibility', {
+          stripeSubscribedPlans,
+          iapSubscribedPlans,
           eligibilityManagerResult,
           stripeEligibilityResult,
           uid,

packages/fxa-auth-server/test/local/payments/capability.js

@@ -526,7 +526,7 @@ describe('CapabilityService', () => {
         SubscriptionEligibilityResult.UPGRADE,
       ]);
       capabilityService.getAllSubscribedAbbrevPlans = sinon.fake.resolves([
-        mockAbbrevPlans[1],
+        [mockAbbrevPlans[1]],
         [],
       ]);
       capabilityService.eligibilityFromEligibilityManager = sinon.fake.resolves(
@@ -543,6 +543,8 @@ describe('CapabilityService', () => {
         sentryScope.setContext,
         'getPlanEligibility',
         {
+          stripeSubscribedPlans: [mockAbbrevPlans[1]],
+          iapSubscribedPlans: [],
           eligibilityManagerResult: [SubscriptionEligibilityResult.CREATE],
           stripeEligibilityResult: [SubscriptionEligibilityResult.UPGRADE],
           uid: UID,