@doujins/payments-ui 0.1.3 → 0.1.5

package/dist/index.cjs

@@ -99,7 +99,7 @@ var ClientApiError = class extends Error {
     this.request = request;
   }
 };
-var ensureFetch = (fetchImpl) => {
+var getFetchFn = (fetchImpl) => {
   if (fetchImpl) return fetchImpl;
   if (typeof globalThis.fetch === "function") {
     return globalThis.fetch.bind(globalThis);
@@ -107,12 +107,7 @@ var ensureFetch = (fetchImpl) => {
   throw new Error("payments-ui: global fetch is not available");
 };
 var createClient = (config) => {
-  const fetchImpl = ensureFetch(config.fetch);
-  const normalizeBase = (value) => value.replace(/\/$/, "");
-  const billingBaseUrl = normalizeBase(config.billingBaseUrl);
-  const accountBaseUrl = normalizeBase(
-    config.accountBaseUrl ?? config.billingBaseUrl
-  );
+  const fetchImpl = getFetchFn(config.fetch);
   const defaultHeaders = config.defaultHeaders ?? {};
   const resolveAuthToken = async () => {
     if (!config.getAuthToken) return null;
@@ -124,10 +119,10 @@ var createClient = (config) => {
       return null;
     }
   };
-  const buildUrl = (path, query, target) => {
-    const normalizedPath = path.startsWith("/") ? path : `/${path}`;
-    const baseUrl = target === "account" ? accountBaseUrl : billingBaseUrl;
-    const url = new URL(`${baseUrl}${normalizedPath}`);
+  const buildUrl = (path, query) => {
+    path = path.replace(/^\/+|\/+$/g, "");
+    const baseUrl = config.baseUrl.replace(/^\/+|\/+$/g, "");
+    const url = new URL(`${baseUrl}${path.endsWith("v1") ? "/" : "/v1/"}${path}`);
     if (query) {
       Object.entries(query).forEach(([key, value]) => {
         if (value === void 0 || value === null) return;
@@ -137,8 +132,7 @@ var createClient = (config) => {
     return url.toString();
   };
   const request = async (method, path, options) => {
-    const target = options?.target ?? "billing";
-    const url = buildUrl(path, options?.query, target);
+    const url = buildUrl(path, options?.query);
     const headers = {
       "Content-Type": "application/json",
       ...defaultHeaders,
@@ -184,52 +178,49 @@ var createClient = (config) => {
     async listPaymentMethods(params) {
       const result = await request(
         "GET",
-        "/v1/me/payment-methods",
+        "/me/payment-methods",
         {
           query: {
             limit: params?.limit,
             offset: params?.offset,
             include_inactive: params?.includeInactive
-          },
-          target: "account"
+          }
         }
       );
       return normalizeList(result);
     },
     createPaymentMethod(payload) {
-      return request("POST", "/v1/me/payment-methods", {
-        body: payload,
-        target: "account"
+      return request("POST", "/me/payment-methods", {
+        body: payload
       });
     },
     updatePaymentMethod(id, payload) {
       return request("PUT", `/me/payment-methods/${id}`, {
-        body: payload,
-        target: "account"
+        body: payload
       });
     },
     deletePaymentMethod(id) {
-      return request("DELETE", `/me/payment-methods/${id}`, {
-        target: "account"
-      });
+      return request("DELETE", `/me/payment-methods/${id}`, {});
     },
     activatePaymentMethod(id) {
-      return request("PUT", `/me/payment-methods/${id}/activate`, {
-        target: "account"
-      });
+      return request("PUT", `/me/payment-methods/${id}/activate`, {});
     },
-    checkout(payload) {
-      return request("POST", "/v1/me/checkout", {
-        body: payload
+    checkout(payload, idempotencyKey) {
+      const key = idempotencyKey ?? crypto.randomUUID();
+      return request("POST", "/me/checkout", {
+        body: payload,
+        headers: {
+          "Idempotency-Key": key
+        }
       });
     },
     cancelSubscription(feedback) {
-      return request("POST", "/v1/me/subscriptions/cancel", {
+      return request("POST", "/me/subscriptions/cancel", {
         body: feedback ? { feedback } : void 0
       });
     },
     async getPaymentHistory(params) {
-      const result = await request("GET", "/v1/me/payments", {
+      const result = await request("GET", "/me/payments", {
         query: {
           limit: params?.limit,
           offset: params?.offset,
@@ -241,7 +232,7 @@ var createClient = (config) => {
     async getSolanaTokens() {
       const response = await request(
         "GET",
-        "/v1/solana/tokens"
+        "/solana/tokens"
       );
       if (Array.isArray(response)) {
         return response;
@@ -249,7 +240,7 @@ var createClient = (config) => {
       return response.tokens ?? [];
     },
     async createSolanaPayIntent(payload) {
-      const response = await request("POST", "/v1/solana/pay", {
+      const response = await request("POST", "/solana/pay", {
         body: {
           price_id: payload.priceId,
           token: payload.token,
@@ -2079,7 +2070,8 @@ var useSubscriptionActions = () => {
       processor = "nmi",
       provider,
       paymentToken,
-      billing
+      billing,
+      idempotencyKey
     }) => {
       const payload = {
         price_id: ensurePrice(priceId),
@@ -2095,7 +2087,7 @@ var useSubscriptionActions = () => {
         zip: billing.postalCode,
         country: billing.country
       };
-      return client.checkout(payload);
+      return client.checkout(payload, idempotencyKey);
     },
     [client]
   );
@@ -2105,7 +2097,8 @@ var useSubscriptionActions = () => {
       processor = "nmi",
       provider,
       paymentMethodId,
-      email
+      email,
+      idempotencyKey
     }) => {
       const payload = {
         price_id: ensurePrice(priceId),
@@ -2114,7 +2107,7 @@ var useSubscriptionActions = () => {
         payment_method_id: paymentMethodId,
         email
       };
-      return client.checkout(payload);
+      return client.checkout(payload, idempotencyKey);
     },
     [client]
   );
@@ -2126,7 +2119,8 @@ var useSubscriptionActions = () => {
       lastName,
       zipCode,
       country,
-      processor = "ccbill"
+      processor = "ccbill",
+      idempotencyKey
     }) => {
       const payload = {
         price_id: ensurePrice(priceId),
@@ -2137,7 +2131,7 @@ var useSubscriptionActions = () => {
         zip: zipCode,
         country
       };
-      return client.checkout(payload);
+      return client.checkout(payload, idempotencyKey);
     },
     [client]
   );
@@ -2164,7 +2158,13 @@ var SubscriptionCheckoutModal = ({
   initialMode = "cards"
 }) => {
   const [showSuccess, setShowSuccess] = React17.useState(false);
+  const [idempotencyKey, setIdempotencyKey] = React17.useState(() => crypto.randomUUID());
   const { subscribeWithCard, subscribeWithSavedMethod } = useSubscriptionActions();
+  React17.useEffect(() => {
+    if (open) {
+      setIdempotencyKey(crypto.randomUUID());
+    }
+  }, [open, priceId]);
   const handleClose = React17.useCallback(
     (nextOpen) => {
       onOpenChange(nextOpen);
@@ -2196,7 +2196,8 @@ var SubscriptionCheckoutModal = ({
       priceId: ensurePrice(),
       provider,
       paymentToken: token,
-      billing
+      billing,
+      idempotencyKey
     });
     assertCheckoutSuccess(response.status, response.message);
     notifySuccess();
@@ -2206,7 +2207,8 @@ var SubscriptionCheckoutModal = ({
       priceId: ensurePrice(),
       provider,
       paymentMethodId,
-      email: userEmail ?? ""
+      email: userEmail ?? "",
+      idempotencyKey
     });
     assertCheckoutSuccess(response.status, response.message);
     notifySuccess();
@@ -2436,11 +2438,10 @@ var PaymentProvider = ({
       return config.fetcher(normalizedInput, init);
     }) : void 0;
     return createClient({
-      billingBaseUrl: config.endpoints.billingBaseUrl,
-      accountBaseUrl: config.endpoints.accountBaseUrl,
+      fetch: wrappedFetch,
+      baseUrl: config.baseUrl,
       getAuthToken: authProvider,
-      defaultHeaders: config.defaultHeaders,
-      fetch: wrappedFetch
+      defaultHeaders: config.defaultHeaders
     });
   }, [config]);
   const solanaEndpoint = React17.useMemo(() => {