npm - @easypayment/medusa-paypal - Versions diffs - 0.5.7 → 0.5.9 - Mend

@easypayment/medusa-paypal 0.5.7 → 0.5.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/.medusa/server/src/admin/index.js CHANGED Viewed

@@ -183,9 +183,6 @@ function AdditionalSettingsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
-  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 async function adminFetch$1(path, opts = {}) {
   var _a;
   const { method = "GET", body, query } = opts;
@@ -325,6 +322,9 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 const config = adminSdk.defineRouteConfig({
   label: "PayPal Connection",
   hide: true
@@ -401,15 +401,6 @@ function PayPalConnectionPage() {
   const canSaveManual = react.useMemo(() => {
     return clientId.trim().length > 0 && secret.trim().length > 0;
   }, [clientId, secret]);
-  const maskValue = react.useCallback((value, visibleChars = 4) => {
-    if (!value) return "";
-    if (value.length <= visibleChars) {
-      return "•".repeat(value.length);
-    }
-    return `${"•".repeat(Math.max(0, value.length - visibleChars))}${value.slice(
-      -visibleChars
-    )}`;
-  }, []);
   const fetchFreshLink = react.useCallback(
     (runId) => {
       if (initLoaderRef.current) {
@@ -608,18 +599,20 @@ function PayPalConnectionPage() {
         headers: { "content-type": "application/json" },
         body: JSON.stringify({
           clientId: clientId.trim(),
-          clientSecret: secret.trim()
+          clientSecret: secret.trim(),
+          environment: env
         })
       });
       if (!res.ok) {
         const txt = await res.text().catch(() => "");
         throw new Error(txt || `Save credentials failed (${res.status})`);
       }
-      setConnState("connected");
-      setStatusInfo({
-        seller_client_id_masked: maskValue(clientId.trim()),
-        seller_client_secret_masked: "••••••••"
+      const statusRes = await fetch(`${STATUS_ENDPOINT}?environment=${env}`, {
+        method: "GET"
       });
+      const refreshedStatus = await statusRes.json().catch(() => ({}));
+      setConnState("connected");
+      setStatusInfo(refreshedStatus || null);
       setShowManual(false);
       try {
         localStorage.removeItem(CACHE_KEY);
@@ -1216,14 +1209,14 @@ const routeModule = {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
-    {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
-    },
     {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
+    {
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
+    },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"

package/.medusa/server/src/admin/index.mjs CHANGED Viewed

@@ -182,9 +182,6 @@ function AdditionalSettingsTab() {
     )
   ] }) });
 }
-function PayPalApplePayPage() {
-  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 async function adminFetch$1(path, opts = {}) {
   var _a;
   const { method = "GET", body, query } = opts;
@@ -324,6 +321,9 @@ function AdvancedCardPaymentsTab() {
     )
   ] }) });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 const config = defineRouteConfig({
   label: "PayPal Connection",
   hide: true
@@ -400,15 +400,6 @@ function PayPalConnectionPage() {
   const canSaveManual = useMemo(() => {
     return clientId.trim().length > 0 && secret.trim().length > 0;
   }, [clientId, secret]);
-  const maskValue = useCallback((value, visibleChars = 4) => {
-    if (!value) return "";
-    if (value.length <= visibleChars) {
-      return "•".repeat(value.length);
-    }
-    return `${"•".repeat(Math.max(0, value.length - visibleChars))}${value.slice(
-      -visibleChars
-    )}`;
-  }, []);
   const fetchFreshLink = useCallback(
     (runId) => {
       if (initLoaderRef.current) {
@@ -607,18 +598,20 @@ function PayPalConnectionPage() {
         headers: { "content-type": "application/json" },
         body: JSON.stringify({
           clientId: clientId.trim(),
-          clientSecret: secret.trim()
+          clientSecret: secret.trim(),
+          environment: env
         })
       });
       if (!res.ok) {
         const txt = await res.text().catch(() => "");
         throw new Error(txt || `Save credentials failed (${res.status})`);
       }
-      setConnState("connected");
-      setStatusInfo({
-        seller_client_id_masked: maskValue(clientId.trim()),
-        seller_client_secret_masked: "••••••••"
+      const statusRes = await fetch(`${STATUS_ENDPOINT}?environment=${env}`, {
+        method: "GET"
       });
+      const refreshedStatus = await statusRes.json().catch(() => ({}));
+      setConnState("connected");
+      setStatusInfo(refreshedStatus || null);
       setShowManual(false);
       try {
         localStorage.removeItem(CACHE_KEY);
@@ -1215,14 +1208,14 @@ const routeModule = {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
-    {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
-    },
     {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
+    {
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
+    },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"

package/.medusa/server/src/api/admin/paypal/save-credentials/route.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/admin/paypal/save-credentials/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAG7E,wBAAsB,IAAI,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,~~2BAUjE~~"}
1	+ {"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/admin/paypal/save-credentials/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAG7E,wBAAsB,IAAI,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,2BAkBjE"}

package/.medusa/server/src/api/admin/paypal/save-credentials/route.js CHANGED Viewed

@@ -7,7 +7,11 @@ async function POST(req, res) {
     if (!body?.clientId || !body?.clientSecret) {
         return res.status(400).json({ message: "Missing clientId/clientSecret" });
     }
-    await paypal.saveSellerCredentials({ clientId: body.clientId, clientSecret: body.clientSecret });
+    await paypal.saveAndHydrateSellerCredentials({
+        clientId: body.clientId,
+        clientSecret: body.clientSecret,
+        environment: body.environment,
+    });
     return res.json({ ok: true });
 }
 //# sourceMappingURL=route.js.map

package/.medusa/server/src/api/admin/paypal/save-credentials/route.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../src/api/admin/paypal/save-credentials/route.ts"],"names":[],"mappings":";;AAGA,~~oBAUC~~;~~AAVM~~,KAAK,UAAU,IAAI,CAAC,GAAkB,EAAE,GAAmB;IAChE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAsB,mBAAmB,CAAC,CAAA;IAC1E,MAAM,IAAI,GAAG,GAAG,CAAC,~~IAAoD~~,CAAA;~~IAErE~~,IAAI,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC,CAAA;IAC3E,CAAC;IAED,MAAM,MAAM,CAAC,~~qBAAqB,~~CAAC,~~EAAE,~~QAAQ,EAAE,IAAI,CAAC,QAAQ,~~EAAE,~~YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;~~IAChG~~,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;AAC/B,CAAC"}
1	+ {"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../src/api/admin/paypal/save-credentials/route.ts"],"names":[],"mappings":";;AAGA,oBAkBC;AAlBM,KAAK,UAAU,IAAI,CAAC,GAAkB,EAAE,GAAmB;IAChE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAsB,mBAAmB,CAAC,CAAA;IAC1E,MAAM,IAAI,GAAG,GAAG,CAAC,IAIhB,CAAA;IAED,IAAI,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC,CAAA;IAC3E,CAAC;IAED,MAAM,MAAM,CAAC,+BAA+B,CAAC;QAC3C,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAA;IACF,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;AAC/B,CAAC"}

package/.medusa/server/src/modules/paypal/service.d.ts CHANGED Viewed

@@ -64,6 +64,9 @@ declare class PayPalModuleService extends PayPalModuleService_base {
     private getEnvCreds;
     private extractSellerEmail;
     private fetchMerchantIntegrationDetails;
+    private getAppAccessTokenForCredentials;
+    private fetchSellerProfileFromDirectCredentials;
+    private hydrateSellerMetadataFromCredentials;
     private syncRowFieldsFromMetadata;
     /**
      * Set environment based on admin UI selection (WooCommerce-style).
@@ -129,6 +132,7 @@ declare class PayPalModuleService extends PayPalModuleService_base {
         clientSecret: string;
         sellerMerchantId?: string | null;
         sellerEmail?: string | null;
+        environment?: Environment;
     }): Promise<{
         id: string;
         environment: string;
@@ -146,6 +150,33 @@ declare class PayPalModuleService extends PayPalModuleService_base {
         updated_at: Date;
         deleted_at: Date | null;
     }>;
+    saveAndHydrateSellerCredentials(input: {
+        clientId: string;
+        clientSecret: string;
+        environment?: Environment;
+    }): Promise<{
+        environment: Environment;
+        status: Status;
+        seller_client_id_present: boolean;
+        shared_id?: undefined;
+        auth_code?: undefined;
+        seller_client_id_masked?: undefined;
+        seller_client_secret_masked?: undefined;
+        seller_merchant_id?: undefined;
+        seller_email?: undefined;
+        updated_at?: undefined;
+    } | {
+        environment: Environment;
+        status: Status;
+        shared_id: any;
+        auth_code: string | null;
+        seller_client_id_present: boolean;
+        seller_client_id_masked: string | null;
+        seller_client_secret_masked: string | null;
+        seller_merchant_id: string | null;
+        seller_email: string | null;
+        updated_at: any;
+    }>;
     private resolveWebhookUrl;
     private isLocalWebhookUrl;
     private ensureWebhookRegistration;
@@ -161,6 +192,7 @@ declare class PayPalModuleService extends PayPalModuleService_base {
         auth_code?: undefined;
         seller_client_id_masked?: undefined;
         seller_client_secret_masked?: undefined;
+        seller_merchant_id?: undefined;
         seller_email?: undefined;
         updated_at?: undefined;
     } | {
@@ -171,6 +203,7 @@ declare class PayPalModuleService extends PayPalModuleService_base {
         seller_client_id_present: boolean;
         seller_client_id_masked: string | null;
         seller_client_secret_masked: string | null;
+        seller_merchant_id: string | null;
         seller_email: string | null;
         updated_at: any;
     }>;

package/.medusa/server/src/modules/paypal/service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../../src/modules/paypal/service.ts"],"names":[],"mappings":"AASA,KAAK,WAAW,GAAG,SAAS,GAAG,MAAM,CAAA;AAErC,KAAK,MAAM,GACP,cAAc,GACd,SAAS,GACT,qBAAqB,GACrB,WAAW,GACX,SAAS,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,cAAM,mBAAoB,SAAQ,wBAKhC;IACA,SAAS,CAAC,GAAG,8CAAoB;YAEnB,eAAe;YAKf,sBAAsB;IA0D9B,aAAa;;;;IAQnB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,kBAAkB;YAmBZ,oBAAoB;IAKlC;;;OAGG;YACW,aAAa;YAKb,qBAAqB;IAUnC,OAAO,CAAC,WAAW;~~IAcnB~~,OAAO,CAAC,kBAAkB;~~YA8CZ~~,+BAA+B;YA6C/B,yBAAyB;IAgBvC;;;OAGG;IAEG,cAAc,CAAC,GAAG,EAAE,WAAW;IAoDrC;;;;;;;;;;;OAWG;IACG,oBAAoB,CAAC,KAAK,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE;;;;IAoIpE,eAAe;IAiBf,mBAAmB,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;IAsBvE;;;;;;;;OAQG;IACG,gCAAgC,CAAC,KAAK,EAAE;QAC5C,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,EAAE,MAAM,CAAA;QAChB,GAAG,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;KACzB;~~IAyKK~~,qBAAqB,CAAC,KAAK,EAAE;QACjC,QAAQ,EAAE,MAAM,CAAA;QAChB,YAAY,EAAE,MAAM,CAAA;QACpB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAChC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;~~KAC5B~~;;;;;;;;;;;;;;;;;~~YAmEa~~,iBAAiB;IAS/B,OAAO,CAAC,iBAAiB;YASX,yBAAyB;IA+FvC,OAAO,CAAC,SAAS;IAWX,6BAA6B;;;IAwD7B,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW;;gBAKgB,MAAM~~;;;;;;;;;;gBASN~~,MAAM~~;;;;;;;;;IAWzD~~,UAAU;IAsCV,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IA2C1C;;;;;OAKG;IACG,mBAAmB,CAAC,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BtE;;OAEG;IACG,WAAW;cAGqB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;IAGzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAwBX,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cASF,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;IAO9D;;OAEG;IACG,oBAAoB;;;;;IAwBpB,eAAe,CAAC,OAAO,EAAE,MAAM;IA6C/B,wBAAwB,CAAC,KAAK,EAAE;QACpC,QAAQ,EAAE,MAAM,CAAA;QAChB,UAAU,EAAE,MAAM,CAAA;QAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACjC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAC/B,iBAAiB,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;QAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,aAAa,CAAC,EAAE,MAAM,CAAA;KACvB;;;;;;;;;;;;;;;;;;;;;IA2BK,wBAAwB,CAAC,KAAK,EAAE;QACpC,EAAE,EAAE,MAAM,CAAA;QACV,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;QAC3B,YAAY,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;QAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAC5B;;;;;;;;;;;;;;;;;;IAYK,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKxE,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;;IAyB7D,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAUtE,SAAS,CAAC,KAAK,EAAE;QACrB,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KACnC;CA2CF;AAED,eAAe,mBAAmB,CAAA"}
1	+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../../src/modules/paypal/service.ts"],"names":[],"mappings":"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"}

package/.medusa/server/src/modules/paypal/service.js CHANGED Viewed

@@ -160,7 +160,12 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
         return {
             clientId: creds.client_id || creds.clientId || undefined,
             clientSecret: creds.client_secret || creds.clientSecret || undefined,
-            sellerMerchantId: creds.seller_merchant_id || creds.sellerMerchantId || undefined,
+            sellerMerchantId: creds.seller_merchant_id ||
+                creds.sellerMerchantId ||
+                creds.payer_id ||
+                creds.merchant_id ||
+                creds.merchantId ||
+                undefined,
             sellerEmail: creds.seller_email || creds.sellerEmail || undefined,
         };
     }
@@ -191,14 +196,21 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
                     obj.email_address,
                     obj.account_email,
                     obj.contact_email,
+                    obj.value,
+                    obj.address,
                 ];
                 queue.push(...prioritized);
                 for (const [k, v] of Object.entries(obj)) {
                     const key = String(k).toLowerCase();
-                    if (key.includes("email")) {
+                    if (key.includes("email") || key.includes("address")) {
                         queue.push(v);
                     }
                 }
+                // Fallback: traverse nested values so shapes like
+                // { email_address: { value: "seller@example.com" } }
+                // or { email: { address: "seller@example.com" } }
+                // are still detected.
+                queue.push(...Object.values(obj));
             }
         }
         return null;
@@ -232,6 +244,121 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
         }
         return json;
     }
+    async getAppAccessTokenForCredentials(env, credentials) {
+        const baseUrl = env === "live" ? "https://api-m.paypal.com" : "https://api-m.sandbox.paypal.com";
+        const basic = Buffer.from(`${credentials.clientId}:${credentials.clientSecret}`).toString("base64");
+        const body = new URLSearchParams();
+        body.set("grant_type", "client_credentials");
+        const res = await fetch(`${baseUrl}/v1/oauth2/token`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/x-www-form-urlencoded",
+                Authorization: `Basic ${basic}`,
+            },
+            body,
+        });
+        const text = await res.text().catch(() => "");
+        let json = {};
+        try {
+            json = text ? JSON.parse(text) : {};
+        }
+        catch (e) {
+            console.warn("[PayPal] Failed to parse app token response JSON:", e?.message);
+        }
+        if (!res.ok) {
+            throw new Error(`PayPal client_credentials failed (${res.status}): ${text || JSON.stringify(json)}`);
+        }
+        const accessToken = String(json.access_token || "");
+        if (!accessToken) {
+            throw new Error("PayPal client_credentials succeeded but access_token is missing.");
+        }
+        return { accessToken, tokenPayload: json };
+    }
+    async fetchSellerProfileFromDirectCredentials(env, credentials) {
+        const baseUrl = env === "live" ? "https://api-m.paypal.com" : "https://api-m.sandbox.paypal.com";
+        const partnerMerchantId = await this.getPartnerMerchantId(env);
+        let tokenPayload = null;
+        let accessToken = "";
+        if (credentials) {
+            const tokenResp = await this.getAppAccessTokenForCredentials(env, {
+                clientId: credentials.clientId,
+                clientSecret: credentials.clientSecret,
+            });
+            accessToken = tokenResp.accessToken;
+            tokenPayload = tokenResp.tokenPayload;
+        }
+        else {
+            accessToken = await this.getAppAccessToken();
+        }
+        let sellerEmail = this.extractSellerEmail(tokenPayload || undefined);
+        let sellerMerchantId = String(tokenPayload?.merchant_id || tokenPayload?.payer_id || tokenPayload?.account_id || "").trim() || null;
+        try {
+            const userInfoResp = await fetch(`${baseUrl}/v1/identity/oauth2/userinfo?schema=paypalv1`, {
+                method: "GET",
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "Content-Type": "application/json",
+                    Accept: "application/json",
+                },
+            });
+            if (userInfoResp.ok) {
+                const userInfo = await userInfoResp.json().catch(() => ({}));
+                sellerEmail = sellerEmail || this.extractSellerEmail(userInfo);
+                sellerMerchantId =
+                    sellerMerchantId ||
+                        String(userInfo?.merchant_id || userInfo?.payer_id || userInfo?.user_id || userInfo?.sub || "").trim() ||
+                        null;
+            }
+        }
+        catch (e) {
+            console.warn("[PayPal] userinfo lookup failed:", e?.message || e);
+        }
+        if (partnerMerchantId) {
+            try {
+                const credsResp = await fetch(`${baseUrl}/v1/customer/partners/${encodeURIComponent(partnerMerchantId)}/merchant-integrations/credentials/`, {
+                    method: "GET",
+                    headers: {
+                        Authorization: `Bearer ${accessToken}`,
+                        "Content-Type": "application/json",
+                    },
+                });
+                if (credsResp.ok) {
+                    const credsJson = await credsResp.json().catch(() => ({}));
+                    sellerEmail = sellerEmail || this.extractSellerEmail(credsJson);
+                    sellerMerchantId = sellerMerchantId || String(credsJson?.merchant_id || "").trim() || null;
+                }
+            }
+            catch (e) {
+                console.warn("[PayPal] direct credential profile lookup failed:", e?.message || e);
+            }
+        }
+        const hydrated = await this.hydrateSellerMetadataFromCredentials(env, {
+            accessToken,
+            sellerMerchantId,
+            sellerEmail,
+        });
+        return {
+            sellerMerchantId: hydrated.sellerMerchantId,
+            sellerEmail: hydrated.sellerEmail,
+        };
+    }
+    async hydrateSellerMetadataFromCredentials(env, input) {
+        let sellerMerchantId = (input.sellerMerchantId || "").trim() || null;
+        let sellerEmail = (input.sellerEmail || "").trim() || null;
+        if (!sellerEmail && input.metadataCandidates?.length) {
+            sellerEmail = this.extractSellerEmail(...input.metadataCandidates);
+        }
+        if (sellerMerchantId && !sellerEmail) {
+            try {
+                const details = await this.fetchMerchantIntegrationDetails(env, sellerMerchantId, input.accessToken);
+                sellerEmail = this.extractSellerEmail(details);
+            }
+            catch (e) {
+                console.warn("[PayPal] merchant integration lookup failed:", e?.message || e);
+            }
+        }
+        return { sellerMerchantId, sellerEmail };
+    }
     async syncRowFieldsFromMetadata(row, env) {
         const c = this.getEnvCreds(row, env);
         await this.updatePayPalConnections({
@@ -524,19 +651,21 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
         if (!credRes.ok) {
             throw new Error(`PayPal credentials fetch failed (${credRes.status}): ${credText || JSON.stringify(credJson)}`);
         }
-        const clientId = String(credJson.client_id || "");
-        const clientSecret = String(credJson.client_secret || "");
+        const clientId = String(credJson.client_id || credJson.clientId || "");
+        const clientSecret = String(credJson.client_secret || credJson.clientSecret || "");
         if (!clientId || !clientSecret) {
             throw new Error(`PayPal credentials response missing client_id/client_secret. Keys: ${Object.keys(credJson || {}).join(", ")}`);
         }
         let sellerEmail = this.extractSellerEmail(credJson, tokenJson);
-        let sellerMerchantId = String(credJson.merchant_id || tokenJson.merchant_id || tokenJson.payer_id || "").trim() || null;
+        let sellerMerchantId = String(credJson.payer_id || credJson.merchant_id || tokenJson.payer_id || tokenJson.merchant_id || "").trim() ||
+            null;
         if (!sellerEmail) {
             // Use all available merchant/payer ID candidates from the token and credential responses
             const merchantCandidates = [
+                String(credJson.payer_id || "").trim(),
                 String(credJson.merchant_id || "").trim(),
-                String(tokenJson.merchant_id || "").trim(),
                 String(tokenJson.payer_id || "").trim(),
+                String(tokenJson.merchant_id || "").trim(),
             ].filter(Boolean).filter((v, i, arr) => arr.indexOf(v) === i);
             for (const merchantId of merchantCandidates) {
                 try {
@@ -560,55 +689,43 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
             sellerMerchantId,
             sellerEmail,
         });
-        // 5) Post-save email lookup via tracking_id (sharedId).
-        //    PayPal's partner list endpoint accepts tracking_id and returns the full
-        //    merchant record including primary_email — works even when merchant_id
-        //    and payer_id are absent from token/credential responses (common in sandbox).
-        if (!sellerEmail && input.sharedId) {
+        // 5) Post-save email lookup via merchant_id.
+        //    Some partner accounts do not have permission to query by tracking_id,
+        //    so we only rely on merchant integration detail lookup.
+        if (!sellerEmail && sellerMerchantId) {
             try {
                 const appAccessToken = await this.getAppAccessToken();
-                const { onboarding: onboardingCfg } = await this.ensureSettingsDefaults();
-                const trackingRes = await fetch(`${baseUrl}/v1/customer/partners/${encodeURIComponent(partnerMerchantId)}/merchant-integrations?tracking_id=${encodeURIComponent(input.sharedId)}`, {
-                    method: "GET",
-                    headers: {
-                        "Content-Type": "application/json",
-                        Authorization: `Bearer ${appAccessToken}`,
-                        ...(onboardingCfg.bn_code ? { "PayPal-Partner-Attribution-Id": onboardingCfg.bn_code } : {}),
-                    },
-                });
-                if (trackingRes.ok) {
-                    const trackingJson = await trackingRes.json().catch(() => ({}));
-                    sellerEmail = this.extractSellerEmail(trackingJson);
-                    const foundMerchantId = String(trackingJson.merchant_id || "").trim();
-                    if (foundMerchantId) {
-                        sellerMerchantId = sellerMerchantId || foundMerchantId;
-                    }
-                    if (!sellerEmail && foundMerchantId) {
-                        const details = await this.fetchMerchantIntegrationDetails(env, foundMerchantId, appAccessToken);
-                        sellerEmail = this.extractSellerEmail(details);
-                    }
-                    if (sellerEmail || sellerMerchantId) {
-                        await this.saveSellerCredentials({ clientId, clientSecret, sellerMerchantId, sellerEmail });
-                    }
-                }
-                else {
-                    console.warn(`[PayPal] tracking_id lookup failed (${trackingRes.status})`);
+                const details = await this.fetchMerchantIntegrationDetails(env, sellerMerchantId, appAccessToken);
+                sellerEmail = this.extractSellerEmail(details);
+                if (sellerEmail) {
+                    await this.saveSellerCredentials({ clientId, clientSecret, sellerMerchantId, sellerEmail });
                 }
             }
             catch (e) {
-                console.warn("[PayPal] Post-save tracking_id email lookup failed:", e?.message || e);
+                console.warn("[PayPal] Post-save merchant_id email lookup failed:", e?.message || e);
             }
         }
     }
     async saveSellerCredentials(input) {
         const row = await this.getCurrentRow();
-        const env = await this.getCurrentEnvironment();
+        const currentEnv = await this.getCurrentEnvironment();
+        const env = (input.environment || currentEnv);
         const encryptedSecret = this.maybeEncryptSecret(input.clientSecret);
+        const existingCreds = row ? this.getEnvCreds(row, env) : {};
+        const nextSellerMerchantId = (input.sellerMerchantId || "").trim() || existingCreds.sellerMerchantId || row?.seller_merchant_id || null;
+        const nextSellerEmail = (input.sellerEmail || "").trim() || existingCreds.sellerEmail || row?.seller_email || null;
         const nextCreds = {
             client_id: input.clientId,
+            clientId: input.clientId,
             client_secret: encryptedSecret,
-            seller_merchant_id: (input.sellerMerchantId || "").trim() || null,
-            seller_email: (input.sellerEmail || "").trim() || null,
+            clientSecret: encryptedSecret,
+            merchantId: nextSellerMerchantId,
+            merchant_id: nextSellerMerchantId,
+            payer_id: nextSellerMerchantId,
+            seller_merchant_id: nextSellerMerchantId,
+            sellerMerchantId: nextSellerMerchantId,
+            seller_email: nextSellerEmail,
+            sellerEmail: nextSellerEmail,
         };
         if (!row) {
             const created = await this.createPayPalConnections({
@@ -616,8 +733,8 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
                 status: "connected",
                 seller_client_id: input.clientId,
                 seller_client_secret: encryptedSecret,
-                seller_merchant_id: nextCreds.seller_merchant_id,
-                seller_email: nextCreds.seller_email,
+                seller_merchant_id: nextSellerMerchantId,
+                seller_email: nextSellerEmail,
                 app_access_token: null,
                 app_access_token_expires_at: null,
                 metadata: {
@@ -645,8 +762,8 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
             status: "connected",
             seller_client_id: input.clientId,
             seller_client_secret: encryptedSecret,
-            seller_merchant_id: nextCreds.seller_merchant_id,
-            seller_email: nextCreds.seller_email,
+            seller_merchant_id: nextSellerMerchantId,
+            seller_email: nextSellerEmail,
             app_access_token: null,
             app_access_token_expires_at: null,
             metadata: {
@@ -662,6 +779,37 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
         await this.ensureWebhookRegistration();
         return updated;
     }
+    async saveAndHydrateSellerCredentials(input) {
+        const env = (input.environment || (await this.getCurrentEnvironment()));
+        await this.saveSellerCredentials({
+            clientId: input.clientId,
+            clientSecret: input.clientSecret,
+            environment: env,
+        });
+        try {
+            const hydrated = await this.fetchSellerProfileFromDirectCredentials(env, {
+                clientId: input.clientId,
+                clientSecret: input.clientSecret,
+            });
+            if (hydrated.sellerEmail || hydrated.sellerMerchantId) {
+                await this.saveSellerCredentials({
+                    clientId: input.clientId,
+                    clientSecret: input.clientSecret,
+                    sellerMerchantId: hydrated.sellerMerchantId,
+                    sellerEmail: hydrated.sellerEmail,
+                    environment: env,
+                });
+            }
+            const refreshedRow = await this.getCurrentRow();
+            if (refreshedRow) {
+                await this.syncRowFieldsFromMetadata(refreshedRow, env);
+            }
+        }
+        catch (e) {
+            console.warn("[PayPal] saveAndHydrateSellerCredentials lookup failed:", e?.message || e);
+        }
+        return await this.getStatus(env);
+    }
     async resolveWebhookUrl() {
         const { onboarding } = await this.ensureSettingsDefaults();
         const base = String(onboarding.backend_url || "").replace(/\/$/, "");
@@ -822,7 +970,41 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
         }
         const c = this.getEnvCreds(row, env);
         const hasCreds = !!(c.clientId && c.clientSecret);
-        const sellerEmail = c.sellerEmail || row.seller_email || null;
+        let sellerEmail = c.sellerEmail || row.seller_email || null;
+        let sellerMerchantId = c.sellerMerchantId || row.seller_merchant_id || null;
+        let decryptedSecret = null;
+        if (c.clientSecret) {
+            try {
+                decryptedSecret = this.maybeDecryptSecret(c.clientSecret);
+            }
+            catch (e) {
+                console.warn("[PayPal] Unable to decrypt seller client secret for status sync:", e?.message || e);
+            }
+        }
+        if (!sellerEmail && hasCreds) {
+            try {
+                const hydrated = await this.fetchSellerProfileFromDirectCredentials(env);
+                if (hydrated.sellerEmail || hydrated.sellerMerchantId) {
+                    await this.saveSellerCredentials({
+                        clientId: c.clientId,
+                        clientSecret: decryptedSecret || c.clientSecret,
+                        sellerMerchantId: hydrated.sellerMerchantId || sellerMerchantId,
+                        sellerEmail: hydrated.sellerEmail || sellerEmail,
+                        environment: env,
+                    });
+                    const refreshedRow = await this.getCurrentRow();
+                    if (refreshedRow) {
+                        const refreshedCreds = this.getEnvCreds(refreshedRow, env);
+                        sellerEmail = refreshedCreds.sellerEmail || refreshedRow.seller_email || sellerEmail;
+                        sellerMerchantId =
+                            refreshedCreds.sellerMerchantId || refreshedRow.seller_merchant_id || sellerMerchantId;
+                    }
+                }
+            }
+            catch (e) {
+                console.warn("[PayPal] status direct credential lookup failed:", e?.message || e);
+            }
+        }
         return {
             environment: env,
             status: (hasCreds ? "connected" : "disconnected"),
@@ -831,6 +1013,7 @@ class PayPalModuleService extends (0, utils_1.MedusaService)({
             seller_client_id_present: hasCreds,
             seller_client_id_masked: this.maskValue(c.clientId),
             seller_client_secret_masked: c.clientSecret ? "••••••••" : null,
+            seller_merchant_id: sellerMerchantId,
             seller_email: sellerEmail,
             updated_at: row.updated_at?.toISOString?.() ?? null,
         };