BIL-284: Use Stripe params from the server instead of env variables (#57

)

* Use Stripe params from the server instead of env variables

* Update tests

.github/workflows/static.yml

@@ -76,8 +76,6 @@ jobs:
         env:
           CI: true
           VITE_RC_API_KEY: ${{ secrets.RC_API_KEY }}
-          VITE_RC_STRIPE_ACCOUNT_ID: ${{ secrets.RC_STRIPE_ACCOUNT_ID }}
-          VITE_RC_STRIPE_PK_KEY: ${{ secrets.RC_STRIPE_PK_KEY }}
 
       - name: Sync files to S3 bucket
         working-directory: ./examples/rcbilling-demo

azure-pipelines.yml

@@ -114,6 +114,4 @@ jobs:
         workingDirectory: "examples/rcbilling-demo"
         displayName: E2E tests rcbilling-demo
         env:
-          VITE_RC_STRIPE_PK_KEY: $(VITE_RC_STRIPE_PK_KEY)
-          VITE_RC_STRIPE_ACCOUNT_ID: $(VITE_RC_STRIPE_ACCOUNT_ID)
           VITE_RC_API_KEY: $(VITE_RC_API_KEY)

examples/rcbilling-demo/.env.example

@@ -1,3 +1 @@
-VITE_RC_API_KEY="rcb_abcdef1234567890abcdef"
-VITE_RC_STRIPE_PK_KEY="pk_test_abcdef1234567890abcde"
-VITE_RC_STRIPE_ACCOUNT_ID="acct_abcdef1234567890"
+VITE_RC_API_KEY="rcb_abcdef1234567890abcdef"

examples/rcbilling-demo/src/App.tsx

@@ -12,12 +12,7 @@ import { SuccessPage } from "./pages/success";
 import DogServices from "./pages/dogServices";
 import WithoutEntitlement from "./components/WithoutEntitlement";
 
-const purchases = new Purchases(import.meta.env.VITE_RC_API_KEY as string, {
-  stripe: {
-    publishableKey: import.meta.env.VITE_RC_STRIPE_PK_KEY as string,
-    accountId: import.meta.env.VITE_RC_STRIPE_ACCOUNT_ID as string,
-  },
-});
+const purchases = new Purchases(import.meta.env.VITE_RC_API_KEY as string);
 export const catServicesEntitlementId = "catServices";
 export const dogServicesEntitlementId = "dogServices";
 

src/main.ts

@@ -4,7 +4,6 @@ import {
   Package as InnerPackage,
   toOffering,
 } from "./entities/offerings";
