@easypayment/medusa-paypal 0.6.3 → 0.6.4

package/README.md

@@ -1,153 +1,157 @@
-<div align="center">
-
-<h1>🅿 medusa-paypal-backend</h1>
-
-<p><strong>Production-ready PayPal payment plugin for Medusa v2</strong></p>
-
-<p>
-  <a href="https://www.npmjs.com/package/@easypayment/medusa-paypal-backend"><img src="https://img.shields.io/npm/v/@easypayment/medusa-paypal-backend?color=blue&label=npm" alt="npm version" /></a>
-  <a href="LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License: MIT" /></a>
-  <a href="https://medusajs.com"><img src="https://img.shields.io/badge/Medusa-v2-9b59b6" alt="Medusa v2" /></a>
-  <a href="https://developer.paypal.com"><img src="https://img.shields.io/badge/PayPal-PPCP-003087" alt="PayPal PPCP" /></a>
-</p>
-
-<p>Smart Buttons · Advanced Card Fields · Webhooks</p>
-
-</div>
-
----
-
-## Requirements
-
-- Medusa v2
-- Node.js 18+
-- PostgreSQL
-
----
-
-## Step 1 — Install
-
-```bash
-npm install @easypayment/medusa-paypal-backend
-```
-
----
-
-## Step 2 — Configure medusa-config.ts
-
-Add the plugin and both payment providers to your existing `medusa-config.ts`:
-
-```ts
-import { loadEnv, defineConfig } from "@medusajs/framework/utils"
-
-loadEnv(process.env.NODE_ENV || "development", process.cwd())
-
-export default defineConfig({
-  projectConfig: {
-    databaseUrl: process.env.DATABASE_URL,
-    http: {
-      storeCors: process.env.STORE_CORS!,
-      adminCors: process.env.ADMIN_CORS!,
-      authCors: process.env.AUTH_CORS!,
-      jwtSecret: process.env.JWT_SECRET || "supersecret",
-      cookieSecret: process.env.COOKIE_SECRET || "supersecret",
-    },
-  },
-
-  plugins: [
-    {
-      resolve: "@easypayment/medusa-paypal",
-      options: {},
-    },
-  ],
-
-  modules: [
-    {
-      resolve: "@medusajs/medusa/payment",
-      options: {
-        providers: [
-          {
-            // PayPal Smart Buttons (wallet checkout)
-            resolve: "@easypayment/medusa-paypal/providers/paypal",
-            id: "paypal",
-            options: {},
-            dependencies: ["paypal_onboarding"],
-          },
-          {
-            // Advanced Card Fields (hosted card inputs)
-            resolve: "@easypayment/medusa-paypal/providers/paypal_card",
-            id: "paypal_card",
-            options: {},
-            dependencies: ["paypal_onboarding"],
-          },
-        ],
-      },
-    },
-  ],
-})
-```
-
----
-
-## Step 3 — Set environment variables
-
-Add these to your Medusa server `.env`:
-
-```env
-# Required
-MEDUSA_BACKEND_URL=https://your-medusa-server.com
-```
-
----
-
-## Step 4 — Run database migrations
-
-```bash
-npx medusa db:migrate
-```
-
----
-
-## Step 5 — Connect your PayPal account
-
-1. Start your Medusa server
-2. Open Medusa Admin → **Settings → PayPal → PayPal Connection**
-3. Choose **Sandbox** (testing) or **Live** (production)
-4. Click **Connect to PayPal** and complete the PayPal onboarding flow
-
-Credentials are saved automatically. To connect manually instead, click **Insert credentials manually** and paste your Client ID and Secret from [developer.paypal.com](https://developer.paypal.com).
-
----
-
-## Step 6 — Enable providers in your region
-
-1. Medusa Admin → **Settings → Regions → [your region]**
-2. Under **Payment Providers**, enable:
-   - `pp_paypal_paypal` — Paypal (CARD)
-   - `pp_paypal_card_paypal_card` — Paypal (PAYPAL)
-
----
-
-## Step 7 — Configure settings (optional)
-
-All settings are in Medusa Admin → **Settings → PayPal** and take effect immediately with no server restart.
-
-| Tab | What you can configure |
-|---|---|
-| **PayPal Settings** | Enable/disable, button color, shape, label |
-| **Advanced Card Payments** | Enable/disable, 3D Secure mode |
-| **Additional Settings** | Payment action (capture / authorize), brand name, invoice prefix |
-
----
-
-## Step 8 — Connect the frontend package
-
-Install the storefront UI package to render PayPal at checkout:
-
-```bash
-npm install @easypayment/medusa-paypal-ui
-```
-
-See the [medusa-paypal-frontend README](../medusa-paypal-frontend/README.md) for integration steps.
-
+<div align="center">
+
+<h1>🅿 medusa-paypal-backend</h1>
+
+<p><strong>Production-ready PayPal payment plugin for Medusa v2</strong></p>
+
+<p>
+  <a href="https://www.npmjs.com/package/@easypayment/medusa-paypal-backend"><img src="https://img.shields.io/npm/v/@easypayment/medusa-paypal-backend?color=blue&label=npm" alt="npm version" /></a>
+  <a href="LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License: MIT" /></a>
+  <a href="https://medusajs.com"><img src="https://img.shields.io/badge/Medusa-v2-9b59b6" alt="Medusa v2" /></a>
+  <a href="https://developer.paypal.com"><img src="https://img.shields.io/badge/PayPal-PPCP-003087" alt="PayPal PPCP" /></a>
+</p>
+
+<p>Smart Buttons · Advanced Card Fields · Webhooks · Reconciliation · Credential Encryption</p>
+
+</div>
+
+---
+
+## Requirements
+
+- Medusa v2
+- Node.js 18+
+- PostgreSQL
+
+---
+
+## Step 1 — Install
+
+```bash
+npm install @easypayment/medusa-paypal-backend
+```
+
+---
+
+## Step 2 — Configure medusa-config.ts
+
+Add the plugin and both payment providers to your existing `medusa-config.ts`:
+
+```ts
+import { loadEnv, defineConfig } from "@medusajs/framework/utils"
+
+loadEnv(process.env.NODE_ENV || "development", process.cwd())
+
+export default defineConfig({
+  projectConfig: {
+    databaseUrl: process.env.DATABASE_URL,
+    http: {
+      storeCors: process.env.STORE_CORS!,
+      adminCors: process.env.ADMIN_CORS!,
+      authCors: process.env.AUTH_CORS!,
+      jwtSecret: process.env.JWT_SECRET || "supersecret",
+      cookieSecret: process.env.COOKIE_SECRET || "supersecret",
+    },
+  },
+
+  plugins: [
+    {
+      resolve: "@easypayment/medusa-paypal",
+      options: {},
+    },
+  ],
+
+  modules: [
+    {
+      resolve: "@medusajs/medusa/payment",
+      options: {
+        providers: [
+          {
+            // PayPal Smart Buttons (wallet checkout)
+            resolve: "@easypayment/medusa-paypal/providers/paypal",
+            id: "paypal",
+            options: {},
+            dependencies: ["paypal_onboarding"],
+          },
+          {
+            // Advanced Card Fields (hosted card inputs)
+            resolve: "@easypayment/medusa-paypal/providers/paypal_card",
+            id: "paypal_card",
+            options: {},
+            dependencies: ["paypal_onboarding"],
+          },
+        ],
+      },
+    },
+  ],
+})
+```
+
+---
+
+## Step 3 — Set environment variables
+
+Add these to your Medusa server `.env`:
+
+```env
+# Required
+MEDUSA_BACKEND_URL=https://your-medusa-server.com
+STOREFRONT_URL=https://your-storefront.com
+
+# Recommended for production
+PAYPAL_CURRENCY=EUR
+```
+
+---
+
+## Step 4 — Run database migrations
+
+```bash
+npx medusa db:migrate
+```
+
+---
+
+## Step 5 — Connect your PayPal account
+
+1. Start your Medusa server
+2. Open Medusa Admin → **Settings → PayPal → PayPal Connection**
+3. Choose **Sandbox** (testing) or **Live** (production)
+4. Click **Connect to PayPal** and complete the PayPal onboarding flow
+
+Credentials are saved automatically. To connect manually instead, click **Insert credentials manually** and paste your Client ID and Secret from [developer.paypal.com](https://developer.paypal.com).
+
+---
+
+## Step 6 — Enable providers in your region
+
+1. Medusa Admin → **Settings → Regions → [your region]**
+2. Under **Payment Providers**, enable:
+   - `pp_paypal_paypal` — PayPal Smart Buttons
+   - `pp_paypal_card_paypal_card` — Advanced Card Fields
+
+---
+
+## Step 7 — Configure settings (optional)
+
+All settings are in Medusa Admin → **Settings → PayPal** and take effect immediately with no server restart.
+
+| Tab | What you can configure |
+|---|---|
+| **PayPal Settings** | Enable/disable, button color, shape, label |
+| **Advanced Card Payments** | Enable/disable, 3D Secure mode |
+| **Additional Settings** | Payment action (capture / authorize), brand name, invoice prefix |
+
+---
+
+## Step 8 — Connect the frontend package
+
+Install the storefront UI package to render PayPal at checkout:
+
+```bash
+npm install @easypayment/medusa-paypal-ui
+```
+
+See the [medusa-paypal-frontend README](../medusa-paypal-frontend/README.md) for integration steps.
+
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easypayment/medusa-paypal",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Industry-standard PayPal integration for Medusa v2",
   "license": "MIT",
   "main": "./.medusa/server/src/index.js",

package/src/admin/routes/settings/paypal/_components/Tabs.tsx

@@ -1,52 +1,48 @@
-import React from "react"
-import { Link, useLocation } from "react-router-dom"
-
-type Tab = {
-  label: string
-  to: string
-}
-
-const BASE = "/settings/paypal"
-
-const TABS: Tab[] = [
-  { label: "PayPal Connection", to: `${BASE}/connection` },
-  { label: "PayPal Settings", to: `${BASE}/paypal-settings` },
-  { label: "Advanced Card Payments", to: `${BASE}/advanced-card-payments` },
-/*  { label: "Google Pay", to: `${BASE}/google-pay` },
-  { label: "Apple Pay", to: `${BASE}/apple-pay` },
-  { label: "Pay Later Messaging", to: `${BASE}/pay-later-messaging` }, */
-  { label: "Additional Settings", to: `${BASE}/additional-settings` },
-]
-
-function isActive(pathname: string, to: string) {
-  // exact match OR nested route under same tab
-  return pathname === to || pathname.startsWith(to + "/")
-}
-
-export default function PayPalTabs() {
-  const { pathname } = useLocation()
-
-  return (
-    <div className="border-b border-ui-border-base">
-      <div className="flex flex-wrap gap-6 text-sm">
-        {TABS.map((t) => {
-          const active = isActive(pathname, t.to)
-
-          return (
-            <Link
-              key={t.to}
-              to={t.to}
-              className={
-                active
-                  ? "border-b-2 border-ui-fg-base pb-2 font-medium text-ui-fg-base"
-                  : "pb-2 text-ui-fg-subtle hover:text-ui-fg-base"
-              }
-            >
-              {t.label}
-            </Link>
-          )
-        })}
-      </div>
-    </div>
-  )
-}
+import React from "react"
+import { Link, useLocation } from "react-router-dom"
+
+type Tab = {
+  label: string
+  to: string
+}
+
+const BASE = "/settings/paypal"
+
+const TABS: Tab[] = [
+  { label: "PayPal Connection", to: `${BASE}/connection` },
+  { label: "PayPal Settings", to: `${BASE}/paypal-settings` },
+  { label: "Advanced Card Payments", to: `${BASE}/advanced-card-payments` },
+  { label: "Additional Settings", to: `${BASE}/additional-settings` },
+]
+
+function isActive(pathname: string, to: string) {
+  return pathname === to || pathname.startsWith(to + "/")
+}
+
+export default function PayPalTabs() {
+  const { pathname } = useLocation()
+
+  return (
+    <div className="border-b border-ui-border-base">
+      <div className="flex flex-wrap gap-6 text-sm">
+        {TABS.map((t) => {
+          const active = isActive(pathname, t.to)
+
+          return (
+            <Link
+              key={t.to}
+              to={t.to}
+              className={
+                active
+                  ? "border-b-2 border-ui-fg-base pb-2 font-medium text-ui-fg-base"
+                  : "pb-2 text-ui-fg-subtle hover:text-ui-fg-base"
+              }
+            >
+              {t.label}
+            </Link>
+          )
+        })}
+      </div>
+    </div>
+  )
+}

package/src/admin/routes/settings/paypal/paypal-settings/page.tsx

@@ -147,16 +147,6 @@ export default function PayPalSettingsTab() {
     ;(async () => {
       try {
         setLoading(true)
-
-        // BEFORE:
-        // const r = await fetch("/admin/paypal/settings", {
-        //   credentials: "include",
-        //   headers: { Accept: "application/json" },
-        // })
-        // if (!r.ok) return
-        // const json = await r.json()
-        //
-        // AFTER: adminFetch attaches the Bearer token automatically
         const json = await adminFetch<{ data?: { paypal_settings?: PayPalSettingsForm }; paypal_settings?: PayPalSettingsForm }>(
           "/admin/paypal/settings"
         )
@@ -180,18 +170,6 @@ export default function PayPalSettingsTab() {
     try {
       setSaving(true)
       const cleaned = { ...form }
-
-      // BEFORE:
-      // const r = await fetch("/admin/paypal/settings", {
-      //   method: "POST",
-      //   credentials: "include",
-      //   headers: { "Content-Type": "application/json", Accept: "application/json" },
-      //   body: JSON.stringify({ paypal_settings: cleaned }),
-      // })
-      // if (!r.ok) { ... }
-      // const json = await r.json().catch(() => null)
-      //
-      // AFTER: adminFetch attaches the Bearer token automatically
       const json = await adminFetch<{ data?: { paypal_settings?: PayPalSettingsForm }; paypal_settings?: PayPalSettingsForm }>(
         "/admin/paypal/settings",
         {
@@ -248,7 +226,6 @@ export default function PayPalSettingsTab() {
           </div>
         ) : null}
 
-        {/* PayPal Settings */}
         <SectionCard
           title="PayPal Settings"
           description="Enable PayPal and configure checkout title."

package/src/api/store/payment-collections/[id]/payment-sessions/route.ts

@@ -1,66 +1,57 @@
-import { createPaymentSessionsWorkflow } from "@medusajs/core-flows"
-import { MedusaResponse, MedusaStoreRequest, refetchEntity } from "@medusajs/framework/http"
-import { MedusaError } from "@medusajs/framework/utils"
-
-// FIX 6: Removed the broken import of isPayPalProviderId from provider-ids.
-// That import caused TS2307 because the relative path was wrong, and the
-// isPayPalProviderId guard was conflicting with the typed body cast below,
-// producing two const declarations of provider_id in the same scope.
-// This route does not need to filter by provider — it accepts any provider_id
-// and delegates to the standard createPaymentSessionsWorkflow. The
-// isPayPalProviderId guard (Fix 6b) belongs only in routes that need to
-// short-circuit for non-PayPal providers.
-
-type CreatePaymentSessionBody = {
-  provider_id: string
-  data?: Record<string, unknown>
-}
-
-const defaultPaymentCollectionFields = [
-  "id",
-  "currency_code",
-  "amount",
-  "*payment_sessions",
-]
-
-export async function POST(req: MedusaStoreRequest, res: MedusaResponse) {
-  const collectionId = req.params.id
-
-  // Single typed destructure — no redeclaration, req.body cast once
-  const { provider_id, data } = req.body as CreatePaymentSessionBody
-
-  if (!provider_id || typeof provider_id !== "string") {
-    throw new MedusaError(
-      MedusaError.Types.INVALID_DATA,
-      "provider_id is required to create a payment session"
-    )
-  }
-
-  try {
-    await createPaymentSessionsWorkflow(req.scope).run({
-      input: {
-        payment_collection_id: collectionId,
-        provider_id,
-        customer_id: req.auth_context?.actor_id,
-        data,
-      },
-    })
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error)
-    throw new MedusaError(
-      MedusaError.Types.UNEXPECTED_STATE,
-      `Failed to create payment session for provider '${provider_id}': ${message}`
-    )
-  }
-
-  const paymentCollection = await refetchEntity({
-    entity: "payment_collection",
-    idOrFilter: collectionId,
-    scope: req.scope,
-    fields: req.queryConfig?.fields ?? defaultPaymentCollectionFields,
-  })
-
-  res.status(200).json({
-    payment_collection: paymentCollection,
-  })
+import { createPaymentSessionsWorkflow } from "@medusajs/core-flows"
+import { MedusaResponse, MedusaStoreRequest, refetchEntity } from "@medusajs/framework/http"
+import { MedusaError } from "@medusajs/framework/utils"
+
+type CreatePaymentSessionBody = {
+  provider_id: string
+  data?: Record<string, unknown>
+}
+
+const defaultPaymentCollectionFields = [
+  "id",
+  "currency_code",
+  "amount",
+  "*payment_sessions",
+]
+
+export async function POST(req: MedusaStoreRequest, res: MedusaResponse) {
+  const collectionId = req.params.id
+
+  // Single typed destructure — no redeclaration, req.body cast once
+  const { provider_id, data } = req.body as CreatePaymentSessionBody
+
+  if (!provider_id || typeof provider_id !== "string") {
+    throw new MedusaError(
+      MedusaError.Types.INVALID_DATA,
+      "provider_id is required to create a payment session"
+    )
+  }
+
+  try {
+    await createPaymentSessionsWorkflow(req.scope).run({
+      input: {
+        payment_collection_id: collectionId,
+        provider_id,
+        customer_id: req.auth_context?.actor_id,
+        data,
+      },
+    })
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new MedusaError(
+      MedusaError.Types.UNEXPECTED_STATE,
+      `Failed to create payment session for provider '${provider_id}': ${message}`
+    )
+  }
+
+  const paymentCollection = await refetchEntity({
+    entity: "payment_collection",
+    idOrFilter: collectionId,
+    scope: req.scope,
+    fields: req.queryConfig?.fields ?? defaultPaymentCollectionFields,
+  })
+
+  res.status(200).json({
+    payment_collection: paymentCollection,
+  })
 }