Merge pull request #13601 from mozilla/train-236

Train 236 - Patch 1.236.2

packages/fxa-admin-panel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-admin-panel",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "FxA Admin Panel",
   "scripts": {
     "build-css": "tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css",

packages/fxa-admin-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-admin-server",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "FxA GraphQL Admin Server",
   "scripts": {
     "prebuild": "rimraf dist",

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

@@ -3073,7 +3073,12 @@ export class StripeHelper extends StripeHelperBase {
         }
       }
     } catch (err) {
-      if (err.name === FirestoreStripeError.STRIPE_CUSTOMER_DELETED) {
+      if (
+        [
+          FirestoreStripeError.STRIPE_CUSTOMER_DELETED,
+          FirestoreStripeError.FIRESTORE_CUSTOMER_NOT_FOUND,
+        ].includes(err.name)
+      ) {
         // We cannot back-fill Firestore with records for deleted customers
         // as they're missing necessary metadata for us to know which user
         // the customer belongs to.

packages/fxa-auth-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-auth-server",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Firefox Accounts, an identity provider for Mozilla cloud services",
   "bin": {
     "fxa-auth": "./bin/key_server.js"

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

@@ -6059,7 +6059,7 @@ describe('StripeHelper', () => {
       );
     });
 
-    it('ignores the deleted customer error when handling a payment method update event', async () => {
+    it('ignores the deleted stripe customer error when handling a payment method update event', async () => {
       const event = deepCopy(eventPaymentMethodAttached);
       event.type = 'payment_method.card_automatically_updated';
       stripeHelper.stripe.paymentMethods.retrieve = sandbox
@@ -6080,6 +6080,27 @@ describe('StripeHelper', () => {
       );
     });
 
+    it('ignores the firestore record not found error when handling a payment method update event', async () => {
+      const event = deepCopy(eventPaymentMethodAttached);
+      event.type = 'payment_method.card_automatically_updated';
+      stripeHelper.stripe.paymentMethods.retrieve = sandbox
+        .stub()
+        .resolves(event.data.object);
+      stripeFirestore.insertPaymentMethodRecordWithBackfill = sandbox
+        .stub()
+        .throws(
+          newFirestoreStripeError(
+            'Customer deleted.',
+            FirestoreStripeError.FIRESTORE_CUSTOMER_NOT_FOUND
+          )
+        );
+      await stripeHelper.processWebhookEventToFirestore(event);
+      sinon.assert.calledOnceWithExactly(
+        stripeFirestore.insertPaymentMethodRecordWithBackfill,
+        event.data.object
+      );
+    });
+
     it('does not handle wibble events', async () => {
       const event = deepCopy(eventSubscriptionUpdated);
       event.type = 'wibble';

packages/fxa-content-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-content-server",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Firefox Accounts Content Server",
   "scripts": {
     "build": "tsc --build ../fxa-react && NODE_ENV=production grunt build",

packages/fxa-customs-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-customs-server",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Firefox Accounts Customs Server",
   "author": "Mozilla (https://mozilla.org/)",
   "license": "MPL-2.0",

packages/fxa-event-broker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-event-broker",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Firefox Accounts Event Broker",
   "scripts": {
     "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",

packages/fxa-geodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-geodb",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Firefox Accounts GeoDB Repo for Geolocation based services",
   "main": "lib/fxa-geodb.js",
   "directories": {

packages/fxa-graphql-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-graphql-api",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "FxA GraphQL API",
   "scripts": {
     "prebuild": "rimraf dist",

packages/fxa-payments-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-payments-server",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Firefox Accounts Payments Service",
   "scripts": {
     "build-css": "tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css",

packages/fxa-profile-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-profile-server",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "private": true,
   "description": "Firefox Accounts Profile service.",
   "scripts": {

packages/fxa-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-react",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Shared components for FxA React Apps",
   "exports": {
     "./components/": "./dist/components/",

packages/fxa-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-settings",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "homepage": "https://accounts.firefox.com/settings",
   "private": true,
   "scripts": {

packages/fxa-shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-shared",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Shared module for FxA repositories",
   "main": "dist/index.js",
   "exports": {

packages/fxa-support-panel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-support-panel",
-  "version": "1.236.1",
+  "version": "1.236.2",
   "description": "Small app to help customer support access FxA details",
   "directories": {
     "test": "test"