Merge remote-tracking branch 'upstream/next' into optional-customer-phone

Author: laander

.github/ISSUE_TEMPLATE/1.Bug_report.md

@@ -5,7 +5,7 @@ about: Create a bug report for one of the extensions.
 
 # Bug report
 
-- Extension name: [e.g. `firestore-stripe-subscriptions`]
+- Extension name: [e.g. `firestore-stripe-payments`]
 
 ## Describe the bug
 

.github/ISSUE_TEMPLATE/2.Feature_request.md

@@ -5,7 +5,7 @@ about: Request a new feature or extension.
 
 # Feature request
 
-- Extension name: [e.g. `firestore-stripe-subscriptions`, or leave empty if suggesting a new extension]
+- Extension name: [e.g. `firestore-stripe-payments`, or leave empty if suggesting a new extension]
 
 ## Is your feature request related to a problem? Please describe.
 

.github/workflows/test.yml

@@ -14,9 +14,7 @@ jobs:
       - uses: actions/checkout@v1
       - name: NPM Install
         run: npm i
-      - name: NPM Build
-        run: npm run build
       - name: Unit Test
-        run: lerna run --scope firestore-stripe-payments-js test
+        run: lerna run --scope @stripe/firestore-stripe-payments test
       - name: API Report
-        run: lerna run --scope firestore-stripe-payments-js api-extractor
+        run: lerna run --scope @stripe/firestore-stripe-payments api-extractor

.prettierignore

@@ -11,6 +11,7 @@ README.md
 **/functions/lib/**
 **/lib/**
 **/dist/**
+**/markdown/**
 coverage
 
 # extension install md files

README.md

@@ -10,9 +10,9 @@ Each directory in this repo contains the source code for the extension and a REA
 
 This repository includes the source code for the following extensions:
 
-1. Run Subscription Payments with Stripe
-    - [Homepage](https://firebase.google.com/products/extensions/firestore-stripe-subscriptions)
-    - [Source code](./firestore-stripe-subscriptions)
+1. Stripe backend for web, mobile, and subscription payments
+    - [Homepage](https://firebase.google.com/products/extensions/firestore-stripe-payments)
+    - [Source code](./firestore-stripe-payments)
 1. Send invoices using Stripe
     - [Homepage](https://firebase.google.com/products/extensions/firestore-stripe-invoices)
     - [Source code](./firestore-stripe-invoices)

codelab-steps/index.lab.md

@@ -452,7 +452,7 @@ document
     const functionRef = firebase
       .app()
       .functions(functionLocation)
-      .httpsCallable("ext-firestore-stripe-subscriptions-createPortalLink");
+      .httpsCallable("ext-firestore-stripe-payments-createPortalLink");
     const { data } = await functionRef({ returnUrl: window.location.origin });
     window.location.assign(data.url);
   });

firestore-stripe-invoices/extension.yaml

@@ -38,6 +38,10 @@ contributors:
 
 billingRequired: true # this extension makes requests to a third party API (Stripe)
 
+externalServices:
+  - name: Stripe
+  - pricingUri: https://stripe.com/pricing
+
 roles:
   - role: firebaseauth.viewer
     reason: >-
@@ -137,6 +141,7 @@ params:
 
   - param: STRIPE_API_KEY
     label: Stripe API key with restricted access
+    type: secret
     description: >-
       What is your Stripe API key for sending invoices? 
       We recommend creating a new [restricted key](https://stripe.com/docs/keys#limit-access)
@@ -159,6 +164,7 @@ params:
 
   - param: STRIPE_WEBHOOK_SECRET
     label: Stripe webhook secret
+    type: secret
     description: >-
       This is your signing secret for a Stripe-registered webhook that updates
       each Cloud Firestore document with the invoice's status from the Stripe

firestore-stripe-invoices/functions/lib/index.js

@@ -138,9 +138,8 @@ export const sendInvoice = functions.handler.firestore.document.onCreate(
       }
 
       // Check to see if there's a Stripe customer associated with the email address
-      let customers: Stripe.ApiList<Stripe.Customer> = await stripe.customers.list(
-        { email }
-      );
+      let customers: Stripe.ApiList<Stripe.Customer> =
+        await stripe.customers.list({ email });
       let customer: Stripe.Customer;
 
       if (customers.data.length) {
@@ -178,10 +177,10 @@ export const sendInvoice = functions.handler.firestore.document.onCreate(
 
       if (invoice) {
         // Email the invoice to the customer
-        const finalizedInvoice: Stripe.Invoice = await stripe.invoices.sendInvoice(
-          invoice.id,
-          { idempotencyKey: `invoices-sendInvoice-${eventId}` }
-        );
+        const finalizedInvoice: Stripe.Invoice =
+          await stripe.invoices.sendInvoice(invoice.id, {
+            idempotencyKey: `invoices-sendInvoice-${eventId}`,
+          });
         if (finalizedInvoice.status === 'open') {
           // Successfully emailed the invoice
           logs.invoiceSent(