@paykit-sdk/medusajs 1.0.8 → 1.0.10

package/README.md

@@ -20,16 +20,23 @@ Configure in `medusa-config.ts`:
 
 ```typescript
 import { defineConfig } from '@medusajs/framework/utils';
-import { createStripe } from '@paykit-sdk/stripe';
+import { stripe } from '@paykit-sdk/stripe';
 
 export default defineConfig({
   modules: [
     {
-      resolve: '@paykit-sdk/medusajs',
+      resolve: '@medusajs/payment',
       options: {
-        provider: createStripe({ apiKey: process.env.STRIPE_API_KEY }),
-        webhookSecret: process.env.STRIPE_WEBHOOK_SECRET,
-        debug: process.env.NODE_ENV === 'development',
+        providers: [
+          {
+            resolve: '@paykit-sdk/medusajs',
+            options: {
+              provider: stripe(),
+              webhookSecret: process.env.STRIPE_WEBHOOK_SECRET,
+              debug: process.env.NODE_ENV === 'development',
+            },
+          },
+        ],
       },
     },
   ],

package/dist/index.d.mts

@@ -1,13 +1,10 @@
 import * as _medusajs_types from '@medusajs/types';
-import { PaykitMedusaJSAdapter } from './providers/paykit-provider.mjs';
-export { PaykitMedusaJSAdapterOptions } from './providers/paykit-provider.mjs';
+export { PaykitMedusaJSAdapter, PaykitMedusaJSAdapterOptions } from './providers/paykit-provider.mjs';
 import '@medusajs/framework/types';
 import '@medusajs/framework/utils';
 import '@paykit-sdk/core';
 import 'zod';
 
-declare const _default: _medusajs_types.ModuleExports<typeof PaykitMedusaJSAdapter> & {
-    linkable: Record<string, any>;
-};
+declare const _default: _medusajs_types.ModuleProviderExports;
 
-export { PaykitMedusaJSAdapter, _default as default };
+export { _default as default };

package/dist/index.d.ts

@@ -1,13 +1,10 @@
 import * as _medusajs_types from '@medusajs/types';
-import { PaykitMedusaJSAdapter } from './providers/paykit-provider.js';
-export { PaykitMedusaJSAdapterOptions } from './providers/paykit-provider.js';
+export { PaykitMedusaJSAdapter, PaykitMedusaJSAdapterOptions } from './providers/paykit-provider.js';
 import '@medusajs/framework/types';
 import '@medusajs/framework/utils';
 import '@paykit-sdk/core';
 import 'zod';
 
-declare const _default: _medusajs_types.ModuleExports<typeof PaykitMedusaJSAdapter> & {
-    linkable: Record<string, any>;
-};
+declare const _default: _medusajs_types.ModuleProviderExports;
 
-export { PaykitMedusaJSAdapter, _default as default };
+export { _default as default };

package/dist/index.js

@@ -101,7 +101,8 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
     let customer;
     if (context?.account_holder?.data?.id) {
       customer = context.account_holder.data.id;
-    } else if (data?.email) {
+    }
+    if (data?.email) {
       customer = { email: data.email };
     }
     if (!customer) {
@@ -112,7 +113,7 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
     }
     if (typeof customer === "object" && "email" in customer) {
       const customerName = data?.name ? data.name : customer.email.split("@")[0];
-      await core.tryCatchAsync(
+      const [createdCustomer, createError] = await core.tryCatchAsync(
         this.paykit.customers.create({
           email: customer.email,
           phone: data?.phone ?? "",
@@ -122,6 +123,22 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
           }
         })
       );
+      if (createError) {
+        if (createError.name === "ProviderNotSupportedError") {
+          if (this.options.debug) {
+            console.info(
+              `[PayKit] Provider ${this.provider.providerName} doesn't support customer creation, using email object`
+            );
+          }
+        } else {
+          throw new utils.MedusaError(
+            utils.MedusaError.Types.PAYMENT_AUTHORIZATION_ERROR,
+            `Failed to create customer: ${createError.message}`
+          );
+        }
+      } else {
+        customer = createdCustomer.id;
+      }
     } else {
       customer = customer;
     }
