@paykit-sdk/gopay 1.0.5 → 1.1.2

package/dist/gopay-provider.mjs

@@ -1,4 +1,4 @@
-import { schema, AbstractPayKitProvider, HTTPClient, createCheckoutSchema, ValidationError, InvalidTypeError, validateRequiredKeys, PAYKIT_METADATA_KEY, OperationFailedError, ProviderNotSupportedError, createSubscriptionSchema, createPaymentSchema, ConfigurationError, createRefundSchema, WebhookError, tryCatchAsync, paykitEvent$InboundSchema, omitInternalMetadata } from '@paykit-sdk/core';
+import { schema, AbstractPayKitProvider, HTTPClient, OAuth2TokenManager, createCheckoutSchema, ValidationError, isEmailCustomer, InvalidTypeError, validateRequiredKeys, PAYKIT_METADATA_KEY, OperationFailedError, ProviderNotSupportedError, createSubscriptionSchema, ConfigurationError, createPaymentSchema, createRefundSchema, WebhookError, tryCatchAsync, paykitEvent$InboundSchema, omitInternalMetadata } from '@paykit-sdk/core';
 import * as crypto from 'crypto';
 
 var __defProp = Object.defineProperty;
@@ -4036,70 +4036,63 @@ var ostring = () => stringType().optional();
 var onumber = () => numberType().optional();
 var oboolean = () => booleanType().optional();
 var coerce = {
-  string: (arg) => ZodString.create({ ...arg, coerce: true }),
-  number: (arg) => ZodNumber.create({ ...arg, coerce: true }),
-  boolean: (arg) => ZodBoolean.create({
+  string: ((arg) => ZodString.create({ ...arg, coerce: true })),
+  number: ((arg) => ZodNumber.create({ ...arg, coerce: true })),
+  boolean: ((arg) => ZodBoolean.create({
     ...arg,
     coerce: true
-  }),
-  bigint: (arg) => ZodBigInt.create({ ...arg, coerce: true }),
-  date: (arg) => ZodDate.create({ ...arg, coerce: true })
+  })),
+  bigint: ((arg) => ZodBigInt.create({ ...arg, coerce: true })),
+  date: ((arg) => ZodDate.create({ ...arg, coerce: true }))
 };
 var NEVER = INVALID;
