From 0309befdaee433911cc7d6b8d04e8c14252d3b06 Mon Sep 17 00:00:00 2001
From: maxwelly-stripe <139278188+maxwelly-stripe@users.noreply.github.com>
Date: Fri, 8 Dec 2023 13:49:06 -0800
Subject: [PATCH] User reports network failure to load Stripe.js fails again
 after network is restored (#518)

* fix stripe promise reload

* remove whitespace

* yarn prettier

* don't wrap error in new Error

* pr feedback

* prettier

* remove event listeners

* pr feedback

* add onloadlistener and onerror listener

* add onLoadListener and onErrorListener
---
 src/shared.ts | 56 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/shared.ts b/src/shared.ts
index 39b74d77..26111df8 100644
--- a/src/shared.ts
+++ b/src/shared.ts
@@ -64,6 +64,26 @@ const registerWrapper = (stripe: any, startTime: number): void => {
 
 let stripePromise: Promise<StripeConstructor | null> | null = null;
 
+let onErrorListener: (() => void) | null = null;
+let onLoadListener: (() => void) | null = null;
+
+const onError = (reject: (reason?: any) => void) => () => {
+  reject(new Error('Failed to load Stripe.js'));
+};
+
+const onLoad = (
+  resolve: (
+    value: StripeConstructor | PromiseLike<StripeConstructor | null> | null
+  ) => void,
+  reject: (reason?: any) => void
+) => () => {
+  if (window.Stripe) {
+    resolve(window.Stripe);
+  } else {
+    reject(new Error('Stripe.js not available'));
+  }
+};
+
 export const loadScript = (
   params: null | LoadParams
 ): Promise<StripeConstructor | null> => {
@@ -96,26 +116,36 @@ export const loadScript = (
         console.warn(EXISTING_SCRIPT_MESSAGE);
       } else if (!script) {
         script = injectScript(params);
+      } else if (
+        script &&
+        onLoadListener !== null &&
+        onErrorListener !== null
+      ) {
+        // remove event listeners
+        script.removeEventListener('load', onLoadListener);
+        script.removeEventListener('error', onErrorListener);
+
+        // if script exists, but we are reloading due to an error,
+        // reload script to trigger 'load' event
+        script.parentNode?.removeChild(script);
+        script = injectScript(params);
       }
 
-      script.addEventListener('load', () => {
-        if (window.Stripe) {
-          resolve(window.Stripe);
-        } else {
-          reject(new Error('Stripe.js not available'));
-        }
-      });
-
-      script.addEventListener('error', () => {
-        reject(new Error('Failed to load Stripe.js'));
-      });
+      onLoadListener = onLoad(resolve, reject);
+      onErrorListener = onError(reject);
+      script.addEventListener('load', onLoadListener);
+
+      script.addEventListener('error', onErrorListener);
     } catch (error) {
       reject(error);
       return;
     }
   });
-
-  return stripePromise;
+  // Resets stripePromise on error
+  return stripePromise.catch((error) => {
+    stripePromise = null;
+    return Promise.reject(error);
+  });
 };
 
 export const initStripe = (