@@ -306,24 +323,7 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
       console.info("[PayKit] Getting webhook action and data", payload);
     }
     const { rawData, headers } = payload;
-    const fullUrl = (() => {
-      if (headers["origin"]) {
-        return headers["origin"];
-      }
-      if (headers["x-forwarded-host"]) {
-        const protocol = headers["x-forwarded-proto"] || "https";
-        const host = headers["x-forwarded-host"];
-        const path = headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      if (headers["host"]) {
-        const protocol = headers["x-forwarded-proto"] || (String(headers["host"]).includes("localhost") ? "http" : "https");
-        const host = headers["host"];
-        const path = headers["x-original-url"] || headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      return "";
-    })();
+    const bodyString = Buffer.isBuffer(rawData) ? rawData.toString("utf8") : rawData;
     const webhook = this.paykit.webhooks.setup({ webhookSecret: this.options.webhookSecret }).on("payment.created", async (event) => {
       return {
         action: utils.PaymentActions.PENDING,
@@ -362,17 +362,17 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
       Object.entries(headers).map(([key, value]) => [key, String(value)])
     );
     const webhookEvents = await webhook.handle({
-      body: rawData,
+      body: bodyString,
       headers: new Headers(stringifiedHeaders),
-      fullUrl
+      fullUrl: core.getURLFromHeaders(stringifiedHeaders)
     });
     return webhookEvents;
   };
 };
 
 // src/index.ts
-var index_default = utils.Module(utils.Modules.PAYMENT, {
-  service: PaykitMedusaJSAdapter
+var index_default = utils.ModuleProvider(utils.Modules.PAYMENT, {
+  services: [PaykitMedusaJSAdapter]
 });
 
 exports.PaykitMedusaJSAdapter = PaykitMedusaJSAdapter;

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { Module, Modules, AbstractPaymentProvider, MedusaError, PaymentSessionStatus, PaymentActions } from '@medusajs/framework/utils';
-import { providerSchema, PayKit, tryCatchAsync, validateRequiredKeys, stringifyMetadataValues } from '@paykit-sdk/core';
+import { ModuleProvider, Modules, AbstractPaymentProvider, MedusaError, PaymentSessionStatus, PaymentActions } from '@medusajs/framework/utils';
+import { providerSchema, PayKit, tryCatchAsync, validateRequiredKeys, stringifyMetadataValues, getURLFromHeaders } from '@paykit-sdk/core';
 import { z } from 'zod';
 
 // src/index.ts
@@ -97,7 +97,8 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
     let customer;
     if (context?.account_holder?.data?.id) {
       customer = context.account_holder.data.id;
-    } else if (data?.email) {
+    }
+    if (data?.email) {
       customer = { email: data.email };
     }
     if (!customer) {
@@ -108,7 +109,7 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
     }
     if (typeof customer === "object" && "email" in customer) {
       const customerName = data?.name ? data.name : customer.email.split("@")[0];
-      await tryCatchAsync(
+      const [createdCustomer, createError] = await tryCatchAsync(
         this.paykit.customers.create({
           email: customer.email,
           phone: data?.phone ?? "",
@@ -118,6 +119,22 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
           }
         })
       );
+      if (createError) {
+        if (createError.name === "ProviderNotSupportedError") {
+          if (this.options.debug) {
+            console.info(
+              `[PayKit] Provider ${this.provider.providerName} doesn't support customer creation, using email object`
+            );
+          }
+        } else {
+          throw new MedusaError(
+            MedusaError.Types.PAYMENT_AUTHORIZATION_ERROR,
+            `Failed to create customer: ${createError.message}`
+          );
+        }
+      } else {
+        customer = createdCustomer.id;
+      }
     } else {
       customer = customer;
     }
@@ -302,24 +319,7 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
       console.info("[PayKit] Getting webhook action and data", payload);
     }
     const { rawData, headers } = payload;
-    const fullUrl = (() => {
-      if (headers["origin"]) {
-        return headers["origin"];
-      }
-      if (headers["x-forwarded-host"]) {
-        const protocol = headers["x-forwarded-proto"] || "https";
-        const host = headers["x-forwarded-host"];
-        const path = headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      if (headers["host"]) {
-        const protocol = headers["x-forwarded-proto"] || (String(headers["host"]).includes("localhost") ? "http" : "https");
-        const host = headers["host"];
-        const path = headers["x-original-url"] || headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      return "";
-    })();
+    const bodyString = Buffer.isBuffer(rawData) ? rawData.toString("utf8") : rawData;
     const webhook = this.paykit.webhooks.setup({ webhookSecret: this.options.webhookSecret }).on("payment.created", async (event) => {
       return {
         action: PaymentActions.PENDING,
@@ -358,17 +358,17 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
       Object.entries(headers).map(([key, value]) => [key, String(value)])
     );
     const webhookEvents = await webhook.handle({
-      body: rawData,
+      body: bodyString,
       headers: new Headers(stringifiedHeaders),
-      fullUrl
+      fullUrl: getURLFromHeaders(stringifiedHeaders)
     });
     return webhookEvents;
   };
 };
 
 // src/index.ts
-var index_default = Module(Modules.PAYMENT, {
-  service: PaykitMedusaJSAdapter
+var index_default = ModuleProvider(Modules.PAYMENT, {
+  services: [PaykitMedusaJSAdapter]
 });
 
 export { PaykitMedusaJSAdapter, index_default as default };

package/dist/providers/paykit-provider.js

@@ -99,7 +99,8 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
     let customer;
     if (context?.account_holder?.data?.id) {
       customer = context.account_holder.data.id;
-    } else if (data?.email) {
+    }
+    if (data?.email) {
       customer = { email: data.email };
     }
     if (!customer) {
@@ -110,7 +111,7 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
     }
     if (typeof customer === "object" && "email" in customer) {
       const customerName = data?.name ? data.name : customer.email.split("@")[0];
-      await core.tryCatchAsync(
+      const [createdCustomer, createError] = await core.tryCatchAsync(
         this.paykit.customers.create({
           email: customer.email,
           phone: data?.phone ?? "",
@@ -120,6 +121,22 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
           }
         })
       );
+      if (createError) {
+        if (createError.name === "ProviderNotSupportedError") {
+          if (this.options.debug) {
+            console.info(
+              `[PayKit] Provider ${this.provider.providerName} doesn't support customer creation, using email object`
+            );
+          }
+        } else {
+          throw new utils.MedusaError(
+            utils.MedusaError.Types.PAYMENT_AUTHORIZATION_ERROR,
+            `Failed to create customer: ${createError.message}`
+          );
+        }
+      } else {
+        customer = createdCustomer.id;
+      }
     } else {
       customer = customer;
     }
@@ -304,24 +321,7 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
       console.info("[PayKit] Getting webhook action and data", payload);
     }
     const { rawData, headers } = payload;
-    const fullUrl = (() => {
-      if (headers["origin"]) {
-        return headers["origin"];
-      }
-      if (headers["x-forwarded-host"]) {
-        const protocol = headers["x-forwarded-proto"] || "https";
-        const host = headers["x-forwarded-host"];
-        const path = headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      if (headers["host"]) {
-        const protocol = headers["x-forwarded-proto"] || (String(headers["host"]).includes("localhost") ? "http" : "https");
-        const host = headers["host"];
-        const path = headers["x-original-url"] || headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      return "";
-    })();
+    const bodyString = Buffer.isBuffer(rawData) ? rawData.toString("utf8") : rawData;
     const webhook = this.paykit.webhooks.setup({ webhookSecret: this.options.webhookSecret }).on("payment.created", async (event) => {
       return {
         action: utils.PaymentActions.PENDING,
@@ -360,9 +360,9 @@ var PaykitMedusaJSAdapter = class extends utils.AbstractPaymentProvider {
       Object.entries(headers).map(([key, value]) => [key, String(value)])
     );
     const webhookEvents = await webhook.handle({
-      body: rawData,
+      body: bodyString,
       headers: new Headers(stringifiedHeaders),
-      fullUrl
+      fullUrl: core.getURLFromHeaders(stringifiedHeaders)
     });
     return webhookEvents;
   };

package/dist/providers/paykit-provider.mjs

@@ -1,5 +1,5 @@
 import { AbstractPaymentProvider, MedusaError, PaymentSessionStatus, PaymentActions } from '@medusajs/framework/utils';
-import { providerSchema, PayKit, tryCatchAsync, validateRequiredKeys, stringifyMetadataValues } from '@paykit-sdk/core';
+import { providerSchema, PayKit, tryCatchAsync, validateRequiredKeys, stringifyMetadataValues, getURLFromHeaders } from '@paykit-sdk/core';
 import { z } from 'zod';
 
 // src/providers/paykit-provider.ts
@@ -97,7 +97,8 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
     let customer;
     if (context?.account_holder?.data?.id) {
       customer = context.account_holder.data.id;
-    } else if (data?.email) {
+    }
+    if (data?.email) {
       customer = { email: data.email };
     }
     if (!customer) {
@@ -108,7 +109,7 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
     }
     if (typeof customer === "object" && "email" in customer) {
       const customerName = data?.name ? data.name : customer.email.split("@")[0];
-      await tryCatchAsync(
+      const [createdCustomer, createError] = await tryCatchAsync(
         this.paykit.customers.create({
           email: customer.email,
           phone: data?.phone ?? "",
@@ -118,6 +119,22 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
           }
         })
       );
+      if (createError) {
+        if (createError.name === "ProviderNotSupportedError") {
+          if (this.options.debug) {
+            console.info(
+              `[PayKit] Provider ${this.provider.providerName} doesn't support customer creation, using email object`
+            );
+          }
+        } else {
+          throw new MedusaError(
+            MedusaError.Types.PAYMENT_AUTHORIZATION_ERROR,
+            `Failed to create customer: ${createError.message}`
+          );
+        }
+      } else {
+        customer = createdCustomer.id;
+      }
     } else {
       customer = customer;
     }
@@ -302,24 +319,7 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
       console.info("[PayKit] Getting webhook action and data", payload);
     }
     const { rawData, headers } = payload;
-    const fullUrl = (() => {
-      if (headers["origin"]) {
-        return headers["origin"];
-      }
-      if (headers["x-forwarded-host"]) {
-        const protocol = headers["x-forwarded-proto"] || "https";
-        const host = headers["x-forwarded-host"];
-        const path = headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      if (headers["host"]) {
-        const protocol = headers["x-forwarded-proto"] || (String(headers["host"]).includes("localhost") ? "http" : "https");
-        const host = headers["host"];
-        const path = headers["x-original-url"] || headers["x-forwarded-path"] || "";
-        return `${protocol}://${host}${path}`;
-      }
-      return "";
-    })();
+    const bodyString = Buffer.isBuffer(rawData) ? rawData.toString("utf8") : rawData;
     const webhook = this.paykit.webhooks.setup({ webhookSecret: this.options.webhookSecret }).on("payment.created", async (event) => {
       return {
         action: PaymentActions.PENDING,
@@ -358,9 +358,9 @@ var PaykitMedusaJSAdapter = class extends AbstractPaymentProvider {
       Object.entries(headers).map(([key, value]) => [key, String(value)])
     );
     const webhookEvents = await webhook.handle({
-      body: rawData,
+      body: bodyString,
       headers: new Headers(stringifiedHeaders),
-      fullUrl
+      fullUrl: getURLFromHeaders(stringifiedHeaders)
     });
     return webhookEvents;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paykit-sdk/medusajs",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "MedusaJS Integrations for Paykit",
   "main": "dist/index.js",
   "module": "dist/index.mjs",