-var AuthController = class {
-  constructor(opts) {
-    this.opts = opts;
-    const debug = opts.debug ?? true;
-    this._client = new HTTPClient({
-      baseUrl: this.opts.baseUrl,
-      headers: {},
-      retryOptions: { max: 3, baseDelay: 1e3, debug }
-    });
-  }
-  _client;
-  _accessToken = null;
-  getAccessToken = async () => {
-    if (this._accessToken) {
-      const [token, , expiryStr] = this._accessToken.split("::paykit::");
-      const expiry = parseInt(expiryStr || "0", 10);
-      if (expiry > Date.now()) return token;
-    }
-    const credentials = Buffer.from(
-      `${this.opts.clientId}:${this.opts.clientSecret}`
-    ).toString("base64");
-    const response = await this._client.post("/oauth2/token", {
-      headers: {
-        Authorization: `Basic ${credentials}`,
-        "Content-Type": "application/x-www-form-urlencoded"
+var decodeHtmlEntities = (str) => {
+  return str.replace(/"/g, '"').replace(/'/g, "'").replace(/"/g, '"').replace(/'/g, "'");
+};
+var paykitPayment$InboundSchema = (data) => {
+  const { item } = JSON.parse(
+    decodeHtmlEntities(
+      data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
+    )
+  );
+  const metadata = omitInternalMetadata(
+    data.additional_params?.reduce(
+      (acc, param) => {
+        acc[param.name] = String(param.value);
+        return acc;
       },
-      body: new URLSearchParams({
-        grant_type: "client_credentials",
-        scope: "payment-all"
-      }).toString()
-    });
-    if (!response.ok || !response.value.access_token) {
-      throw new OperationFailedError("getAccessToken", "gopay", {
-        cause: new Error("Failed to obtain GoPay access token")
-      });
-    }
-    const expiryTime = Date.now() + (response.value.expires_in - 300) * 1e3;
-    const accessToken = `${response.value.access_token}::paykit::${expiryTime}`;
-    this._accessToken = accessToken;
-    return accessToken;
+      {}
+    ) ?? {}
+  );
+  const statusMap = {
+    CREATED: "pending",
+    PAYMENT_METHOD_CHOSEN: "processing",
+    PAID: "succeeded",
+    AUTHORIZED: "requires_capture",
+    CANCELED: "canceled",
+    TIMEOUTED: "canceled",
+    REFUNDED: "canceled",
+    PARTIALLY_REFUNDED: "canceled"
   };
-  getAuthHeaders = async () => {
-    const token = await this.getAccessToken();
-    return {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json",
-      Accept: "application/json"
-    };
+  const requiresAction = data.state === "CREATED" || data.state === "AUTHORIZED" ? true : false;
+  return {
+    id: data.id.toString(),
+    amount: data.amount,
+    currency: data.currency,
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    status: statusMap[data.state],
+    item_id: item,
+    metadata,
+    requires_action: requiresAction,
+    payment_url: data.gw_url ?? null
   };
 };
-var paykitPayment$InboundSchema = (data) => {
-  const itemId = JSON.parse(
-    data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
-  ).itemId;
+var paykitCheckout$InboundSchema = (data) => {
+  const { item, qty, type } = JSON.parse(
+    decodeHtmlEntities(
+      data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
+    )
+  );
   const metadata = omitInternalMetadata(
     data.additional_params?.reduce(
       (acc, param) => {
@@ -4113,24 +4106,24 @@ var paykitPayment$InboundSchema = (data) => {
     id: data.id.toString(),
     amount: data.amount,
     currency: data.currency,
-    customer: data.payer ?? { email: data.payer?.email ?? "" },
-    status: data.state,
-    item_id: itemId,
-    metadata
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    payment_url: data.gw_url ?? "",
+    metadata,
+    session_type: type,
+    products: [{ id: item, quantity: parseInt(qty) }]
   };
 };
 var paykitInvoice$InboundSchema = (data, isSubscription) => {
-  const quantity = JSON.parse(
-    data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
-  ).qty;
-  const itemId = JSON.parse(
-    data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
-  ).itemId;
+  const { item, qty } = JSON.parse(
+    decodeHtmlEntities(
+      data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
+    )
+  );
   const status = (() => {
     if (data.state === "PAID") return "paid";
     return "open";
   })();
-  const paidAt = isSubscription ? new Date(data.recurrence?.recurrence_date_from ?? "") : /* @__PURE__ */ new Date();
+  const paidAt = isSubscription ? new Date(data.recurrence?.recurrence_date_to ?? "") : /* @__PURE__ */ new Date();
   const metadata = omitInternalMetadata(
     data.additional_params?.reduce(
       (acc, param) => {
@@ -4144,20 +4137,22 @@ var paykitInvoice$InboundSchema = (data, isSubscription) => {
     id: data.id.toString(),
     amount_paid: data.amount,
     currency: data.currency,
-    customer: data.payer ?? { email: data.payer?.email ?? "" },
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
     status,
     paid_at: paidAt.toISOString(),
     metadata: metadata ?? {},
     custom_fields: null,
     subscription_id: isSubscription ? data.id.toString() : null,
     billing_mode: isSubscription ? "recurring" : "one_time",
-    line_items: [{ id: itemId, quantity: parseInt(quantity) }]
+    line_items: [{ id: item, quantity: parseInt(qty) }]
   };
 };
 var paykitSubscription$InboundSchema = (data) => {
-  const itemId = JSON.parse(
-    data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
-  ).itemId;
+  const { item } = JSON.parse(
+    decodeHtmlEntities(
+      data.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
+    )
+  );
   const billingIntervalMap = {
     DAY: "day",
     WEEK: "week",
@@ -4165,8 +4160,28 @@ var paykitSubscription$InboundSchema = (data) => {
     ON_DEMAND: "month"
   };
   const billingInterval = billingIntervalMap[data.recurrence?.recurrence_cycle ?? "ON_DEMAND"];
-  const currentPeriodStart = new Date(data.recurrence?.recurrence_date_from ?? "");
+  const recurrencePeriod = data.recurrence?.recurrence_period ?? 1;
+  const recurrenceCycle = data.recurrence?.recurrence_cycle;
   const currentPeriodEnd = new Date(data.recurrence?.recurrence_date_to ?? "");
+  const currentPeriodStart = (() => {
+    if (!currentPeriodEnd) return /* @__PURE__ */ new Date();
+    const endDate = new Date(currentPeriodEnd);
+    const startDate = new Date(endDate);
+    switch (recurrenceCycle) {
+      case "DAY":
+        startDate.setDate(startDate.getDate() - recurrencePeriod);
+        break;
+      case "WEEK":
+        startDate.setDate(startDate.getDate() - recurrencePeriod * 7);
+        break;
+      case "MONTH":
+        startDate.setMonth(startDate.getMonth() - recurrencePeriod);
+        break;
+      default:
+        startDate.setDate(startDate.getDate() - recurrencePeriod);
+    }
+    return startDate;
+  })();
   const metadata = omitInternalMetadata(
     data.additional_params?.reduce(
       (acc, param) => {
@@ -4176,18 +4191,32 @@ var paykitSubscription$InboundSchema = (data) => {
       {}
     ) ?? {}
   );
+  const requiresAction = data.state === "CREATED" ? true : false;
+  const status = (() => {
+    if (data.state === "CREATED") return "pending";
+    if (data.state === "PAID") return "active";
+    if (data.state === "CANCELED") return "canceled";
+    if (data.state === "TIMEOUTED") return "canceled";
+    if (data.state === "REFUNDED") return "canceled";
+    if (data.state === "PARTIALLY_REFUNDED") return "canceled";
+    if (data.state === "AUTHORIZED") return "active";
+    if (data.state === "PAYMENT_METHOD_CHOSEN") return "active";
+    return "pending";
+  })();
   return {
     id: data.id.toString(),
-    status: "active",
-    customer: data.payer ?? { email: data.payer?.email ?? "" },
-    item_id: itemId,
+    status,
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    item_id: item,
     billing_interval: billingInterval,
     currency: data.currency,
     amount: data.amount,
-    metadata: metadata ?? {},
+    metadata,
     custom_fields: null,
     current_period_start: currentPeriodStart,
-    current_period_end: currentPeriodEnd
+    current_period_end: currentPeriodEnd,
+    requires_action: requiresAction,
+    payment_url: requiresAction ? data.gw_url ?? null : null
   };
 };
 var paykitRefund$InboundSchema = (data) => {
@@ -4217,22 +4246,42 @@ var GoPayProvider = class extends AbstractPayKitProvider {
     super(gopayOptionsSchema, opts, providerName);
     this.opts = opts;
     const debug = opts.debug ?? true;
-    this.baseUrl = opts.isSandbox ? "https://gate.gopay.cz/api" : "https://gw.sandbox.gopay.com/api";
+    this.baseUrl = opts.isSandbox ? "https://gw.sandbox.gopay.com/api" : "https://gate.gopay.cz/api";
     this._client = new HTTPClient({
       baseUrl: this.baseUrl,
       headers: {},
       retryOptions: { max: 3, baseDelay: 1e3, debug }
     });
-    this.authController = new AuthController({ ...opts, baseUrl: this.baseUrl });
+    this.tokenManager = new OAuth2TokenManager({
+      client: this._client,
+      provider: this.providerName,
+      tokenEndpoint: "/oauth2/token",
+      credentials: { username: opts.clientId, password: opts.clientSecret },
+      responseAdapter: (response) => ({
+        accessToken: response.access_token,
+        expiresIn: response.expires_in
+      }),
+      expiryBuffer: 5 * 60,
+      // 5 minutes
+      requestBody: "grant_type=client_credentials&scope=payment-all",
+      requestHeaders: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json"
+      },
+      authHeaders: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      }
+    });
   }
   providerName = providerName;
   _client;
   baseUrl;
-  authController;
+  tokenManager;
   createCheckout = async (params) => {
     const { error, data } = createCheckoutSchema.safeParse(params);
     if (error) throw ValidationError.fromZodError(error, "gopay", "createCheckout");
-    if (typeof data.customer == "string" || typeof data.customer === "object" && !data.customer.email) {
+    if (!isEmailCustomer(data.customer)) {
       throw new InvalidTypeError("customer", "object (customer) with email", "string", {
         provider: this.providerName,
         method: "createCheckout"
@@ -4245,7 +4294,7 @@ var GoPayProvider = class extends AbstractPayKitProvider {
     );
     if (this.opts.debug) {
       console.info(
-        "Specify `lang` in the provider_metadata of createCheckout to set the language of the checkout, default is `EN`"
+        "Specify `language` in the `provider_metadata` of createCheckout to set the language of the checkout, default is `EN`"
       );
       console.info("Creating checkout with metadata:", data.metadata);
     }
@@ -4274,31 +4323,42 @@ var GoPayProvider = class extends AbstractPayKitProvider {
           type: "ITEM"
         }
       ],
-      lang: data.provider_metadata?.lang ? data.provider_metadata.lang : "EN",
+      lang: data.provider_metadata?.language ? data.provider_metadata.language : "EN",
       callback: { return_url: data.success_url, notification_url: this.opts.webhookUrl },
       additional_params: Object.entries({
         ...data.metadata,
         [PAYKIT_METADATA_KEY]: JSON.stringify({
-          itemId: data.item_id,
-          qty: data.quantity
+          item: data.item_id,
+          qty: data.quantity,
+          type: data.session_type
         })
       }).map(([name, value]) => ({
         name,
         value: String(value)
       }))
     };
-    const response = await this._client.post("/payments/payment", {
-      body: JSON.stringify(goPayRequest),
-      headers: await this.authController.getAuthHeaders()
-    });
-    console.dir({ response }, { depth: null });
-    return response.value;
+    const response = await this._client.post(
+      "/payments/payment",
+      {
+        body: JSON.stringify(goPayRequest),
+        headers: await this.tokenManager.getAuthHeaders()
+      }
+    );
+    if (!response.ok) {
+      throw new OperationFailedError("createCheckout", this.providerName, {
+        cause: new Error("Failed to create checkout")
+      });
+    }
+    return paykitCheckout$InboundSchema(response.value);
   };
   retrieveCheckout = async (id) => {
     const response = await this._client.get(
       `/payments/payment/${id}`,
       {
-        headers: await this.authController.getAuthHeaders()
+        headers: {
+          ...await this.tokenManager.getAuthHeaders(),
+          "Content-Type": "application/x-www-form-urlencoded"
+        }
       }
     );
     if (!response.ok) {
@@ -4306,12 +4366,13 @@ var GoPayProvider = class extends AbstractPayKitProvider {
         cause: new Error("Failed to retrieve checkout")
       });
     }
-    console.dir({ response }, { depth: null });
-    return response.value;
+    return paykitCheckout$InboundSchema(response.value);
   };
   updateCheckout = async (id, params) => {
     if (this.opts.debug) {
-      console.info("Gopay doesn't support updating checkouts");
+      console.info(
+        "Gopay doesn't support updating checkouts, returning existing checkout"
+      );
     }
     const existing = await this.retrieveCheckout(id);
     return existing;
@@ -4323,23 +4384,36 @@ var GoPayProvider = class extends AbstractPayKitProvider {
     });
   };
   createCustomer = async (params) => {
+    if (this.cloudClient) {
+      return this.cloudClient.customers.create(params);
+    }
     throw new ProviderNotSupportedError("createCustomer", "gopay", {
-      reason: "Gopay doesn't support creating customers"
+      reason: "Gopay doesn't support creating customers, use the cloud API instead by setting `cloudApiKey` in the options"
     });
   };
   updateCustomer = async (id, params) => {
+    if (this.cloudClient) {
+      return this.cloudClient.customers.update(id, params);
+    }
     throw new ProviderNotSupportedError("updateCustomer", "gopay", {
-      reason: "Gopay doesn't support updating customers"
+      reason: "Gopay doesn't support updating customers, use the cloud API instead by setting `cloudApiKey` in the options"
     });
   };
   deleteCustomer = async (id) => {
+    if (this.cloudClient) {
+      this.cloudClient.customers.delete(id);
+      return null;
+    }
     throw new ProviderNotSupportedError("deleteCustomer", "gopay", {
-      reason: "Gopay doesn't support deleting customers"
+      reason: "Gopay doesn't support deleting customers, use the cloud API instead by setting `cloudApiKey` in the options"
     });
   };
   retrieveCustomer = async (id) => {
+    if (this.cloudClient) {
+      return this.cloudClient.customers.retrieve(id);
+    }
     throw new ProviderNotSupportedError("retrieveCustomer", "gopay", {
-      reason: "Gopay doesn't support retrieving customers"
+      reason: "Gopay doesn't support retrieving customers, use the cloud API instead by setting `cloudApiKey` in the options"
     });
   };
   createSubscription = async (params) => {
@@ -4351,30 +4425,50 @@ var GoPayProvider = class extends AbstractPayKitProvider {
         method: "createCheckout"
       });
     }
-    const { quantity, success_url } = validateRequiredKeys(
-      ["quantity", "success_url"],
+    const { success_url } = validateRequiredKeys(
+      ["success_url"],
       data.provider_metadata,
       "The following fields must be present in the provider_metadata of createCheckout: {keys}"
     );
+    if (this.opts.debug) {
+      if (data.billing_interval === "year") {
+        console.info(
+          "GoPay does not support yearly subscriptions, the available options are `day`, `week`, `month` and `ON_DEMAND` \n raise an issue at https://github.com/usepaykit/paykit-sdk/issues if you need this feature"
+        );
+      }
+      if (!data.provider_metadata?.description) {
+        console.info(
+          `No description provided for the subscription \`provider_metadata.description\`, using default description \`Subscription by ${data.customer.email}\``
+        );
+      }
+    }
     const intervalMap = {
       day: "DAY",
       week: "WEEK",
       month: "MONTH",
-      year: "MONTH"
+      year: "ON_DEMAND"
     };
+    const recurrenceCycle = intervalMap?.[data.billing_interval] ?? "ON_DEMAND";
     const currentPeriodEnd = (() => {
-      if (data.billing_interval === "day") {
+      if (recurrenceCycle === "DAY") {
         return new Date(Date.now() + 1 * 24 * 60 * 60 * 1e3).toISOString();
       }
-      if (data.billing_interval === "week") {
+      if (recurrenceCycle === "WEEK") {
         return new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3).toISOString();
       }
-      if (data.billing_interval === "month") {
+      if (recurrenceCycle === "MONTH") {
         return new Date(Date.now() + 30 * 24 * 60 * 60 * 1e3).toISOString();
       }
-      return new Date(Date.now() + 365 * 24 * 60 * 60 * 1e3).toISOString();
+      if (recurrenceCycle === "ON_DEMAND") {
+        throw new ConfigurationError(
+          "ON_DEMAND subscriptions is not yet implemented by PayKit, please open an issue at https://github.com/usepaykit/paykit-sdk/issues",
+          {
+            provider: this.providerName
+          }
+        );
+      }
+      throw new Error("Invalid billing interval: " + data.billing_interval);
     })();
-    const recurrenceCycle = intervalMap[data.billing_interval] ?? "ON_DEMAND";
     const goPaySubscriptionOptions = {
       payer: {
         allowed_payment_instruments: ["PAYMENT_CARD"],
@@ -4385,54 +4479,66 @@ var GoPayProvider = class extends AbstractPayKitProvider {
       amount: Number(data.amount),
       currency: data.currency ?? "CZK",
       order_number: crypto.randomBytes(8).toString("hex").slice(0, 15),
-      order_description: data.metadata?.description || "Subscription",
-      items: [
-        { name: data.item_id, amount: Number(data.amount), count: parseInt(quantity) }
-      ],
+      order_description: data.provider_metadata?.description ? data.provider_metadata.description : "Subscription by " + data.customer.email,
+      items: [{ name: data.item_id, amount: Number(data.amount), count: data.quantity }],
       recurrence: {
         recurrence_cycle: recurrenceCycle,
-        recurrence_period: parseInt(quantity),
+        recurrence_period: data.quantity,
         recurrence_date_to: currentPeriodEnd
       },
-      callback: { return_url: success_url, notification_url: this.opts.webhookUrl }
+      callback: { return_url: success_url, notification_url: this.opts.webhookUrl },
+      additional_params: Object.entries({
+        ...data.metadata,
+        [PAYKIT_METADATA_KEY]: JSON.stringify({
+          item: data.item_id,
+          qty: data.quantity
+        })
+      }).map(([name, value]) => ({
+        name,
+        value: String(value)
+      }))
     };
-    const response = await this._client.post("/payments/payment", {
-      body: JSON.stringify(goPaySubscriptionOptions),
-      headers: await this.authController.getAuthHeaders()
-    });
+    const response = await this._client.post(
+      "/payments/payment",
+      {
+        body: JSON.stringify(goPaySubscriptionOptions),
+        headers: await this.tokenManager.getAuthHeaders()
+      }
+    );
     if (!response.ok) {
       throw new OperationFailedError("createSubscription", this.providerName, {
         cause: new Error("Failed to create subscription")
       });
     }
-    console.dir({ response }, { depth: 100 });
-    return response.value;
+    return paykitSubscription$InboundSchema(response.value);
   };
   updateSubscription = async (id, params) => {
-    console.info("Gopay doesn't support updating subscriptions");
     const subscription = await this.retrieveSubscription(id);
     if (!subscription) {
-      throw new OperationFailedError("updateSubscription", this.providerName, {
-        cause: new Error("Failed to retrieve subscription")
+      throw new ProviderNotSupportedError("updateSubscription", this.providerName, {
+        reason: "Gopay doesn't support updating subscriptions",
+        alternative: "Use the payment API instead and update the subscription manually"
       });
     }
     return subscription;
   };
   cancelSubscription = async (id) => {
-    const response = await this._client.post(
-      `/payments/payment/${id}/void-recurrence`,
-      {
-        headers: await this.authController.getAuthHeaders()
-      }
-    );
-    console.dir({ response }, { depth: 100 });
-    const subscription = await this.retrieveSubscription(id);
-    if (!subscription) {
+    const existingSubscription = await this.retrieveSubscription(id);
+    if (!existingSubscription) {
       throw new OperationFailedError("cancelSubscription", this.providerName, {
         cause: new Error("Failed to retrieve subscription")
       });
     }
-    return { ...subscription, status: "canceled" };
+    const response = await this._client.post(`/payments/payment/${id}/void-recurrence`, {
+      headers: {
+        ...await this.tokenManager.getAuthHeaders(),
+        "Content-Type": "application/x-www-form-urlencoded"
+      }
+    });
+    return {
+      ...existingSubscription,
+      ...response.value?.result == "FINISHED" && { status: "canceled" }
+    };
   };
   deleteSubscription = async (id) => {
     await this.cancelSubscription(id);
@@ -4442,7 +4548,7 @@ var GoPayProvider = class extends AbstractPayKitProvider {
     const response = await this._client.get(
       `/payments/payment/${id}`,
       {
-        headers: await this.authController.getAuthHeaders()
+        headers: await this.tokenManager.getAuthHeaders()
       }
     );
     if (!response.ok) {
@@ -4450,14 +4556,13 @@ var GoPayProvider = class extends AbstractPayKitProvider {
         cause: new Error("Failed to retrieve subscription")
       });
     }
-    console.dir({ response }, { depth: 100 });
-    return response.value;
+    return paykitSubscription$InboundSchema(response.value);
   };
   createPayment = async (params) => {
     const { error, data } = createPaymentSchema.safeParse(params);
     if (error)
       throw ValidationError.fromZodError(error, this.providerName, "createPayment");
-    if (typeof data.customer == "string" || typeof data.customer === "object" && !data.customer.email) {
+    if (typeof data.customer == "string" || typeof data.customer === "object" && !data.customer?.email) {
       throw new InvalidTypeError("customer", "object (customer) with email", "string", {
         provider: this.providerName,
         method: "createPayment"
@@ -4494,23 +4599,28 @@ var GoPayProvider = class extends AbstractPayKitProvider {
         value: String(value)
       }))
     };
-    const response = await this._client.post("/payments/payment", {
-      body: JSON.stringify(goPayRequest),
-      headers: await this.authController.getAuthHeaders()
-    });
+    const response = await this._client.post(
+      "/payments/payment",
+      {
+        body: JSON.stringify(goPayRequest),
+        headers: await this.tokenManager.getAuthHeaders()
+      }
+    );
     if (!response.ok) {
       throw new OperationFailedError("createPayment", this.providerName, {
         cause: new Error("Failed to create payment")
       });
     }
-    console.dir({ response }, { depth: 100 });
-    return response.value;
+    return paykitPayment$InboundSchema(response.value);
   };
   retrievePayment = async (id) => {
     const response = await this._client.get(
       `/payments/payment/${id}`,
       {
-        headers: await this.authController.getAuthHeaders()
+        headers: {
+          ...await this.tokenManager.getAuthHeaders(),
+          "Content-Type": "application/x-www-form-urlencoded"
+        }
       }
     );
     if (!response.ok) {
@@ -4518,8 +4628,7 @@ var GoPayProvider = class extends AbstractPayKitProvider {
         cause: new Error("Failed to retrieve payment")
       });
     }
-    console.dir({ response }, { depth: 100 });
-    return response.value;
+    return paykitPayment$InboundSchema(response.value);
   };
   deletePayment = async (id) => {
     throw new ProviderNotSupportedError("deletePayment", this.providerName, {
@@ -4529,22 +4638,19 @@ var GoPayProvider = class extends AbstractPayKitProvider {
   };
   capturePayment = async (id, params) => {
     const payment = await this._client.get(
-      `/payments/payment/${id}`,
-      {
-        headers: await this.authController.getAuthHeaders()
-      }
+      `/payments/payment/${id}/capture`,
+      { headers: await this.tokenManager.getAuthHeaders() }
     );
     if (!payment.ok) {
       throw new OperationFailedError("capturePayment", this.providerName, {
         cause: new Error("Failed to retrieve payment")
       });
     }
-    const productId = JSON.parse(
-      payment.value.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
-    ).itemId;
-    const quantity = JSON.parse(
-      payment.value.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
-    ).qty;
+    const { item, qty } = JSON.parse(
+      decodeHtmlEntities(
+        payment.value.additional_params?.find((param) => param.name === PAYKIT_METADATA_KEY)?.value ?? "{}"
+      )
+    );
     if (!payment) {
       throw new OperationFailedError("capturePayment", this.providerName, {
         cause: new Error("Payment not found after capture")
@@ -4552,22 +4658,22 @@ var GoPayProvider = class extends AbstractPayKitProvider {
     }
     const captureBody = {
       amount: params.amount,
-      items: [{ name: productId, amount: params.amount, count: quantity }]
+      items: [{ name: item, amount: params.amount, count: qty }]
     };
-    await this._client.post(`/payments/payment/${id}/capture`, {
-      body: JSON.stringify(captureBody),
-      headers: await this.authController.getAuthHeaders()
-    });
+    await this._client.post(
+      `/payments/payment/${id}/capture`,
+      {
+        body: JSON.stringify(captureBody),
+        headers: await this.tokenManager.getAuthHeaders()
+      }
+    );
     return paykitPayment$InboundSchema(payment.value);
   };
   cancelPayment = async (id) => {
-    const response = await this._client.post(
+    await this._client.post(
       `/payments/payment/${id}/void-authorization`,
-      {
-        headers: await this.authController.getAuthHeaders()
-      }
+      { headers: await this.tokenManager.getAuthHeaders() }
     );
-    console.dir({ response }, { depth: 100 });
     const payment = await this.retrievePayment(id);
     if (!payment) {
       throw new OperationFailedError("cancelPayment", this.providerName, {
@@ -4591,24 +4697,22 @@ var GoPayProvider = class extends AbstractPayKitProvider {
   };
   async createRefund(params) {
     const { error, data } = createRefundSchema.safeParse(params);
-    if (error)
+    if (error) {
       throw ValidationError.fromZodError(error, this.providerName, "createRefund");
+    }
     const payment = await this.retrievePayment(data.payment_id);
     if (!payment) {
       throw new OperationFailedError("createRefund", this.providerName, {
         cause: new Error("Failed to retrieve payment")
       });
     }
-    const response = await this._client.post(
-      `/payments/payment/${data.payment_id}/refund`,
-      {
-        body: new URLSearchParams({ amount: String(data.amount) }).toString(),
-        headers: {
-          ...await this.authController.getAuthHeaders(),
-          "Content-Type": "application/x-www-form-urlencoded"
-        }
+    const response = await this._client.post(`/payments/payment/${data.payment_id}/refund`, {
+      body: new URLSearchParams({ amount: String(data.amount) }).toString(),
+      headers: {
+        ...await this.tokenManager.getAuthHeaders(),
+        "Content-Type": "application/x-www-form-urlencoded"
       }
-    );
+    });
     if (!response.ok) {
       throw new OperationFailedError("createRefund", this.providerName, {
         cause: new Error("Failed to create refund")
@@ -4634,7 +4738,10 @@ var GoPayProvider = class extends AbstractPayKitProvider {
     }
     const [payment, error] = await tryCatchAsync(
       this._client.get(`/payments/payment/${paymentId}`, {
-        headers: await this.authController.getAuthHeaders()
+        headers: {
+          ...await this.tokenManager.getAuthHeaders(),
+          "Content-Type": "application/x-www-form-urlencoded"
+        }
       })
     );
     if (error) {
@@ -4713,7 +4820,9 @@ var GoPayProvider = class extends AbstractPayKitProvider {
       canceled: (data) => {
         const payment2 = paykitPayment$InboundSchema(data);
         const isCancellingSubscription = parentId && data.recurrence?.recurrence_state == "STOPPED";
-        const subscription = paykitSubscription$InboundSchema(data);
+        const subscription = paykitSubscription$InboundSchema(
+          data
+        );
         const subscriptionCanceledWebhookEvent = {
           type: "subscription.canceled",
           created: (/* @__PURE__ */ new Date()).getTime(),
@@ -4744,7 +4853,9 @@ var GoPayProvider = class extends AbstractPayKitProvider {
       succeeded: (data) => {
         const payment2 = paykitPayment$InboundSchema(data);
         const invoice = paykitInvoice$InboundSchema(data, !!parentId);
-        const subscription = paykitSubscription$InboundSchema(data);
+        const subscription = paykitSubscription$InboundSchema(
+          data
+        );
         const subscriptionCreatedWebhookEvent = {
           type: "subscription.created",
           created: (/* @__PURE__ */ new Date()).getTime(),