@rebilly/instruments 16.112.1 → 16.113.1

package/CHANGELOG.md

@@ -1,6 +1 @@
-## [16.112.1](https://github.com/Rebilly/rebilly/compare/instruments/core-v16.112.0...instruments/core-v16.112.1) (2026-05-12)
-
-
-### Bug Fixes
-
-* **storefront-payment-form:** Payout request did not require address in instruments config ([#21355](https://github.com/Rebilly/rebilly/issues/21355)) ([2194f00](https://github.com/Rebilly/rebilly/commit/2194f00512f4a7f398e1221fd44c2fb7ca277bd7))
+## [16.113.1](https://github.com/Rebilly/rebilly/compare/instruments/core-v16.113.0...instruments/core-v16.113.1) (2026-05-13)

package/dist/index.js

@@ -2206,7 +2206,7 @@ let ModalIframe$1 = class ModalIframe extends BaseIframe {
     window.addEventListener(
       "message",
       async (event) => {
-        var _a, _b;
+        var _a, _b, _c;
         if (((_a = event.data) == null ? void 0 : _a.type) === "rebilly-spf:ready" && event.source === this.component.frame.contentWindow) {
           this.component.frame.contentWindow.postMessage(
             {
@@ -2223,7 +2223,19 @@ let ModalIframe$1 = class ModalIframe extends BaseIframe {
           isRedirected = true;
         }
         if (event.data === "rebilly-instruments-approval-url-close") {
-          if (state.options.transactionType === "purchase") {
+          if ((_b = this.model) == null ? void 0 : _b.setup) {
+            const { instrument, transaction } = this.model.setup;
+            state.storefront.setSessionToken(
+              instrument.token || state.options.jwt
+            );
+            const { fields: updatedTransaction } = await state.storefront.transactions.get({
+              id: transaction.id
+            });
+            close({
+              transaction: updatedTransaction,
+              instrument
+            });
+          } else if (state.options.transactionType === "purchase") {
             state.storefront.setSessionToken(
               state.data.token || state.options.jwt
             );
@@ -2231,7 +2243,7 @@ let ModalIframe$1 = class ModalIframe extends BaseIframe {
               state.storefront.transactions.get({
                 id: state.data.transaction.id
               }),
-              ((_b = state.data.invoice) == null ? void 0 : _b.id) ? state.storefront.invoices.get({
+              ((_c = state.data.invoice) == null ? void 0 : _c.id) ? state.storefront.invoices.get({
                 id: state.data.invoice.id
               }) : { fields: null }
             ]);
@@ -2244,17 +2256,6 @@ let ModalIframe$1 = class ModalIframe extends BaseIframe {
               updatedPurchase.invoice = invoice;
             }
             close(updatedPurchase);
-          } else if (state.options.transactionType === "setup") {
-            state.storefront.setSessionToken(
-              state.data.instrument.token || state.options.jwt
-            );
-            const { fields: transaction } = await state.storefront.transactions.get({
-              id: state.data.transaction.id
-            });
-            close({
-              transaction,
-              instrument: state.data.instrument
-            });
           } else {
             close();
           }
@@ -5298,7 +5299,7 @@ function C$1({ options: e2 }) {
   }
   function o2() {
     const i = {
-      "REB-API-CONSUMER": `${["Rebilly", e2.appName, "js-sdk"].filter((g) => g).join("/")}@8ea67b3`
+      "REB-API-CONSUMER": `${["Rebilly", e2.appName, "js-sdk"].filter((g) => g).join("/")}@42eda38`
     };
     return e2.apiKey && (i["REB-APIKEY"] = e2.apiKey), i;
   }
@@ -18720,16 +18721,19 @@ async function fetchAccountAndWebsite() {
   });
 }
 async function setupPaymentInstrument({
-  data
+  data,
+  instrument
 }) {
   return Endpoint(async () => {
     var _a, _b, _c;
     validateStorefront(state.storefront);
     validateOptions$1(state.options);
-    const { fields: instrument } = await state.storefront.paymentInstruments.create({ data });
-    state.storefront.setSessionToken(instrument.token || state.options.jwt);
+    const targetInstrument = instrument ?? (await state.storefront.paymentInstruments.create({ data })).fields;
+    state.storefront.setSessionToken(
+      targetInstrument.token || state.options.jwt
+    );
     const setupPayload = {
-      id: instrument.id,
+      id: targetInstrument.id,
       data: {
         websiteId: state.options.websiteId,
         ...data
@@ -18745,7 +18749,7 @@ async function setupPaymentInstrument({
       setupPayload.data.redirectUrl = `${setupPayload.data.redirectUrl}&originalRedirectUrl=${state.data.transaction.redirectUrl}`;
     }
     const { fields: transaction } = await state.storefront.paymentInstruments.setup(setupPayload);
-    return { instrument, transaction };
+    return { instrument: targetInstrument, transaction };
   });
 }
 async function fetchPaymentInstrument() {
@@ -18812,7 +18816,6 @@ const _PayoutRequestModel = class _PayoutRequestModel extends BaseModel {
 };
 _PayoutRequestModel.Status = {
   pending: "pending",
-  partiallyFulfilled: "partially-fulfilled",
   fulfilled: "fulfilled",
   canceled: "canceled"
 };
@@ -18897,6 +18900,9 @@ class DataInstance {
     } else if (this.transaction) {
       currency = this.transaction.currency;
       amount = this.transaction.amount;
+    } else if (this.payout) {
+      currency = this.payout.currency;
+      amount = this.payout.amount;
     } else if (this.money) {
       currency = this.money.currency;
       amount = this.money.amount;
@@ -23107,25 +23113,78 @@ async function makePayment({ payload }) {
   }
   return fields;
 }
-async function makePayout({
-  payload: {
-    isExistingInstrument,
-    _raw: { id: paymentInstrumentId }
-  }
+const PAYOUT_SETUP_REQUIRED_METHODS = ["VegaWallet"];
+async function awaitPayoutSetupApprovalUrl({
+  instrument,
+  transaction
 }) {
-  if (!isExistingInstrument) {
-    const { id: newPaymentInstrumentId } = await createPaymentInstrument({
-      data: { token: paymentInstrumentId }
+  var _a, _b;
+  if (!(transaction == null ? void 0 : transaction.approvalUrl) || transaction.result !== "unknown") {
+    return;
+  }
+  validateOptions$1(state.options);
+  if ((_a = state.options.features) == null ? void 0 : _a.fullPageRedirect) {
+    window.location.href = transaction.approvalUrl;
+    return new Promise(() => {
     });
-    paymentInstrumentId = newPaymentInstrumentId;
   }
-  const payoutRequest = await updatePayoutRequest({
+  const paymentMethodsUrl = (_b = state.options._computed) == null ? void 0 : _b.paymentMethodsUrl;
+  const name = "rebilly-instruments-approval-url";
+  return new Promise((resolve, reject) => {
+    mountModal({
+      name,
+      // Load the iframe at the root URL so App.vue can complete its postmate
+      // handshake before mountModal navigates the child router to the approval-url route
+      url: `${paymentMethodsUrl}?name=${name}`,
+      model: {
+        setup: { instrument, transaction }
+      },
+      close: ({
+        transaction: updatedTransaction
+      } = {}) => {
+        if ((updatedTransaction == null ? void 0 : updatedTransaction.result) === "declined") {
+          reject(
+            new Error("Payment instrument verification failed.")
+          );
+          return;
+        }
+        resolve();
+      }
+    });
+  });
+}
+async function makePayout({ payload }) {
+  const { isExistingInstrument, _raw, redirectUrl } = payload;
+  const paymentInstrumentId = await resolvePaymentInstrumentId({
+    token: _raw,
+    isExistingInstrument,
+    redirectUrl
+  });
+  return updatePayoutRequest({
     id: state.data.payout.id,
-    data: {
-      paymentInstrumentId
-    }
+    data: { paymentInstrumentId }
+  });
+}
+async function resolvePaymentInstrumentId({
+  token,
+  isExistingInstrument,
+  redirectUrl
+}) {
+  if (PAYOUT_SETUP_REQUIRED_METHODS.includes(token.method)) {
+    const redirectField = redirectUrl ? { redirectUrl } : {};
+    const { instrument, transaction } = await setupPaymentInstrument(
+      isExistingInstrument ? { instrument: token, data: redirectField } : { data: { token: token.id, ...redirectField } }
+    );
+    await awaitPayoutSetupApprovalUrl({ instrument, transaction });
+    return instrument.id;
+  }
+  if (isExistingInstrument) {
+    return token.id;
+  }
+  const { id } = await createPaymentInstrument({
+    data: { token: token.id }
   });
-  return payoutRequest;
+  return id;
 }
 async function purchase({ payload }) {
   var _a, _b;
@@ -23196,11 +23255,14 @@ async function setup({ payload }) {
         window.location = transaction.approvalUrl;
       } else {
         const { paymentMethodsUrl } = state.options._computed;
+        const name = "rebilly-instruments-approval-url";
         mountModal({
-          name: "rebilly-instruments-approval-url",
-          url: `${paymentMethodsUrl}/approval-url`,
+          name,
+          // Load the iframe at the root URL so App.vue can complete its postmate
+          // handshake before mountModal navigates the child router to the approval-url route
+          url: `${paymentMethodsUrl}?name=${name}`,
           model: {
-            setup: { transaction }
+            setup: { instrument, transaction }
           },
           close: ({
             transaction: updatedTransaction = transaction