@paykit-sdk/gopay 1.1.2 → 1.1.4

package/dist/index.js

@@ -4071,10 +4071,12 @@ var NEVER = INVALID;
 var decodeHtmlEntities = (str) => {
   return str.replace(/"/g, '"').replace(/'/g, "'").replace(/"/g, '"').replace(/'/g, "'");
 };
-var paykitPayment$InboundSchema = (data) => {
+var Payment$inboundSchema = (data) => {
   const { item } = JSON.parse(
     decodeHtmlEntities(
-      data.additional_params?.find((param) => param.name === core.PAYKIT_METADATA_KEY)?.value ?? "{}"
+      data.additional_params?.find(
+        (param) => param.name === core.PAYKIT_METADATA_KEY
+      )?.value ?? "{}"
     )
   );
   const metadata = core.omitInternalMetadata(
@@ -4101,7 +4103,7 @@ var paykitPayment$InboundSchema = (data) => {
     id: data.id.toString(),
     amount: data.amount,
     currency: data.currency,
-    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : null,
     status: statusMap[data.state],
     item_id: item,
     metadata,
@@ -4109,10 +4111,12 @@ var paykitPayment$InboundSchema = (data) => {
     payment_url: data.gw_url ?? null
   };
 };
-var paykitCheckout$InboundSchema = (data) => {
+var Checkout$inboundSchema = (data) => {
   const { item, qty, type } = JSON.parse(
     decodeHtmlEntities(
-      data.additional_params?.find((param) => param.name === core.PAYKIT_METADATA_KEY)?.value ?? "{}"
+      data.additional_params?.find(
+        (param) => param.name === core.PAYKIT_METADATA_KEY
+      )?.value ?? "{}"
     )
   );
   const metadata = core.omitInternalMetadata(
@@ -4128,24 +4132,28 @@ var paykitCheckout$InboundSchema = (data) => {
     id: data.id.toString(),
     amount: data.amount,
     currency: data.currency,
-    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : null,
     payment_url: data.gw_url ?? "",
     metadata,
     session_type: type,
     products: [{ id: item, quantity: parseInt(qty) }]
   };
 };
-var paykitInvoice$InboundSchema = (data, isSubscription) => {
+var Invoice$inboundSchema = (data, isSubscription) => {
   const { item, qty } = JSON.parse(
     decodeHtmlEntities(
-      data.additional_params?.find((param) => param.name === core.PAYKIT_METADATA_KEY)?.value ?? "{}"
+      data.additional_params?.find(
+        (param) => param.name === core.PAYKIT_METADATA_KEY
+      )?.value ?? "{}"
     )
   );
   const status = (() => {
     if (data.state === "PAID") return "paid";
     return "open";
   })();
-  const paidAt = isSubscription ? new Date(data.recurrence?.recurrence_date_to ?? "") : /* @__PURE__ */ new Date();
+  const paidAt = isSubscription ? new Date(
+    data.recurrence?.recurrence_date_to ?? ""
+  ) : /* @__PURE__ */ new Date();
   const metadata = core.omitInternalMetadata(
     data.additional_params?.reduce(
       (acc, param) => {
@@ -4159,7 +4167,7 @@ var paykitInvoice$InboundSchema = (data, isSubscription) => {
     id: data.id.toString(),
     amount_paid: data.amount,
     currency: data.currency,
-    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : null,
     status,
     paid_at: paidAt.toISOString(),
     metadata: metadata ?? {},
@@ -4169,10 +4177,12 @@ var paykitInvoice$InboundSchema = (data, isSubscription) => {
     line_items: [{ id: item, quantity: parseInt(qty) }]
   };
 };
-var paykitSubscription$InboundSchema = (data) => {
+var Subscription$inboundSchema = (data) => {
   const { item } = JSON.parse(
     decodeHtmlEntities(
-      data.additional_params?.find((param) => param.name === core.PAYKIT_METADATA_KEY)?.value ?? "{}"
+      data.additional_params?.find(
+        (param) => param.name === core.PAYKIT_METADATA_KEY
+      )?.value ?? "{}"
     )
   );
   const billingIntervalMap = {
@@ -4184,7 +4194,9 @@ var paykitSubscription$InboundSchema = (data) => {
   const billingInterval = billingIntervalMap[data.recurrence?.recurrence_cycle ?? "ON_DEMAND"];
   const recurrencePeriod = data.recurrence?.recurrence_period ?? 1;
   const recurrenceCycle = data.recurrence?.recurrence_cycle;
-  const currentPeriodEnd = new Date(data.recurrence?.recurrence_date_to ?? "");
+  const currentPeriodEnd = new Date(
+    data.recurrence?.recurrence_date_to ?? ""
+  );
   const currentPeriodStart = (() => {
     if (!currentPeriodEnd) return /* @__PURE__ */ new Date();
     const endDate = new Date(currentPeriodEnd);
@@ -4214,21 +4226,21 @@ 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";
-  })();
+  const subscriptionStatusMap = {
+    CREATED: "pending",
+    PAID: "active",
+    CANCELED: "canceled",
+    TIMEOUTED: "canceled",
+    REFUNDED: "canceled",
+    PARTIALLY_REFUNDED: "canceled",
+    AUTHORIZED: "active",
+    PAYMENT_METHOD_CHOSEN: "active"
+  };
+  const status = subscriptionStatusMap[data.state] ?? "expired";
   return {
     id: data.id.toString(),
     status,
-    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : "",
+    customer: data.payer?.contact?.email ? { email: data.payer.contact.email } : null,
     item_id: item,
     billing_interval: billingInterval,
     currency: data.currency,
@@ -4241,7 +4253,7 @@ var paykitSubscription$InboundSchema = (data) => {
     payment_url: requiresAction ? data.gw_url ?? null : null
   };
 };
-var paykitRefund$InboundSchema = (data) => {
+var Refund$inboundSchema = (data) => {
   return {
     id: data.id.toString(),
     amount: data.amount,
@@ -4267,6 +4279,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
   constructor(opts) {
     super(gopayOptionsSchema, opts, providerName);
     this.opts = opts;
+    this.isSandbox = opts.isSandbox;
     const debug = opts.debug ?? true;
     this.baseUrl = opts.isSandbox ? "https://gw.sandbox.gopay.com/api" : "https://gate.gopay.cz/api";
     this._client = new core.HTTPClient({
@@ -4278,7 +4291,10 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       client: this._client,
       provider: this.providerName,
       tokenEndpoint: "/oauth2/token",
-      credentials: { username: opts.clientId, password: opts.clientSecret },
+      credentials: {
+        username: opts.clientId,
+        password: opts.clientSecret
+      },
       responseAdapter: (response) => ({
         accessToken: response.access_token,
         expiresIn: response.expires_in
@@ -4299,15 +4315,30 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
   providerName = providerName;
   _client;
   baseUrl;
+  isSandbox;
   tokenManager;
+  get _native() {
+    return null;
+  }
   createCheckout = async (params) => {
     const { error, data } = core.createCheckoutSchema.safeParse(params);
-    if (error) throw core.ValidationError.fromZodError(error, "gopay", "createCheckout");
+    if (error) {
+      throw core.ValidationError.fromZodError(
+        error,
+        "gopay",
+        "createCheckout"
+      );
+    }
     if (!core.isEmailCustomer(data.customer)) {
-      throw new core.InvalidTypeError("customer", "object (customer) with email", "string", {
-        provider: this.providerName,
-        method: "createCheckout"
-      });
+      throw new core.InvalidTypeError(
+        "customer",
+        "object (customer) with email",
+        "string",
+        {
+          provider: this.providerName,
+          method: "createCheckout"
+        }
+      );
     }
     const { amount, currency = "CZK" } = core.validateRequiredKeys(
       ["amount", "currency"],
@@ -4334,9 +4365,9 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       },
       target: { type: "ACCOUNT", goid: parseInt(this.opts.goId) },
       amount: Number(amount),
-      currency,
+      currency: currency.toUpperCase(),
       order_number: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
-      order_description: data.metadata?.description || "Checkout",
+      order_description: `Payment for ${data.item_id} by ${data.customer.email}`,
       items: [
         {
           name: data.item_id,
@@ -4346,7 +4377,10 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         }
       ],
       lang: data.provider_metadata?.language ? data.provider_metadata.language : "EN",
-      callback: { return_url: data.success_url, notification_url: this.opts.webhookUrl },
+      callback: {
+        return_url: data.success_url,
+        notification_url: this.opts.webhookUrl
+      },
       additional_params: Object.entries({
         ...data.metadata,
         [core.PAYKIT_METADATA_KEY]: JSON.stringify({
@@ -4367,11 +4401,15 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       }
     );
     if (!response.ok) {
-      throw new core.OperationFailedError("createCheckout", this.providerName, {
-        cause: new Error("Failed to create checkout")
-      });
+      throw new core.OperationFailedError(
+        "createCheckout",
+        this.providerName,
+        {
+          cause: new Error("Failed to create checkout")
+        }
+      );
     }
-    return paykitCheckout$InboundSchema(response.value);
+    return Checkout$inboundSchema(response.value);
   };
   retrieveCheckout = async (id) => {
     const response = await this._client.get(
@@ -4384,11 +4422,15 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       }
     );
     if (!response.ok) {
-      throw new core.OperationFailedError("retrieveCheckout", this.providerName, {
-        cause: new Error("Failed to retrieve checkout")
-      });
+      throw new core.OperationFailedError(
+        "retrieveCheckout",
+        this.providerName,
+        {
+          cause: new Error("Failed to retrieve checkout")
+        }
+      );
     }
-    return paykitCheckout$InboundSchema(response.value);
+    return Checkout$inboundSchema(response.value);
   };
   updateCheckout = async (id, params) => {
     if (this.opts.debug) {
@@ -4406,91 +4448,116 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
     });
   };
   createCustomer = async (params) => {
-    if (this.cloudClient) {
-      return this.cloudClient.customers.create(params);
-    }
     throw new core.ProviderNotSupportedError("createCustomer", "gopay", {
-      reason: "Gopay doesn't support creating customers, use the cloud API instead by setting `cloudApiKey` in the options"
+      reason: "Gopay doesn't support creating customers"
     });
   };
   updateCustomer = async (id, params) => {
-    if (this.cloudClient) {
-      return this.cloudClient.customers.update(id, params);
-    }
     throw new core.ProviderNotSupportedError("updateCustomer", "gopay", {
-      reason: "Gopay doesn't support updating customers, use the cloud API instead by setting `cloudApiKey` in the options"
+      reason: "Gopay doesn't support updating customers"
     });
   };
   deleteCustomer = async (id) => {
-    if (this.cloudClient) {
-      this.cloudClient.customers.delete(id);
-      return null;
-    }
     throw new core.ProviderNotSupportedError("deleteCustomer", "gopay", {
-      reason: "Gopay doesn't support deleting customers, use the cloud API instead by setting `cloudApiKey` in the options"
+      reason: "Gopay doesn't support deleting customers"
     });
   };
   retrieveCustomer = async (id) => {
-    if (this.cloudClient) {
-      return this.cloudClient.customers.retrieve(id);
-    }
     throw new core.ProviderNotSupportedError("retrieveCustomer", "gopay", {
-      reason: "Gopay doesn't support retrieving customers, use the cloud API instead by setting `cloudApiKey` in the options"
+      reason: "Gopay doesn't support retrieving customers"
     });
   };
   createSubscription = async (params) => {
     const { error, data } = core.createSubscriptionSchema.safeParse(params);
-    if (error) throw core.ValidationError.fromZodError(error, "gopay", "createSubscription");
-    if (typeof data.customer == "string" || typeof data.customer === "object" && !data.customer.email) {
-      throw new core.InvalidTypeError("customer", "object (customer) with email", "string", {
-        provider: this.providerName,
-        method: "createCheckout"
-      });
+    if (error)
+      throw core.ValidationError.fromZodError(
+        error,
+        "gopay",
+        "createSubscription"
+      );
+    if (!core.isEmailCustomer(data.customer)) {
+      throw new core.InvalidTypeError(
+        "customer",
+        "object with email",
+        core.isIdCustomer(data.customer) ? "object with id" : typeof data.customer,
+        {
+          provider: this.providerName,
+          method: "createSubscription"
+        }
+      );
     }
     const { success_url } = core.validateRequiredKeys(
       ["success_url"],
       data.provider_metadata,
-      "The following fields must be present in the provider_metadata of createCheckout: {keys}"
+      "The following fields must be present in the provider_metadata of createSubscription: {keys}"
     );
+    const billingInterval = data.billing_interval;
+    const isCustom = typeof billingInterval === "object" && billingInterval.type === "custom";
+    const isYear = billingInterval === "year";
+    const isOnDemand = isCustom || isYear;
+    const intervalMap = {
+      day: "DAY",
+      week: "WEEK",
+      month: "MONTH",
+      year: "ON_DEMAND"
+    };
+    const recurrenceCycle = isCustom ? "ON_DEMAND" : intervalMap[billingInterval];
     if (this.opts.debug) {
-      if (data.billing_interval === "year") {
+      if (isYear) {
         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"
+          "[PayKit/GoPay] GoPay does not support yearly recurrence. Falling back to ON_DEMAND \u2014 you must trigger each charge manually via createRecurrence(parentPaymentId, ...). See: https://doc.gopay.com/#recurring-on-demand"
+        );
+      }
+      if (isCustom) {
+        const durationMs = billingInterval.durationMs;
+        console.info(
+          `[PayKit/GoPay] Custom interval (${durationMs}ms) is not supported by GoPay. Falling back to ON_DEMAND \u2014 trigger charges manually via createRecurrence(parentPaymentId, ...). See: https://doc.gopay.com/#recurring-on-demand`
+        );
+      }
+      if (!isOnDemand) {
+        console.info(
+          `[PayKit/GoPay] AUTO recurrence (${recurrenceCycle}) \u2014 GoPay charges automatically each cycle. No createRecurrence() call is needed. Set provider_metadata.end_date (ISO string, e.g. "2027-01-01") to control when the subscription ends. Defaults to 1 year from today.`
+        );
+      } else {
+        console.info(
+          "[PayKit/GoPay] ON_DEMAND recurrence \u2014 you MUST call createRecurrence(parentPaymentId, ...) for each subsequent charge. GoPay will NOT charge automatically. Set provider_metadata.end_date (ISO string) to control the authorization window. Defaults to 1 year (custom interval) or 5 years (yearly interval)."
         );
       }
       if (!data.provider_metadata?.description) {
         console.info(
-          `No description provided for the subscription \`provider_metadata.description\`, using default description \`Subscription by ${data.customer.email}\``
+          `[PayKit/GoPay] No \`provider_metadata.description\` provided. Using default: "Subscription by ${data.customer.email}"`
         );
       }
     }
-    const intervalMap = {
-      day: "DAY",
-      week: "WEEK",
-      month: "MONTH",
-      year: "ON_DEMAND"
+    const toDateString = (ms) => {
+      const d = new Date(ms);
+      return d.toISOString().split("T")[0];
     };
-    const recurrenceCycle = intervalMap?.[data.billing_interval] ?? "ON_DEMAND";
-    const currentPeriodEnd = (() => {
-      if (recurrenceCycle === "DAY") {
-        return new Date(Date.now() + 1 * 24 * 60 * 60 * 1e3).toISOString();
-      }
-      if (recurrenceCycle === "WEEK") {
-        return new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3).toISOString();
-      }
-      if (recurrenceCycle === "MONTH") {
-        return new Date(Date.now() + 30 * 24 * 60 * 60 * 1e3).toISOString();
+    const GOPAY_MAX_DATE = "2099-12-30";
+    const endDateOverride = data.provider_metadata?.end_date;
+    const recurrenceDateTo = (() => {
+      if (endDateOverride) {
+        return endDateOverride < GOPAY_MAX_DATE ? endDateOverride : GOPAY_MAX_DATE;
       }
       if (recurrenceCycle === "ON_DEMAND") {
-        throw new core.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
-          }
+        if (isCustom) {
+          return toDateString(Date.now() + 365 * 24 * 60 * 60 * 1e3);
+        }
+        return toDateString(
+          Date.now() + 5 * 365 * 24 * 60 * 60 * 1e3
         );
       }
-      throw new Error("Invalid billing interval: " + data.billing_interval);
+      return toDateString(Date.now() + 365 * 24 * 60 * 60 * 1e3);
     })();
+    const recurrencePeriod = data.provider_metadata?.recurrence_period ?? 1;
+    const recurrence = isOnDemand ? {
+      recurrence_cycle: recurrenceCycle,
+      recurrence_date_to: recurrenceDateTo
+    } : {
+      recurrence_cycle: recurrenceCycle,
+      recurrence_period: recurrencePeriod,
+      recurrence_date_to: recurrenceDateTo
+    };
     const goPaySubscriptionOptions = {
       payer: {
         allowed_payment_instruments: ["PAYMENT_CARD"],
@@ -4501,24 +4568,28 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       amount: Number(data.amount),
       currency: data.currency ?? "CZK",
       order_number: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
-      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: data.quantity,
-        recurrence_date_to: currentPeriodEnd
+      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 ?? 1
+        }
+      ],
+      recurrence,
+      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,
         [core.PAYKIT_METADATA_KEY]: JSON.stringify({
           item: data.item_id,
-          qty: data.quantity
+          qty: data.quantity,
+          // Store the original interval so createRecurrence callers know the intended cadence
+          billing_interval: isCustom ? `custom:${billingInterval.durationMs}ms` : billingInterval
         })
-      }).map(([name, value]) => ({
-        name,
-        value: String(value)
-      }))
+      }).map(([name, value]) => ({ name, value: String(value) }))
     };
     const response = await this._client.post(
       "/payments/payment",
@@ -4528,28 +4599,42 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       }
     );
     if (!response.ok) {
-      throw new core.OperationFailedError("createSubscription", this.providerName, {
-        cause: new Error("Failed to create subscription")
-      });
+      throw new core.OperationFailedError(
+        "createSubscription",
+        this.providerName,
+        {
+          cause: new Error(
+            `[PayKit/GoPay] Failed to create subscription. Error: ${response.error}`
+          )
+        }
+      );
     }
-    return paykitSubscription$InboundSchema(response.value);
+    return Subscription$inboundSchema(response.value);
   };
   updateSubscription = async (id, params) => {
     const subscription = await this.retrieveSubscription(id);
     if (!subscription) {
-      throw new core.ProviderNotSupportedError("updateSubscription", this.providerName, {
-        reason: "Gopay doesn't support updating subscriptions",
-        alternative: "Use the payment API instead and update the subscription manually"
-      });
+      throw new core.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 existingSubscription = await this.retrieveSubscription(id);
     if (!existingSubscription) {
-      throw new core.OperationFailedError("cancelSubscription", this.providerName, {
-        cause: new Error("Failed to retrieve subscription")
-      });
+      throw new core.OperationFailedError(
+        "cancelSubscription",
+        this.providerName,
+        {
+          cause: new Error("Failed to retrieve subscription")
+        }
+      );
     }
     const response = await this._client.post(`/payments/payment/${id}/void-recurrence`, {
       headers: {
@@ -4559,7 +4644,9 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
     });
     return {
       ...existingSubscription,
-      ...response.value?.result == "FINISHED" && { status: "canceled" }
+      ...response.value?.result == "FINISHED" && {
+        status: "canceled"
+      }
     };
   };
   deleteSubscription = async (id) => {
@@ -4574,21 +4661,35 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       }
     );
     if (!response.ok) {
-      throw new core.OperationFailedError("retrieveSubscription", this.providerName, {
-        cause: new Error("Failed to retrieve subscription")
-      });
+      throw new core.OperationFailedError(
+        "retrieveSubscription",
+        this.providerName,
+        {
+          cause: new Error("Failed to retrieve subscription")
+        }
+      );
     }
-    return paykitSubscription$InboundSchema(response.value);
+    return Subscription$inboundSchema(response.value);
   };
   createPayment = async (params) => {
     const { error, data } = core.createPaymentSchema.safeParse(params);
-    if (error)
-      throw core.ValidationError.fromZodError(error, this.providerName, "createPayment");
-    if (typeof data.customer == "string" || typeof data.customer === "object" && !data.customer?.email) {
-      throw new core.InvalidTypeError("customer", "object (customer) with email", "string", {
-        provider: this.providerName,
-        method: "createPayment"
-      });
+    if (error) {
+      throw core.ValidationError.fromZodError(
+        error,
+        this.providerName,
+        "createPayment"
+      );
+    }
+    if (!core.isEmailCustomer(data.customer)) {
+      throw new core.InvalidTypeError(
+        "customer",
+        "object with email",
+        core.isIdCustomer(data.customer) ? "object with id" : typeof data.customer,
+        {
+          provider: this.providerName,
+          method: "createPayment"
+        }
+      );
     }
     if (!data.item_id) {
       throw new core.ConfigurationError(
@@ -4599,23 +4700,54 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         }
       );
     }
+    const successUrl = data.provider_metadata?.success_url;
+    if (!successUrl) {
+      throw new core.ConfigurationError(
+        "success_url is required, this is the URL to redirect the user to the success page after the payment is successful",
+        {
+          provider: this.providerName,
+          missingKeys: ["success_url"]
+        }
+      );
+    }
     const goPayRequest = {
       payer: {
         allowed_payment_instruments: ["PAYMENT_CARD", "BANK_ACCOUNT"],
         default_payment_instrument: "PAYMENT_CARD",
-        contact: { email: data.customer.email }
+        contact: { email: data.customer.email },
+        ...data.billing && {
+          city: data.billing.address.city,
+          postal_code: data.billing.address.postal_code,
+          country_code: data.billing.address.country,
+          phone_number: data.billing.address.phone
+        }
       },
       target: { type: "ACCOUNT", goid: parseInt(this.opts.goId) },
-      amount: data.amount,
+      amount: Number(data.amount),
       currency: data.currency ?? "CZK",
       order_number: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
       order_description: `Payment for ${data.item_id} by ${data.customer.email}`,
-      items: [{ name: data.item_id, amount: data.amount, count: 1 }],
+      items: [
+        {
+          name: data.item_id,
+          amount: data.amount,
+          count: 1,
+          type: "ITEM"
+        }
+      ],
+      lang: data.provider_metadata?.language ? data.provider_metadata.language : "EN",
+      callback: {
+        return_url: successUrl,
+        notification_url: this.opts.webhookUrl
+      },
       preauthorization: false,
       // automatically captures the payment
       additional_params: Object.entries({
         ...data.metadata,
-        [core.PAYKIT_METADATA_KEY]: JSON.stringify({ itemId: data.item_id, qty: 1 })
+        [core.PAYKIT_METADATA_KEY]: JSON.stringify({
+          itemId: data.item_id,
+          qty: 1
+        })
       }).map(([name, value]) => ({
         name,
         value: String(value)
@@ -4629,11 +4761,17 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       }
     );
     if (!response.ok) {
-      throw new core.OperationFailedError("createPayment", this.providerName, {
-        cause: new Error("Failed to create payment")
-      });
+      throw new core.OperationFailedError(
+        "createPayment",
+        this.providerName,
+        {
+          cause: new Error(
+            `Failed to create payment: ${JSON.stringify(response.error ?? response)}`
+          )
+        }
+      );
     }
-    return paykitPayment$InboundSchema(response.value);
+    return Payment$inboundSchema(response.value);
   };
   retrievePayment = async (id) => {
     const response = await this._client.get(
@@ -4646,17 +4784,25 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       }
     );
     if (!response.ok) {
-      throw new core.OperationFailedError("retrievePayment", this.providerName, {
-        cause: new Error("Failed to retrieve payment")
-      });
+      throw new core.OperationFailedError(
+        "retrievePayment",
+        this.providerName,
+        {
+          cause: new Error("Failed to retrieve payment")
+        }
+      );
     }
-    return paykitPayment$InboundSchema(response.value);
+    return Payment$inboundSchema(response.value);
   };
   deletePayment = async (id) => {
-    throw new core.ProviderNotSupportedError("deletePayment", this.providerName, {
-      reason: "GoPay does not support deleting payments, use the",
-      alternative: "Use createRefund() instead to refund payments"
-    });
+    throw new core.ProviderNotSupportedError(
+      "deletePayment",
+      this.providerName,
+      {
+        reason: "GoPay does not support deleting payments, use the",
+        alternative: "Use createRefund() instead to refund payments"
+      }
+    );
   };
   capturePayment = async (id, params) => {
     const payment = await this._client.get(
@@ -4664,32 +4810,39 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       { headers: await this.tokenManager.getAuthHeaders() }
     );
     if (!payment.ok) {
-      throw new core.OperationFailedError("capturePayment", this.providerName, {
-        cause: new Error("Failed to retrieve payment")
-      });
+      throw new core.OperationFailedError(
+        "capturePayment",
+        this.providerName,
+        {
+          cause: new Error("Failed to retrieve payment")
+        }
+      );
     }
     const { item, qty } = JSON.parse(
       decodeHtmlEntities(
-        payment.value.additional_params?.find((param) => param.name === core.PAYKIT_METADATA_KEY)?.value ?? "{}"
+        payment.value.additional_params?.find(
+          (param) => param.name === core.PAYKIT_METADATA_KEY
+        )?.value ?? "{}"
       )
     );
     if (!payment) {
-      throw new core.OperationFailedError("capturePayment", this.providerName, {
-        cause: new Error("Payment not found after capture")
-      });
+      throw new core.OperationFailedError(
+        "capturePayment",
+        this.providerName,
+        {
+          cause: new Error("Payment not found after capture")
+        }
+      );
     }
     const captureBody = {
       amount: params.amount,
       items: [{ name: item, amount: params.amount, count: qty }]
     };
-    await this._client.post(
-      `/payments/payment/${id}/capture`,
-      {
-        body: JSON.stringify(captureBody),
-        headers: await this.tokenManager.getAuthHeaders()
-      }
-    );
-    return paykitPayment$InboundSchema(payment.value);
+    await this._client.post(`/payments/payment/${id}/capture`, {
+      body: JSON.stringify(captureBody),
+      headers: await this.tokenManager.getAuthHeaders()
+    });
+    return Payment$inboundSchema(payment.value);
   };
   cancelPayment = async (id) => {
     await this._client.post(
@@ -4698,9 +4851,13 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
     );
     const payment = await this.retrievePayment(id);
     if (!payment) {
-      throw new core.OperationFailedError("cancelPayment", this.providerName, {
-        cause: new Error("Payment not found after cancellation")
-      });
+      throw new core.OperationFailedError(
+        "cancelPayment",
+        this.providerName,
+        {
+          cause: new Error("Payment not found after cancellation")
+        }
+      );
     }
     return payment;
   };
@@ -4711,34 +4868,52 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
     console.info("Gopay doesn't support updating payments");
     const existing = await this.retrievePayment(id);
     if (!existing) {
-      throw new core.OperationFailedError("updatePayment", this.providerName, {
-        cause: new Error("Failed to retrieve payment")
-      });
+      throw new core.OperationFailedError(
+        "updatePayment",
+        this.providerName,
+        {
+          cause: new Error("Failed to retrieve payment")
+        }
+      );
     }
     return existing;
   };
   async createRefund(params) {
     const { error, data } = core.createRefundSchema.safeParse(params);
     if (error) {
-      throw core.ValidationError.fromZodError(error, this.providerName, "createRefund");
+      throw core.ValidationError.fromZodError(
+        error,
+        this.providerName,
+        "createRefund"
+      );
     }
     const payment = await this.retrievePayment(data.payment_id);
     if (!payment) {
-      throw new core.OperationFailedError("createRefund", this.providerName, {
-        cause: new Error("Failed to retrieve payment")
-      });
+      throw new core.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(),
+      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 core.OperationFailedError("createRefund", this.providerName, {
-        cause: new Error("Failed to create refund")
-      });
+      throw new core.OperationFailedError(
+        "createRefund",
+        this.providerName,
+        {
+          cause: new Error("Failed to create refund")
+        }
+      );
     }
     return {
       id: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
@@ -4748,23 +4923,28 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       metadata: data.metadata
     };
   }
-  handleWebhook = async (payload) => {
+  handleWebhook = async (payload, webhookSecret) => {
     const { fullUrl } = payload;
     const paymentId = new URL(fullUrl).searchParams.get("id");
     const parentId = new URL(fullUrl).searchParams.get("parent_id");
     if (!paymentId) {
-      throw new core.WebhookError("Payment ID is required", { provider: this.providerName });
+      throw new core.WebhookError("Payment ID is required", {
+        provider: this.providerName
+      });
     }
     if (this.opts.debug) {
       console.info("Received GoPay webhook for payment:", paymentId);
     }
     const [payment, error] = await core.tryCatchAsync(
-      this._client.get(`/payments/payment/${paymentId}`, {
-        headers: {
-          ...await this.tokenManager.getAuthHeaders(),
-          "Content-Type": "application/x-www-form-urlencoded"
+      this._client.get(
+        `/payments/payment/${paymentId}`,
+        {
+          headers: {
+            ...await this.tokenManager.getAuthHeaders(),
+            "Content-Type": "application/x-www-form-urlencoded"
+          }
         }
-      })
+      )
     );
     if (error) {
       throw new core.WebhookError("Failed to retrieve payment", {
@@ -4772,10 +4952,15 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       });
     }
     if (!payment.value) {
-      throw new core.WebhookError("Payment not found", { provider: this.providerName });
+      throw new core.WebhookError("Payment not found", {
+        provider: this.providerName
+      });
     }
     if (this.opts.debug) {
-      console.info("Webhook verified successfully, status:", payment.value.state);
+      console.info(
+        "Webhook verified successfully, status:",
+        payment.value.state
+      );
     }
     const statusMap = {
       CREATED: "pending",
@@ -4794,7 +4979,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
       __INDETERMINATE: (data) => {
         const isRefundEvent = data.state === "REFUNDED" || data.state === "PARTIALLY_REFUNDED";
         if (isRefundEvent) {
-          const refund = paykitRefund$InboundSchema(data);
+          const refund = Refund$inboundSchema(data);
           return [
             core.paykitEvent$InboundSchema({
               type: "refund.created",
@@ -4807,7 +4992,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         return [];
       },
       pending: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
+        const payment2 = Payment$inboundSchema(data);
         return [
           core.paykitEvent$InboundSchema({
             type: "payment.created",
@@ -4818,7 +5003,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         ];
       },
       processing: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
+        const payment2 = Payment$inboundSchema(data);
         return [
           core.paykitEvent$InboundSchema({
             type: "payment.updated",
@@ -4829,7 +5014,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         ];
       },
       requires_capture: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
+        const payment2 = Payment$inboundSchema(data);
         return [
           core.paykitEvent$InboundSchema({
             type: "payment.updated",
@@ -4840,9 +5025,9 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         ];
       },
       canceled: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
+        const payment2 = Payment$inboundSchema(data);
         const isCancellingSubscription = parentId && data.recurrence?.recurrence_state == "STOPPED";
-        const subscription = paykitSubscription$InboundSchema(
+        const subscription = Subscription$inboundSchema(
           data
         );
         const subscriptionCanceledWebhookEvent = {
@@ -4852,9 +5037,13 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
           data: subscription
         };
         return [
-          ...isCancellingSubscription ? [core.paykitEvent$InboundSchema(subscriptionCanceledWebhookEvent)] : [],
+          ...isCancellingSubscription ? [
+            core.paykitEvent$InboundSchema(
+              subscriptionCanceledWebhookEvent
+            )
+          ] : [],
           core.paykitEvent$InboundSchema({
-            type: "payment.canceled",
+            type: "payment.failed",
             created: (/* @__PURE__ */ new Date()).getTime(),
             id: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
             data: payment2
@@ -4862,10 +5051,10 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         ];
       },
       failed: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
+        const payment2 = Payment$inboundSchema(data);
         return [
           core.paykitEvent$InboundSchema({
-            type: "payment.canceled",
+            type: "payment.failed",
             created: (/* @__PURE__ */ new Date()).getTime(),
             id: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
             data: payment2
@@ -4873,9 +5062,9 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         ];
       },
       succeeded: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
-        const invoice = paykitInvoice$InboundSchema(data, !!parentId);
-        const subscription = paykitSubscription$InboundSchema(
+        const payment2 = Payment$inboundSchema(data);
+        const invoice = Invoice$inboundSchema(data, !!parentId);
+        const subscription = Subscription$inboundSchema(
           data
         );
         const subscriptionCreatedWebhookEvent = {
@@ -4885,7 +5074,11 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
           data: subscription
         };
         return [
-          ...parentId ? [core.paykitEvent$InboundSchema(subscriptionCreatedWebhookEvent)] : [],
+          ...parentId ? [
+            core.paykitEvent$InboundSchema(
+              subscriptionCreatedWebhookEvent
+            )
+          ] : [],
           core.paykitEvent$InboundSchema({
             type: "invoice.generated",
             created: (/* @__PURE__ */ new Date()).getTime(),
@@ -4893,7 +5086,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
             data: invoice
           }),
           core.paykitEvent$InboundSchema({
-            type: "payment.created",
+            type: "payment.succeeded",
             created: (/* @__PURE__ */ new Date()).getTime(),
             id: crypto__namespace.randomBytes(8).toString("hex").slice(0, 15),
             data: payment2
@@ -4901,7 +5094,7 @@ var GoPayProvider = class extends core.AbstractPayKitProvider {
         ];
       },
       requires_action: (data) => {
-        const payment2 = paykitPayment$InboundSchema(data);
+        const payment2 = Payment$inboundSchema(data);
         return [
           core.paykitEvent$InboundSchema({
             type: "payment.updated",
@@ -4937,10 +5130,9 @@ var gopay = () => {
       "GOPAY_CLIENT_SECRET",
       "GOPAY_GO_ID",
       "GOPAY_SANDBOX",
-      "GOPAY_WEBHOOK_URL",
-      "PAYKIT_CLOUD_API_KEY"
+      "GOPAY_WEBHOOK_URL"
     ],
-    process.env ?? { PAYKIT_CLOUD_API_KEY: "" },
+    process.env ?? {},
     "Missing required environment variables: {keys}"
   );
   return createGopay({
@@ -4949,7 +5141,6 @@ var gopay = () => {
     goId: envVars.GOPAY_GO_ID,
     isSandbox: envVars.GOPAY_SANDBOX === "true",
     webhookUrl: envVars.GOPAY_WEBHOOK_URL,
-    cloudApiKey: envVars.PAYKIT_CLOUD_API_KEY,
     debug: true
   });
 };