@dereekb/dbx-core 5.3.0 → 7.0.1

package/fesm2020/dereekb-dbx-core.mjs

@@ -5,7 +5,7 @@ import { switchMap, first, BehaviorSubject, combineLatest, distinctUntilChanged,
 import * as i1$5 from '@dereekb/rxjs';
 import { SubscriptionObject, LockSet, filterMaybe, LoadingStateType, beginLoading, idleLoadingState, errorResult, successResult, scanCount, combineLatestFromMapValuesObsFn, workFactory, emitDelayObs, asObservable, returnIfIs, skipFirstMaybe, onFalseToTrue, onTrueToFalse, setContainsAllValuesFrom, FilterSourceInstance, FilterSource, FilterSourceConnector, FilterMap } from '@dereekb/rxjs';
 import * as i1$6 from '@dereekb/util';
-import { isDefinedAndNotFalse, hasValueOrNotEmpty, BooleanStringKeyArrayUtilityInstance, reduceBooleansWithOrFn, getValueFromGetter, toReadableError, isGetter, setIncludesFunction, maybeSet, isAllowed, expandTreeFunction, flattenTreeToArrayFunction, expandFlattenTreeFunction, mergeArrays, filterMaybeValues, mergeObjects, mergeArrayOrValueIntoArray, makePromiseFullRef, DataIsExpiredError, DataDoesNotExistError, filterMaybeValuesFn, StorageObjectUtility, SHARED_MEMORY_STORAGE } from '@dereekb/util';
+import { isDefinedAndNotFalse, hasValueOrNotEmpty, BooleanStringKeyArrayUtilityInstance, reduceBooleansWithOrFn, getValueFromGetter, toReadableError, isGetter, setIncludes, maybeSet, isAllowed, expandTreeFunction, flattenTreeToArrayFunction, expandFlattenTreeFunction, mergeArrays, filterMaybeValues, mergeObjects, mergeArrayOrValueIntoArray, makePromiseFullRef, DataIsExpiredError, DataDoesNotExistError, filterMaybeValuesFn, StorageObjectUtility, SHARED_MEMORY_STORAGE } from '@dereekb/util';
 import { ComponentStore } from '@ngrx/component-store';
 import { CommonModule, formatDate } from '@angular/common';
 import * as i1$3 from '@ngrx/effects';
@@ -1705,7 +1705,8 @@ function makeAuthTransitionHook(config) {
                 else {
                     resultObs = of(redirectTo);
                 }
-                redirectToObs = resultObs.pipe(map((stateRef) => {
+                redirectToObs = resultObs.pipe(map((inputStateRef) => {
+                    const stateRef = asSegueRef(inputStateRef);
                     let redirectTarget;
                     let redirectParams;
                     if (stateRef) {
@@ -1733,7 +1734,8 @@ function makeAuthTransitionHook(config) {
                 }
             }
             else {
-                return of($state.target(asSegueRefString(decision.ref), decision.refParams, decision.refOptions));
+                const segueRef = asSegueRef(decision);
+                return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams, segueRef.refOptions));
             }
         }), catchError((x) => {
             console.warn('Encountered error in auth transition hook.', x);
@@ -1814,8 +1816,7 @@ function enableHasAuthRoleHook(transitionService, config) {
             const targetState = transition.targetState();
             const data = targetState.state().data;
             const requiredRoles = new Set(data.authRoles);
-            const setIncludes = setIncludesFunction(requiredRoles, data.authRolesMode);
-            return authService.authUserState$.pipe(map((x) => setIncludes(x)));
+            return authService.authRoles$.pipe(map((x) => setIncludes(x, requiredRoles, data.authRolesMode)));
         }
     });
     // Register the "requires auth" hook with the TransitionsService
@@ -1843,8 +1844,8 @@ function enableHasAuthStateHook(transitionService, config) {
             const targetState = transition.targetState();
             const data = targetState.state().data;
             const config = toHasAuthStateObjectConfig(data.authStates);
-            const parsed = toParsedHasAuthStateConfig(config);
-            return authService.authUserState$.pipe(map((x) => isAllowed(x, parsed)));
+            const allowedStates = toParsedHasAuthStateConfig(config);
+            return authService.authUserState$.pipe(map((x) => isAllowed(x, allowedStates)));
         }
     });
     // Register the "requires auth" hook with the TransitionsService