-import { PaymentProviderSettings } from "./entities/types";
 import RCPurchasesUI from "./ui/rcb-ui.svelte";
 
 import {
@@ -44,37 +43,19 @@ export { ErrorCode, PurchasesError } from "./entities/errors";
 export class Purchases {
   // @internal
   readonly _API_KEY: string;
-  // @internal
-  readonly _PAYMENT_PROVIDER_SETTINGS: PaymentProviderSettings | null = null;
 
   private readonly backend: Backend;
   private readonly purchaseOperationHelper: PurchaseOperationHelper;
 
-  constructor(
-    apiKey: string,
-    paymentProviderSettings: PaymentProviderSettings,
-  ) {
+  constructor(apiKey: string) {
     this._API_KEY = apiKey;
-    this._PAYMENT_PROVIDER_SETTINGS = paymentProviderSettings;
 
     if (RC_ENDPOINT === undefined) {
       console.error(
         "Project was build without some of the environment variables set",
       );
     }
 
-    // Will need to change this to something more flexible
-    // if/when we end up supporting more payment gateways
-    if (
-      !this._PAYMENT_PROVIDER_SETTINGS.stripe ||
-      !this._PAYMENT_PROVIDER_SETTINGS.stripe?.accountId ||
-      !this._PAYMENT_PROVIDER_SETTINGS.stripe?.publishableKey
-    ) {
-      console.error(
-        "Project was build without the stripe payment provider settings set",
-      );
-    }
-
     this.backend = new Backend(this._API_KEY);
     this.purchaseOperationHelper = new PurchaseOperationHelper(this.backend);
   }

src/networking/responses/subscribe-response.ts

@@ -3,5 +3,7 @@ export interface SubscribeResponse {
   next_action: string;
   data: {
     client_secret?: string;
+    stripe_account_id?: string;
+    publishable_api_key?: string;
   };
 }

src/tests/main.test.ts

@@ -5,23 +5,19 @@ import { getRequestHandlers } from "./test-responses";
 import { PackageType } from "../entities/offerings";
 import { CustomerInfo } from "../entities/customer-info";
 
-const STRIPE_TEST_DATA = {
-  stripe: { accountId: "acct_123", publishableKey: "pk_123" },
-} as const;
-
 const server = setupServer(...getRequestHandlers());
 
 beforeAll(() => {
   server.listen();
 });
 
 test("Purchases is defined", () => {
-  const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+  const billing = new Purchases("test_api_key");
   expect(billing).toBeDefined();
 });
 
 test("returns true if a user is entitled", async () => {
-  const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+  const billing = new Purchases("test_api_key");
   const isEntitled = await billing.isEntitledTo(
     "someAppUserId",
     "activeCatServices",
@@ -30,7 +26,7 @@ test("returns true if a user is entitled", async () => {
 });
 
 test("returns false if a user is not entitled", async () => {
-  const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+  const billing = new Purchases("test_api_key");
   const isEntitled = await billing.isEntitledTo(
     "someAppUserId",
     "expiredEntitlement",
@@ -56,7 +52,7 @@ describe("getOfferings", () => {
     },
   };
   test("can get offerings", async () => {
-    const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+    const billing = new Purchases("test_api_key");
     const offerings = await billing.getOfferings("someAppUserId");
 
     const currentOffering = {
@@ -116,7 +112,7 @@ describe("getOfferings", () => {
   });
 
   test("can get offerings without current offering id", async () => {
-    const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+    const billing = new Purchases("test_api_key");
     const offerings = await billing.getOfferings(
       "appUserIdWithoutCurrentOfferingId",
     );
@@ -176,7 +172,7 @@ describe("getOfferings", () => {
   });
 
   test("can get offerings with missing products", async () => {
-    const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+    const billing = new Purchases("test_api_key");
     const offerings = await billing.getOfferings(
       "appUserIdWithMissingProducts",
     );
@@ -207,7 +203,7 @@ describe("getOfferings", () => {
 });
 
 test("can get customer info", async () => {
-  const billing = new Purchases("test_api_key", STRIPE_TEST_DATA);
+  const billing = new Purchases("test_api_key");
   const customerInfo = await billing.getCustomerInfo("someAppUserId");
   const activeCatServicesEntitlementInfo: EntitlementInfo = {
     identifier: "activeCatServices",

src/ui/modal-header.svelte

@@ -5,7 +5,6 @@
   import { BrandingInfoResponse } from "../networking/responses/branding-response";
   import { buildAssetURL } from "../networking/assets";
 
-  export let title = "";
   export let brandingInfo: BrandingInfoResponse | null = null;
 </script>
 

src/ui/rcb-ui.svelte

@@ -96,6 +96,10 @@
           paymentInfoCollectionMetadata = result;
           return;
         }
+        if (result.next_action === 'completed') {
+          state = 'success';
+          return;
+        }
       })
       .catch((e: PurchasesError) => {
         handleError(new PurchaseFlowError(

src/ui/shell.svelte

@@ -3,7 +3,6 @@
   import Modal from "./modal.svelte";
   import { BrandingInfoResponse } from "../networking/responses/branding-response";
 
-  export let title = "";
   export let dark = false;
   export let showHeader = false;
   export let brandingInfo: BrandingInfoResponse | null = null;

src/ui/states/state-needs-payment-info.svelte

@@ -33,14 +33,8 @@
   }
 
   onMount(async () => {
-    const stripeSettings = purchases?._PAYMENT_PROVIDER_SETTINGS?.stripe;
-
-    if (!stripeSettings) {
-      throw new Error("Stripe settings not found");
-    }
-
-    const stripePk = stripeSettings.publishableKey;
-    const stripeAcctId = stripeSettings.accountId;
+    const stripePk = paymentInfoCollectionMetadata.data.publishable_api_key;
+    const stripeAcctId = paymentInfoCollectionMetadata.data.stripe_account_id;
 
     if (!stripePk || !stripeAcctId) {
       throw new Error("Stripe publishable key or account ID not found");