fix(auth): Fix authExchange’s retry queue ignoring teardowns (#3235)

urql-graphql · May 31, 2023 · 9bf5583 · 9bf5583
1 parent c356285
commit 9bf5583
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.changeset/weak-eagles-walk.md b/.changeset/weak-eagles-walk.md
@@ -0,0 +1,5 @@
+---
+'@urql/exchange-auth': patch
+---
+
+Fix regression that caused teardowns to be ignored by an `authExchange`’s retry queue.
diff --git a/exchanges/auth/src/authExchange.ts b/exchanges/auth/src/authExchange.ts
@@ -306,20 +306,13 @@ export function authExchange(
         return config ? config.addAuthToOperation(operation) : operation;
       }
 
-      const teardownOps$ = pipe(
-        operations$,
-        filter(operation => operation.kind === 'teardown')
-      );
-
-      const pendingOps$ = pipe(
-        operations$,
-        filter(operation => operation.kind !== 'teardown')
-      );
-
       const opsWithAuth$ = pipe(
-        merge([retries.source, pendingOps$]),
+        merge([retries.source, operations$]),
         map(operation => {
-          if (
+          if (operation.kind === 'teardown') {
+            retryQueue.delete(operation.key);
+            return operation;
+          } else if (
             operation.context._instance &&
             bypassQueue.has(operation.context._instance)
           ) {
@@ -346,7 +339,7 @@ export function authExchange(
         filter(Boolean)
       ) as Source<Operation>;
 
-      const result$ = pipe(merge([opsWithAuth$, teardownOps$]), forward);
+      const result$ = pipe(opsWithAuth$, forward);
 
       return pipe(
         result$,