Fallback to & delimiter

Author: naderchehab

src/lib/appSwitchResume.js

@@ -27,13 +27,18 @@ function getParamsFromHashFragment(): { [string]: string } {
     return {};
   }
 
+  // Check for ? delimiter first (e.g. #payment?token=...)
   const questionMarkIndex = hashString.indexOf("?");
   if (questionMarkIndex !== -1) {
     const queryString = hashString.slice(questionMarkIndex + 1);
-    return Object.fromEntries(
-      // eslint-disable-next-line compat/compat
-      new URLSearchParams(queryString)
-    );
+    return Object.fromEntries(new URLSearchParams(queryString));
+  }
+
+  // Fallback to & delimiter (e.g. #payment&token=...)
+  const ampersandIndex = hashString.indexOf("&");
+  if (ampersandIndex !== -1) {
+    const queryString = hashString.slice(ampersandIndex + 1);
+    return Object.fromEntries(new URLSearchParams(queryString));
   }
 
   return {};

src/lib/appSwithResume.test.js

@@ -184,6 +184,24 @@ describe("app switch resume flow", () => {
     expect(isAppSwitchResumeFlow()).toEqual(true);
   });
 
+  test("should extract resume params when hash uses & delimiter instead of ?", () => {
+    // Real-world case: URL like /ppcp-js-sdk?clientSideDelay=0#payment&token=...&PayerID=...
+    vi.spyOn(window, "location", "get").mockReturnValue({
+      hash: `#payment&token=${orderID}&PayerID=PP-payer-122&button_session_id=${buttonSessionID}`,
+      search: "?clientSideDelay=0&serverSideDelay=0",
+    });
+
+    const params = getAppSwitchResumeParams();
+
+    expect(params).toEqual({
+      buttonSessionID,
+      checkoutState: "onApprove",
+      orderID,
+      payerID: "PP-payer-122",
+    });
+    expect(isAppSwitchResumeFlow()).toEqual(true);
+  });
+
   test("should extract vault resume params from hash fragment", () => {
     vi.spyOn(window, "location", "get").mockReturnValue({
       hash: `#/step3?button_session_id=${buttonSessionID}&token=${orderID}&approval_token_id=VA-3`,