Move error handling to after the param formatting

paypal · May 3, 2024 · 9663659 · 9663659
1 parent f6511f9
commit 9663659
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/paypal-js/src/load-script.ts b/packages/paypal-js/src/load-script.ts
@@ -17,14 +17,14 @@ export function loadScript(
     // resolve with null when running in Node or Deno
     if (typeof document === "undefined") return PromisePonyfill.resolve(null);
 
-    if (!options.clientId) {
+    const { url, attributes, queryParams } = processOptions(options);
+
+    if (!queryParams["client-id"]) {
         throw new Error(
             `Expected clientId in options object: ${JSON.stringify(options)}`
         );
     }
 
-    const { url, attributes } = processOptions(options);
-
     const namespace = attributes["data-namespace"] || "paypal";
     const existingWindowNamespace = getPayPalWindowNamespace(namespace);
 

diff --git a/packages/paypal-js/src/utils.ts b/packages/paypal-js/src/utils.ts
@@ -65,6 +65,7 @@ export function insertScriptElement({
 export function processOptions(options: PayPalScriptOptions): {
     url: string;
     attributes: StringMap;
+    queryParams: StringMap;
 } {
     const { environment } = options;
     // Keeping production as default to maintain backward compatibility.
@@ -121,6 +122,7 @@ export function processOptions(options: PayPalScriptOptions): {
     return {
         url: `${sdkBaseUrl}?${objectToQueryString(queryParams)}`,
         attributes,
+        queryParams,
     };
 }