Add a timeout to solve promise resolving problem (#221)

ReachFive · Jan 18, 2024 · c52fff6 · c52fff6
1 parent cfa1f18
commit c52fff6
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/oAuthClient.ts b/src/main/oAuthClient.ts
@@ -649,11 +649,16 @@ export default class OAuthClient {
       ...params
     })
     if(auth.useWebMessage) {
-      return this.getWebMessage(
-        `${this.passwordlessVerifyUrl}?${queryString}`,
-        this.config.baseUrl,
-        auth.redirectUri
+      const timeout = (delay: number): Promise<void> => new Promise((resolve) => setTimeout(() => resolve(), delay))
+      const promiseGetWebMessage: Promise<void> = this.getWebMessage(
+          `${this.passwordlessVerifyUrl}?${queryString}`,
+          this.config.baseUrl,
+          auth.redirectUri
       ).then()
+        return Promise.race([
+          promiseGetWebMessage,
+          timeout(1000)
+        ])
     } else {
       window.location.assign(`${this.passwordlessVerifyUrl}?${queryString}`)
       return Promise.resolve()