fix: iframe timeout is not applied to load timer

Author: ayZagen

src/utils/iframe.ts

@@ -18,15 +18,13 @@ export function createHiddenFrame() {
 export function runIframe(url: string, options: IFrameOptions) {
   return new Promise<any>((resolve, reject) => {
     let onLoadTimeoutId: any = null
+    const timeoutMs = (options.timeout || 10) * 1000
     const iframe = createHiddenFrame()
 
-    const timeoutSetTimeoutId = setTimeout(
-      () => {
-        reject(new OIDCClientError("Timed out"))
-        removeIframe()
-      },
-      (options.timeout || 10) * 1000,
-    )
+    const timeoutSetTimeoutId = setTimeout(() => {
+      reject(new OIDCClientError("Timed out"))
+      removeIframe()
+    }, timeoutMs)
 
     const iframeEventHandler = (e: MessageEvent) => {
       if (e.origin !== options.eventOrigin) return
@@ -60,7 +58,7 @@ export function runIframe(url: string, options: IFrameOptions) {
       setTimeout(() => {
         reject(new OIDCClientError("Could not complete silent authentication", url))
         removeIframe()
-      }, 300)
+      }, timeoutMs)
 
     window.addEventListener("message", iframeEventHandler, false)
     window.document.body.appendChild(iframe)

src/utils/popup.ts

@@ -36,20 +36,18 @@ export function runPopup(url: string, options: PopupOptions) {
       window.removeEventListener("message", messageListener)
     }
 
-    timeoutId = setTimeout(
-      () => {
-        clearHandlers()
-        reject(new OIDCClientError("Timed out"))
-      },
-      options.timeout || 60 * 1000,
-    )
+    const timeoutMs = (options.timeout || 60) * 1000
+    timeoutId = setTimeout(() => {
+      clearHandlers()
+      reject(new OIDCClientError("Timed out"))
+    }, timeoutMs)
 
     closeId = setInterval(() => {
       if (popup!.closed) {
         clearHandlers()
         reject(new InteractionCancelled("user closed popup"))
       }
-    }, 300)
+    }, timeoutMs)
 
     window.addEventListener("message", messageListener)