@easypayment/medusa-paypal 0.2.7 → 0.2.9

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

@@ -1,165 +1,120 @@
-import React, { useCallback, useEffect, useState } from "react"
-import PayPalTabs from "../_components/Tabs"
-
-type ReconciliationStatus = {
-  runs?: number
-  last_run_at?: string | null
-  last_run_status?: string | null
-  last_success_at?: string | null
-  last_failure_at?: string | null
-  sessions_checked?: number
-  sessions_updated?: number
-  drift_count?: number
-  last_drift_at?: string | null
-  last_drift_order_id?: string | null
-  last_error?: string | null
-}
-
-function formatDate(value?: string | null) {
-  if (!value) {
-    return "—"
-  }
-  const parsed = new Date(value)
-  if (Number.isNaN(parsed.getTime())) {
-    return value
-  }
-  return parsed.toLocaleString()
-}
-
-export default function PayPalReconciliationStatusPage() {
-  const [status, setStatus] = useState<ReconciliationStatus>({})
-  const [loading, setLoading] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-
-  const fetchStatus = useCallback(async () => {
-    try {
-      setLoading(true)
-      setError(null)
-      const response = await fetch("/admin/paypal/reconciliation-status", {
-        credentials: "include",
-        headers: {
-          Accept: "application/json",
-        },
-      })
-
-      if (!response.ok) {
-        const message = await response.text().catch(() => "")
-        throw new Error(message || "Failed to load reconciliation status.")
-      }
-
-      const data = await response.json().catch(() => ({}))
-      setStatus((data?.status as ReconciliationStatus) || {})
-    } catch (fetchError: any) {
-      setError(fetchError?.message || "Failed to load reconciliation status.")
-      setStatus({})
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchStatus()
-  }, [fetchStatus])
-
-  return (
-    <div className="p-6">
-      <div className="flex flex-col gap-6">
-        <div>
-          <h1 className="text-xl font-semibold text-ui-fg-base">
-            PayPal Reconciliation Status
-          </h1>
-          <p className="mt-1 text-sm text-ui-fg-subtle">
-            Monitor reconciliation health and drift detection for PayPal payment sessions.
-          </p>
-        </div>
-
-        <PayPalTabs />
-
-        <div className="rounded-xl border border-ui-border-base bg-ui-bg-base shadow-sm">
-          <div className="border-b border-ui-border-base p-4">
-            <div className="flex items-center justify-between gap-4">
-              <div className="text-base font-semibold text-ui-fg-base">
-                Latest reconciliation run
-              </div>
-              <button
-                type="button"
-                onClick={fetchStatus}
-                className="rounded-md border border-ui-border-base px-3 py-2 text-sm text-ui-fg-base"
-                disabled={loading}
-              >
-                {loading ? "Refreshing..." : "Refresh"}
-              </button>
-            </div>
-          </div>
-          <div className="p-4">
-            {error ? (
-              <div className="rounded-md border border-red-200 bg-red-50 p-3 text-sm text-red-600">
-                {error}
-              </div>
-            ) : null}
-
-            {!error && Object.keys(status).length === 0 ? (
-              <div className="text-sm text-ui-fg-subtle">
-                {loading ? "Loading reconciliation status..." : "No reconciliation data yet."}
-              </div>
-            ) : null}
-
-            {Object.keys(status).length > 0 ? (
-              <div className="grid gap-4 text-sm text-ui-fg-base md:grid-cols-2">
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Last run</div>
-                  <div className="mt-1 font-medium">{formatDate(status.last_run_at)}</div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Last run status</div>
-                  <div className="mt-1 font-medium capitalize">
-                    {status.last_run_status || "—"}
-                  </div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Last success</div>
-                  <div className="mt-1 font-medium">{formatDate(status.last_success_at)}</div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Last failure</div>
-                  <div className="mt-1 font-medium">{formatDate(status.last_failure_at)}</div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Sessions checked</div>
-                  <div className="mt-1 font-medium">{status.sessions_checked ?? 0}</div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Sessions updated</div>
-                  <div className="mt-1 font-medium">{status.sessions_updated ?? 0}</div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Drift detections</div>
-                  <div className="mt-1 font-medium">{status.drift_count ?? 0}</div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3">
-                  <div className="text-ui-fg-subtle">Last drift order</div>
-                  <div className="mt-1 font-medium">
-                    {status.last_drift_order_id || "—"}
-                  </div>
-                  <div className="mt-1 text-xs text-ui-fg-subtle">
-                    {formatDate(status.last_drift_at)}
-                  </div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3 md:col-span-2">
-                  <div className="text-ui-fg-subtle">Last error</div>
-                  <div className="mt-1 font-medium">
-                    {status.last_error || "No errors recorded."}
-                  </div>
-                </div>
-                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3 md:col-span-2">
-                  <div className="text-ui-fg-subtle">Total runs</div>
-                  <div className="mt-1 font-medium">{status.runs ?? 0}</div>
-                </div>
-              </div>
-            ) : null}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
+import React, { useCallback, useEffect, useState } from "react"
+import PayPalTabs from "../_components/Tabs"
+
+type AdminFetchOptions = {
+  method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH"
+  body?: Record<string, unknown>
+  query?: Record<string, string>
+}
+
+async function adminFetch<T = unknown>(path: string, opts: AdminFetchOptions = {}): Promise<T> {
+  const { method = "GET", body, query } = opts
+  let url = path
+  if (query && Object.keys(query).length > 0) {
+    const params = new URLSearchParams(query)
+    url = `${path}?${params.toString()}`
+  }
+  const headers: Record<string, string> = { Accept: "application/json" }
+  if (body !== undefined) headers["Content-Type"] = "application/json"
+  if (typeof window !== "undefined") {
+    const token = (window as any).__medusa__?.token
+    if (token) headers["Authorization"] = `Bearer ${token}`
+  }
+  const res = await fetch(url, {
+    method, headers, credentials: "include",
+    body: body !== undefined ? JSON.stringify(body) : undefined,
+  })
+  const text = await res.text().catch(() => "")
+  if (!res.ok) {
+    if (res.status === 401) throw new Error("Unauthorized (401) - session may have expired. Please reload and log in again.")
+    if (res.status === 403) throw new Error("Forbidden (403) - you do not have permission to perform this action.")
+    throw new Error(text || `Request failed with status ${res.status}`)
+  }
+  if (!text) return {} as T
+  try { return JSON.parse(text) as T } catch { return {} as T }
+}
+
+type ReconciliationStatus = {
+  runs?: number
+  last_run_at?: string | null
+  last_run_status?: string | null
+  last_success_at?: string | null
+  last_failure_at?: string | null
+  sessions_checked?: number
+  sessions_updated?: number
+  drift_count?: number
+  last_drift_at?: string | null
+  last_drift_order_id?: string | null
+  last_error?: string | null
+}
+
+function formatDate(value?: string | null) {
+  if (!value) return "—"
+  const parsed = new Date(value)
+  if (Number.isNaN(parsed.getTime())) return value
+  return parsed.toLocaleString()
+}
+
+export default function PayPalReconciliationStatusPage() {
+  const [status, setStatus] = useState<ReconciliationStatus>({})
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  const fetchStatus = useCallback(async () => {
+    try {
+      setLoading(true)
+      setError(null)
+      const data = await adminFetch<{ status: ReconciliationStatus }>("/admin/paypal/reconciliation-status")
+      setStatus(data?.status ?? {})
+    } catch (fetchError: unknown) {
+      setError(fetchError instanceof Error ? fetchError.message : "Failed to load reconciliation status.")
+      setStatus({})
+    } finally {
+      setLoading(false)
+    }
+  }, [])
+
+  useEffect(() => { fetchStatus() }, [fetchStatus])
+
+  return (
+    <div className="p-6">
+      <div className="flex flex-col gap-6">
+        <div>
+          <h1 className="text-xl font-semibold text-ui-fg-base">PayPal Reconciliation Status</h1>
+          <p className="mt-1 text-sm text-ui-fg-subtle">Monitor reconciliation health and drift detection for PayPal payment sessions.</p>
+        </div>
+        <PayPalTabs />
+        <div className="rounded-xl border border-ui-border-base bg-ui-bg-base shadow-sm">
+          <div className="border-b border-ui-border-base p-4">
+            <div className="flex items-center justify-between gap-4">
+              <div className="text-base font-semibold text-ui-fg-base">Latest reconciliation run</div>
+              <button type="button" onClick={fetchStatus} className="rounded-md border border-ui-border-base px-3 py-2 text-sm text-ui-fg-base" disabled={loading}>
+                {loading ? "Refreshing..." : "Refresh"}
+              </button>
+            </div>
+          </div>
+          <div className="p-4">
+            {error ? <div className="rounded-md border border-red-200 bg-red-50 p-3 text-sm text-red-600">{error}</div> : null}
+            {!error && Object.keys(status).length === 0 ? (
+              <div className="text-sm text-ui-fg-subtle">{loading ? "Loading reconciliation status..." : "No reconciliation data yet."}</div>
+            ) : null}
+            {Object.keys(status).length > 0 ? (
+              <div className="grid gap-4 text-sm text-ui-fg-base md:grid-cols-2">
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Last run</div><div className="mt-1 font-medium">{formatDate(status.last_run_at)}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Last run status</div><div className="mt-1 font-medium capitalize">{status.last_run_status || "—"}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Last success</div><div className="mt-1 font-medium">{formatDate(status.last_success_at)}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Last failure</div><div className="mt-1 font-medium">{formatDate(status.last_failure_at)}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Sessions checked</div><div className="mt-1 font-medium">{status.sessions_checked ?? 0}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Sessions updated</div><div className="mt-1 font-medium">{status.sessions_updated ?? 0}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Drift detections</div><div className="mt-1 font-medium">{status.drift_count ?? 0}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3"><div className="text-ui-fg-subtle">Last drift order</div><div className="mt-1 font-medium">{status.last_drift_order_id || "—"}</div><div className="mt-1 text-xs text-ui-fg-subtle">{formatDate(status.last_drift_at)}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3 md:col-span-2"><div className="text-ui-fg-subtle">Last error</div><div className="mt-1 font-medium">{status.last_error || "No errors recorded."}</div></div>
+                <div className="rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3 md:col-span-2"><div className="text-ui-fg-subtle">Total runs</div><div className="mt-1 font-medium">{status.runs ?? 0}</div></div>
+              </div>
+            ) : null}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}

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

@@ -2,6 +2,15 @@ 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>
@@ -16,6 +25,8 @@ const defaultPaymentCollectionFields = [
 
 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") {
@@ -52,4 +63,4 @@ export async function POST(req: MedusaStoreRequest, res: MedusaResponse) {
   res.status(200).json({
     payment_collection: paymentCollection,
   })
-}
+}