@ethlete/query 6.0.0-next.26 → 6.0.0-next.27

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ethlete/query
 
+## 6.0.0-next.27
+
+### Patch Changes
+
+- [#3046](https://github.com/ethlete-io/ethdk/pull/3046) [`291e8a9`](https://github.com/ethlete-io/ethdk/commit/291e8a9c6ecb9c51c191b4ed6e40d41465ff4cfa) Thanks [@github-actions](https://github.com/apps/github-actions)! - Secure queries executed after `setTokens()` (SSO/OIDC callbacks, native shells) no longer wait forever - they now also proceed once `executionState` reports a successful token seed.
+
 ## 6.0.0-next.26
 
 ### Minor Changes

package/fesm2022/ethlete-query.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { DestroyRef, InjectionToken, inject, Injector, EnvironmentInjector, ElementRef, ErrorHandler, createEnvironmentInjector, effect, untracked, signal, linkedSignal, computed, runInInjectionContext, isDevMode, PLATFORM_ID, resource, DOCUMENT, makeEnvironmentProviders, assertInInjectionContext, provideEnvironmentInitializer, ChangeDetectorRef, ViewContainerRef, TemplateRef, Input, Directive, input, Pipe, ViewEncapsulation, Component, NgZone } from '@angular/core';
 import { defineStaticProvider, RuntimeError, clamp, randomId, defineRootProvider, isObject, injectUnsavedChangesCoordinator, injectRoute, getCookie, getDomain, setCookie, deleteCookie, createDestroy, computedTillTruthy, defineProvider, toProvideFn, toInjectFn, nextFrame, injectQueryParams, injectQueryParamChanges, clone, equal, ET_PROPERTY_REMOVED, previousSignalValue } from '@ethlete/core';
-import { filter, Subject, Subscription, defer, throwError, timer, switchMap, tap, retry, catchError, take, of, firstValueFrom, merge, fromEvent, throttleTime, interval, combineLatest, map, Observable, takeUntil, startWith, pairwise, BehaviorSubject, ReplaySubject, shareReplay, skip, takeWhile, EMPTY, withLatestFrom, debounceTime } from 'rxjs';
+import { filter, Subject, Subscription, defer, throwError, timer, switchMap, tap, retry, catchError, take, of, merge, firstValueFrom, fromEvent, throttleTime, interval, combineLatest, map, Observable, takeUntil, startWith, pairwise, BehaviorSubject, ReplaySubject, shareReplay, skip, takeWhile, EMPTY, withLatestFrom, debounceTime } from 'rxjs';
 import { HttpClient, HttpEventType, HttpErrorResponse, HttpHeaders, HttpStatusCode } from '@angular/common/http';
 import { toObservable, takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { getActiveConsumer, setActiveConsumer } from '@angular/core/primitives/signals';
@@ -3780,6 +3780,13 @@ const createSecureExecuteFactory = (options) => {
             return currentError?.code === 401;
         }), take(1), tap(() => exec(execArgsWithDefaults)))
             .subscribe();
+        // `setTokens()` seeds an auth session from outside the query registry (an SSO/OIDC callback, a
+        // native shell) - no query ever runs for `latestExecutedQuery` to report, so a successful token
+        // seed is treated as an auth query that already resolved.
+        if (options.authProvider.executionState()?.type === 'tokenSeed') {
+            authAndExecWhenTokenReady(execArgsWithDefaults);
+            return;
+        }
         const latestQuery = options.authProvider.latestExecutedQuery();
         const authQuery = latestQuery?.snapshot;
         // This might happen if a secure query gets executed while the auth query has just been created.
@@ -3787,10 +3794,9 @@ const createSecureExecuteFactory = (options) => {
         const isAuthQueryFreshlyExecuted = authQuery?.lastTimeExecutedAt() === null;
         if (!authQuery || authQuery.loading() || isAuthQueryFreshlyExecuted) {
             options.state.loading.set({ executeTime: Date.now(), progress: null });
-            authQuerySubscription = toObservable(options.authProvider.latestExecutedQuery, {
+            const latestExecutedQuery$ = toObservable(options.authProvider.latestExecutedQuery, {
                 injector: options.deps.injector,
-            })
-                .pipe(switchMap((latestQuery) => {
+            }).pipe(switchMap((latestQuery) => {
                 if (!latestQuery)
                     return of(null);
                 const query = latestQuery.snapshot;
@@ -3804,8 +3810,14 @@ const createSecureExecuteFactory = (options) => {
                         authAndExecWhenTokenReady(execArgsWithDefaults);
                     }
                 }));
-            }))
-                .subscribe();
+            }));
+            // A `setTokens()` call that lands while this is already waiting (e.g. the SSO redirect
+            // resolves after this secure query mounted) never touches `latestExecutedQuery` either -
+            // wake up on `executionState` becoming a token seed too.
+            const tokenSeed$ = toObservable(options.authProvider.executionState, {
+                injector: options.deps.injector,
+            }).pipe(filter((state) => state?.type === 'tokenSeed'), take(1), tap(() => authAndExecWhenTokenReady(execArgsWithDefaults)));
+            authQuerySubscription = merge(latestExecutedQuery$, tokenSeed$).subscribe();
         }
         else if (authQuery.response()) {
             authAndExecWhenTokenReady(execArgsWithDefaults);