@rebilly/instruments 3.9.4-beta.0 → 3.11.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.9.4-beta.0",
+  "version": "3.11.0-beta.0",
   "author": "Rebilly",
   "main": "dist/index.js",
   "unpkg": "dist/index.min.js",

package/src/storefront/index.js

@@ -1,4 +1,4 @@
-import RebillyApi, {RebillyStorefrontAPI} from 'rebilly-js-sdk';
+import RebillyApi, {RebillyStorefrontAPI, RebillyExperimentalAPI} from 'rebilly-js-sdk';
 
 export function validateStateForStorefront({state}) {
   if (!state.storefront) {
@@ -56,11 +56,15 @@ export class StorefrontInstance {
     // TODO: Check why Rollup is making the default as an named export
     const rebilly = typeof RebillyApi.default === 'function' ? RebillyApi.default(config) : RebillyApi(config);
 
+    const experimental = RebillyExperimentalAPI(config);
+
     api.setSessionToken(publishableKey || jwt);
     rebilly.setSessionToken(publishableKey || jwt);
+    experimental.setSessionToken(publishableKey || jwt);
 
     this.api = api;
     this.api.rebilly = rebilly;
+    this.api.rebilly.experimental = experimental;
 
     return this.api;
   }

package/src/storefront/ready-to-pay.js

@@ -33,6 +33,18 @@ export async function fetchReadyToPay({ state, riskMetadata = null }) {
       data.currency = money.currency;
     }
 
+    if (state.data?.account?.address) {
+      data.billingAddress = state.data.account.address;
+    } else {
+      const { fields } = await state.storefront.rebilly.experimental.location.query();
+      data.billingAddress = {
+        city: fields.city,
+        region: fields.region,
+        country: fields.country || state.options.countryCode,
+        postalCode: fields.zip
+      };
+    }
+
     const [
       { fields: readyToPayFields },
       { items: paymentMethodsMetadataItems } 

package/src/storefront/ready-to-pay.spec.js

@@ -41,11 +41,11 @@ describe('Storefront API Ready to Pay', () => {
 
     expect(instance.storefront.purchase.readyToPay).toBeCalledTimes(1);
     expect(instance.storefront.purchase.readyToPay).toBeCalledWith({
-      data: {
+      data: expect.objectContaining({
         items: options.items,
         websiteId: options.websiteId,
         riskMetadata: {}
-      }
+      })
     });
     expect(response).toBeInstanceOf(Array);
     expect(response[0]).toBeInstanceOf(ReadyToPayModel);

package/src/views/method-selector/express-methods/apple-pay.js

@@ -63,6 +63,11 @@ export default function mountApplePay({
     updateBtnStyling();
   });
 
+  // HOTFIX: Hardcoded, use env variables in the future
+  const redirectUrl = state.options.apiMode === 'sandbox'
+    ? 'https://forms-sandbox.secure-payments.app/approval-url?close=true'
+    : 'https://forms.secure-payments.app/approval-url?close=true';
+
   Rebilly.on('token-ready', (token) => {
     const instrumentReadyPayload = {
       websiteId: state.options.websiteId,
@@ -71,6 +76,7 @@ export default function mountApplePay({
         token: token.id,
       },
       billingAddress: token.billingAddress,
+      redirectUrl,
       _raw: token
     }
     if (!token.shippingAddress) {