@dereekb/dbx-core 9.5.4 → 9.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/auth/router/provider/uirouter/hook.mjs +5 -5
- package/esm2020/lib/router/router/transition/transition.rxjs.mjs +3 -3
- package/fesm2015/dereekb-dbx-core.mjs +5 -5
- package/fesm2015/dereekb-dbx-core.mjs.map +1 -1
- package/fesm2020/dereekb-dbx-core.mjs +5 -5
- package/fesm2020/dereekb-dbx-core.mjs.map +1 -1
- package/lib/auth/router/provider/uirouter/hook.d.ts +5 -1
- package/package.json +4 -4
|
@@ -7,7 +7,7 @@ import { timeoutStartWith } from '@dereekb/rxjs';
|
|
|
7
7
|
* This generates a TransitionHookFn that can be used with redirecting routes.
|
|
8
8
|
*/
|
|
9
9
|
export function makeAuthTransitionHook(config) {
|
|
10
|
-
const { defaultRedirectTarget, errorRedirectTarget = defaultRedirectTarget } = config;
|
|
10
|
+
const { defaultRedirectTarget, errorRedirectTarget = defaultRedirectTarget, timeoutTime = 1000 } = config;
|
|
11
11
|
// https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult
|
|
12
12
|
const assertIsAuthenticated = (transition) => {
|
|
13
13
|
const injector = transition.injector();
|
|
@@ -46,8 +46,8 @@ export function makeAuthTransitionHook(config) {
|
|
|
46
46
|
return redirectToObs;
|
|
47
47
|
}
|
|
48
48
|
const resultObs = decisionObs.pipe(
|
|
49
|
-
// after
|
|
50
|
-
timeoutStartWith(false,
|
|
49
|
+
// after the timeoutTime seconds of no transition working, redirect with a false decision
|
|
50
|
+
timeoutStartWith(false, timeoutTime), first(), switchMap((decision) => {
|
|
51
51
|
if (typeof decision === 'boolean') {
|
|
52
52
|
if (decision) {
|
|
53
53
|
return of(true);
|
|
@@ -61,11 +61,11 @@ export function makeAuthTransitionHook(config) {
|
|
|
61
61
|
return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams, segueRef.refOptions));
|
|
62
62
|
}
|
|
63
63
|
}), catchError((x) => {
|
|
64
|
-
console.warn(
|
|
64
|
+
console.warn(`Encountered error in auth transition hook. Attempting redirect to ${errorRedirectTarget}.`, x);
|
|
65
65
|
return of($state.target(errorRedirectTarget, { location: true })); // Redirect to home
|
|
66
66
|
}));
|
|
67
67
|
return firstValueFrom(resultObs);
|
|
68
68
|
};
|
|
69
69
|
return assertIsAuthenticated;
|
|
70
70
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../../../../../../../packages/dbx-core/src/lib/auth/router/provider/uirouter/hook.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransitionHookFn, Transition, HookResult, StateService, UIInjector, TransitionOptions, RawParams } from '@uirouter/core';\nimport { catchError, map, first, firstValueFrom, Observable, of, switchMap } from 'rxjs';\nimport { asSegueRef, asSegueRefString, SegueRefOrSegueRefRouterLink } from './../../../../router/segue';\nimport { DbxAuthService } from '../../../service/auth.service';\nimport { FactoryWithRequiredInput, getValueFromGetter, isGetter, Maybe } from '@dereekb/util';\nimport { Injector } from '@angular/core';\nimport { timeoutStartWith } from '@dereekb/rxjs';\n\n/**\n * authTransitionHookFn() configuration. The values are handled as:\n * - true: continue to the state.\n * - false: redirect to the login page.\n * - StateOrName: redirect to the target page instead.\n */\nexport type AuthTransitionDecision = true | false | SegueRefOrSegueRefRouterLink;\n\nexport interface AuthTransitionDecisionGetterInput {\n  readonly transition: Transition;\n  readonly injector: Injector;\n  readonly authService: DbxAuthService;\n}\n\nexport type AuthTransitionRedirectTarget = Observable<Maybe<SegueRefOrSegueRefRouterLink>>;\nexport type AuthTransitionRedirectTargetGetter = FactoryWithRequiredInput<AuthTransitionRedirectTarget, AuthTransitionDecisionGetterInput>;\nexport type AuthTransitionRedirectTargetOrGetter = Maybe<SegueRefOrSegueRefRouterLink> | AuthTransitionRedirectTargetGetter;\n\nexport interface AuthTransitionHookOptions {\n  /**\n   * The state to redirect the user to when their auth fails.\n   */\n  defaultRedirectTarget: string;\n\n  /**\n   * The state to redirect the user to. Defaults to defaultRedirectTarget.\n   */\n  errorRedirectTarget?: string;\n}\n\nexport interface AuthTransitionHookConfig extends AuthTransitionHookOptions {\n  /**\n   * Creates the decision observable for the transition that decides whether or not to redirect or continue.\n   */\n  makeDecisionsObs: (transition: Transition, authService: DbxAuthService, injector: UIInjector) => Observable<AuthTransitionDecision>;\n}\n\nexport interface AuthTransitionStateData {\n  /**\n   * Optional getter/decision maker when a role needs to be\n   */\n  redirectTo?: AuthTransitionRedirectTargetOrGetter;\n}\n\n/**\n * This generates a TransitionHookFn that can be used with redirecting routes.\n */\nexport function makeAuthTransitionHook(config: AuthTransitionHookConfig): TransitionHookFn {\n  const { defaultRedirectTarget, errorRedirectTarget = defaultRedirectTarget } = config;\n\n  // https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult\n  const assertIsAuthenticated: TransitionHookFn = (transition: Transition): HookResult => {\n    const injector = transition.injector();\n    const authService: DbxAuthService = injector.get(DbxAuthService);\n    const $state: StateService = transition.router.stateService;\n    const decisionObs = config.makeDecisionsObs(transition, authService, injector);\n\n    function redirectOut(): Observable<HookResult> {\n      const stateData: AuthTransitionStateData = transition.targetState().state().data;\n      const redirectTo = stateData?.redirectTo;\n\n      let redirectToObs: Observable<HookResult>;\n\n      if (redirectTo) {\n        let resultObs: Observable<Maybe<SegueRefOrSegueRefRouterLink>>;\n\n        if (isGetter<AuthTransitionRedirectTarget>(redirectTo)) {\n          resultObs = getValueFromGetter(redirectTo, { authService, injector, transition } as AuthTransitionDecisionGetterInput);\n        } else {\n          resultObs = of(redirectTo as SegueRefOrSegueRefRouterLink);\n        }\n\n        redirectToObs = resultObs.pipe(\n          map((inputStateRef: Maybe<SegueRefOrSegueRefRouterLink>) => {\n            const stateRef = asSegueRef(inputStateRef);\n\n            let redirectTarget;\n            let redirectParams;\n\n            if (stateRef) {\n              redirectTarget = stateRef.ref;\n              redirectParams = stateRef.refParams;\n            }\n\n            if (!redirectTarget) {\n              redirectTarget = defaultRedirectTarget;\n            }\n\n            return $state.target(redirectTarget, redirectParams);\n          })\n        );\n      } else {\n        redirectToObs = of($state.target(defaultRedirectTarget));\n      }\n\n      return redirectToObs;\n    }\n\n    const resultObs = decisionObs.pipe(\n      // after 10 seconds of no transition working, redirect with a false decision\n      timeoutStartWith(false as AuthTransitionDecision, 10 * 1000),\n      first(),\n      switchMap((decision: AuthTransitionDecision): Observable<HookResult> => {\n        if (typeof decision === 'boolean') {\n          if (decision) {\n            return of(true);\n          } else {\n            return redirectOut();\n          }\n        } else {\n          const segueRef = asSegueRef(decision);\n          return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams as RawParams, segueRef.refOptions as TransitionOptions));\n        }\n      }),\n      catchError((x) => {\n        console.warn('Encountered error in auth transition hook.', x);\n        return of($state.target(errorRedirectTarget, { location: true })); // Redirect to home\n      })\n    );\n\n    return firstValueFrom(resultObs) as HookResult;\n  };\n\n  return assertIsAuthenticated;\n}\n"]}
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../../../../../../../packages/dbx-core/src/lib/auth/router/provider/uirouter/hook.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransitionHookFn, Transition, HookResult, StateService, UIInjector, TransitionOptions, RawParams } from '@uirouter/core';\nimport { catchError, map, first, firstValueFrom, Observable, of, switchMap } from 'rxjs';\nimport { asSegueRef, asSegueRefString, SegueRefOrSegueRefRouterLink } from './../../../../router/segue';\nimport { DbxAuthService } from '../../../service/auth.service';\nimport { FactoryWithRequiredInput, getValueFromGetter, isGetter, Maybe, Milliseconds } from '@dereekb/util';\nimport { Injector } from '@angular/core';\nimport { timeoutStartWith } from '@dereekb/rxjs';\n\n/**\n * authTransitionHookFn() configuration. The values are handled as:\n * - true: continue to the state.\n * - false: redirect to the login page.\n * - StateOrName: redirect to the target page instead.\n */\nexport type AuthTransitionDecision = true | false | SegueRefOrSegueRefRouterLink;\n\nexport interface AuthTransitionDecisionGetterInput {\n  readonly transition: Transition;\n  readonly injector: Injector;\n  readonly authService: DbxAuthService;\n}\n\nexport type AuthTransitionRedirectTarget = Observable<Maybe<SegueRefOrSegueRefRouterLink>>;\nexport type AuthTransitionRedirectTargetGetter = FactoryWithRequiredInput<AuthTransitionRedirectTarget, AuthTransitionDecisionGetterInput>;\nexport type AuthTransitionRedirectTargetOrGetter = Maybe<SegueRefOrSegueRefRouterLink> | AuthTransitionRedirectTargetGetter;\n\nexport interface AuthTransitionHookOptions {\n  /**\n   * The state to redirect the user to when their auth fails.\n   */\n  defaultRedirectTarget: string;\n\n  /**\n   * The state to redirect the user to. Defaults to defaultRedirectTarget.\n   */\n  errorRedirectTarget?: string;\n\n  /**\n   * Timeout time for the decision obs. Defaults to 1000ms.\n   */\n  timeoutTime?: Milliseconds;\n}\n\nexport interface AuthTransitionHookConfig extends AuthTransitionHookOptions {\n  /**\n   * Creates the decision observable for the transition that decides whether or not to redirect or continue.\n   */\n  makeDecisionsObs: (transition: Transition, authService: DbxAuthService, injector: UIInjector) => Observable<AuthTransitionDecision>;\n}\n\nexport interface AuthTransitionStateData {\n  /**\n   * Optional getter/decision maker when a role needs to be\n   */\n  redirectTo?: AuthTransitionRedirectTargetOrGetter;\n}\n\n/**\n * This generates a TransitionHookFn that can be used with redirecting routes.\n */\nexport function makeAuthTransitionHook(config: AuthTransitionHookConfig): TransitionHookFn {\n  const { defaultRedirectTarget, errorRedirectTarget = defaultRedirectTarget, timeoutTime = 1000 } = config;\n\n  // https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult\n  const assertIsAuthenticated: TransitionHookFn = (transition: Transition): HookResult => {\n    const injector = transition.injector();\n    const authService: DbxAuthService = injector.get(DbxAuthService);\n    const $state: StateService = transition.router.stateService;\n    const decisionObs = config.makeDecisionsObs(transition, authService, injector);\n\n    function redirectOut(): Observable<HookResult> {\n      const stateData: AuthTransitionStateData = transition.targetState().state().data;\n      const redirectTo = stateData?.redirectTo;\n\n      let redirectToObs: Observable<HookResult>;\n\n      if (redirectTo) {\n        let resultObs: Observable<Maybe<SegueRefOrSegueRefRouterLink>>;\n\n        if (isGetter<AuthTransitionRedirectTarget>(redirectTo)) {\n          resultObs = getValueFromGetter(redirectTo, { authService, injector, transition } as AuthTransitionDecisionGetterInput);\n        } else {\n          resultObs = of(redirectTo as SegueRefOrSegueRefRouterLink);\n        }\n\n        redirectToObs = resultObs.pipe(\n          map((inputStateRef: Maybe<SegueRefOrSegueRefRouterLink>) => {\n            const stateRef = asSegueRef(inputStateRef);\n\n            let redirectTarget;\n            let redirectParams;\n\n            if (stateRef) {\n              redirectTarget = stateRef.ref;\n              redirectParams = stateRef.refParams;\n            }\n\n            if (!redirectTarget) {\n              redirectTarget = defaultRedirectTarget;\n            }\n\n            return $state.target(redirectTarget, redirectParams);\n          })\n        );\n      } else {\n        redirectToObs = of($state.target(defaultRedirectTarget));\n      }\n\n      return redirectToObs;\n    }\n\n    const resultObs = decisionObs.pipe(\n      // after the timeoutTime seconds of no transition working, redirect with a false decision\n      timeoutStartWith(false as AuthTransitionDecision, timeoutTime),\n      first(),\n      switchMap((decision: AuthTransitionDecision): Observable<HookResult> => {\n        if (typeof decision === 'boolean') {\n          if (decision) {\n            return of(true);\n          } else {\n            return redirectOut();\n          }\n        } else {\n          const segueRef = asSegueRef(decision);\n          return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams as RawParams, segueRef.refOptions as TransitionOptions));\n        }\n      }),\n      catchError((x) => {\n        console.warn(`Encountered error in auth transition hook. Attempting redirect to ${errorRedirectTarget}.`, x);\n        return of($state.target(errorRedirectTarget, { location: true })); // Redirect to home\n      })\n    );\n\n    return firstValueFrom(resultObs) as HookResult;\n  };\n\n  return assertIsAuthenticated;\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { asArray } from '@dereekb/util';
|
|
2
|
-
import { filter, map, distinctUntilChanged, shareReplay } from 'rxjs';
|
|
2
|
+
import { filter, map, distinctUntilChanged, shareReplay, startWith } from 'rxjs';
|
|
3
3
|
import { DbxRouterTransitionEventType } from './transition';
|
|
4
4
|
/**
|
|
5
5
|
* Convenience function for filtering success from the input observable.
|
|
@@ -27,9 +27,9 @@ export function isLatestSuccessfulRoute(config) {
|
|
|
27
27
|
const { dbxRouterTransitionService, dbxRouterService, activeExactly } = config;
|
|
28
28
|
const routes = asArray(config.routes);
|
|
29
29
|
const checkRoute = activeExactly ? (route) => dbxRouterService.isActiveExactly(route) : (route) => dbxRouterService.isActive(route);
|
|
30
|
-
return successTransition(dbxRouterTransitionService.transitions$).pipe(map(() => {
|
|
30
|
+
return successTransition(dbxRouterTransitionService.transitions$).pipe(startWith(undefined), map(() => {
|
|
31
31
|
const isActive = routes.findIndex(checkRoute) !== -1;
|
|
32
32
|
return isActive;
|
|
33
33
|
}), distinctUntilChanged(), shareReplay(1));
|
|
34
34
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbi5yeGpzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvZGJ4LWNvcmUvc3JjL2xpYi9yb3V0ZXIvcm91dGVyL3RyYW5zaXRpb24vdHJhbnNpdGlvbi5yeGpzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZ0IsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUF3QyxvQkFBb0IsRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBSXZILE9BQU8sRUFBNEIsNEJBQTRCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdEY7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsR0FBeUM7SUFDekUsT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUMsQ0FBQztBQUM3QyxDQUFDO0FBRUQsTUFBTSxVQUFVLHVCQUF1QjtJQUNyQyxPQUFPLHFCQUFxQixDQUFDLDRCQUE0QixDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ3JFLENBQUM7QUFFRCxNQUFNLFVBQVUscUJBQXFCLENBQUMsSUFBa0M7SUFDdEUsT0FBTyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLENBQUM7QUFDeEMsQ0FBQztBQWtCRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsTUFBcUM7SUFDM0UsTUFBTSxFQUFFLDBCQUEwQixFQUFFLGdCQUFnQixFQUFFLGFBQWEsRUFBRSxHQUFHLE1BQU0sQ0FBQztJQUMvRSxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLE1BQU0sVUFBVSxHQUFxRCxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBbUMsRUFBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQW1DLEVBQUUsRUFBRSxDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUVsUCxPQUFPLGlCQUFpQixDQUFDLDBCQUEwQixDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FDcEUsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUNwQixHQUFHLENBQUMsR0FBRyxFQUFFO1FBQ1AsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUNyRCxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDLENBQUMsRUFDRixvQkFBb0IsRUFBRSxFQUN0QixXQUFXLENBQUMsQ0FBQyxDQUFDLENBQ2YsQ0FBQztBQUNKLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBcnJheU9yVmFsdWUsIGFzQXJyYXkgfSBmcm9tICdAZGVyZWVrYi91dGlsJztcbmltcG9ydCB7IGZpbHRlciwgbWFwLCBNb25vVHlwZU9wZXJhdG9yRnVuY3Rpb24sIE9ic2VydmFibGUsIGRpc3RpbmN0VW50aWxDaGFuZ2VkLCBzaGFyZVJlcGxheSwgc3RhcnRXaXRoIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rIH0gZnJvbSAnLi4vLi4vc2VndWUnO1xuaW1wb3J0IHsgRGJ4Um91dGVyU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2Uvcm91dGVyLnNlcnZpY2UnO1xuaW1wb3J0IHsgRGJ4Um91dGVyVHJhbnNpdGlvblNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlL3JvdXRlci50cmFuc2l0aW9uLnNlcnZpY2UnO1xuaW1wb3J0IHsgRGJ4Um91dGVyVHJhbnNpdGlvbkV2ZW50LCBEYnhSb3V0ZXJUcmFuc2l0aW9uRXZlbnRUeXBlIH0gZnJvbSAnLi90cmFuc2l0aW9uJztcblxuLyoqXG4gKiBDb252ZW5pZW5jZSBmdW5jdGlvbiBmb3IgZmlsdGVyaW5nIHN1Y2Nlc3MgZnJvbSB0aGUgaW5wdXQgb2JzZXJ2YWJsZS5cbiAqXG4gKiBAcGFyYW0gb2JzXG4gKiBAcmV0dXJuc1xuICovXG5leHBvcnQgZnVuY3Rpb24gc3VjY2Vzc1RyYW5zaXRpb24ob2JzOiBPYnNlcnZhYmxlPERieFJvdXRlclRyYW5zaXRpb25FdmVudD4pOiBPYnNlcnZhYmxlPERieFJvdXRlclRyYW5zaXRpb25FdmVudD4ge1xuICByZXR1cm4gb2JzLnBpcGUoZmlsdGVyVHJhbnNpdGlvblN1Y2Nlc3MoKSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmaWx0ZXJUcmFuc2l0aW9uU3VjY2VzcygpOiBNb25vVHlwZU9wZXJhdG9yRnVuY3Rpb248RGJ4Um91dGVyVHJhbnNpdGlvbkV2ZW50PiB7XG4gIHJldHVybiBmaWx0ZXJUcmFuc2l0aW9uRXZlbnQoRGJ4Um91dGVyVHJhbnNpdGlvbkV2ZW50VHlwZS5TVUNDRVNTKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGZpbHRlclRyYW5zaXRpb25FdmVudCh0eXBlOiBEYnhSb3V0ZXJUcmFuc2l0aW9uRXZlbnRUeXBlKTogTW9ub1R5cGVPcGVyYXRvckZ1bmN0aW9uPERieFJvdXRlclRyYW5zaXRpb25FdmVudD4ge1xuICByZXR1cm4gZmlsdGVyKCh4KSA9PiB4LnR5cGUgPT09IHR5cGUpO1xufVxuXG4vKipcbiAqIGlzTGF0ZXN0U3VjY2Vzc2Z1bFJvdXRlKCkgY29uZmlnXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgSXNMYXRlc3RTdWNjZXNzZnVsUm91dGVDb25maWcge1xuICByZWFkb25seSBkYnhSb3V0ZXJUcmFuc2l0aW9uU2VydmljZTogRGJ4Um91dGVyVHJhbnNpdGlvblNlcnZpY2U7XG4gIHJlYWRvbmx5IGRieFJvdXRlclNlcnZpY2U6IERieFJvdXRlclNlcnZpY2U7XG4gIC8qKlxuICAgKiBSb3V0ZSBvciBsaXN0IG9mIHJvdXRlcyB0byBjaGVjayBpZiB0aGV5J3JlIGFjdGl2ZSBvciBub3QuXG4gICAqL1xuICByZWFkb25seSByb3V0ZXM6IEFycmF5T3JWYWx1ZTxTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rPjtcbiAgLyoqXG4gICAqIFdoZXRoZXIgb3Igbm90IHRvIG1hdGNoIHJvdXRlIGFjdGl2aXR5IGV4YWN0bHkuXG4gICAqL1xuICByZWFkb25seSBhY3RpdmVFeGFjdGx5PzogYm9vbGVhbjtcbn1cblxuLyoqXG4gKiBDcmVhdGVzIGEgbmV3IG9ic2VydmFibGUgdGhhdCB1c2VzIHRoZSBpbnB1dCBEYnhSb3V0ZXJUcmFuc2l0aW9uU2VydmljZSBhbmQgRGJ4Um91dGVyU2VydmljZSB0byBkZXRlcm1pbmUgd2hldGhlciBvciBub3QgYW55IG9mIHRoZSBjb25maWd1cmVkIHJvdXRlcyBhcmUgYWN0aXZlLlxuICpcbiAqIEBwYXJhbSBvYnNcbiAqIEBwYXJhbSBjb25maWdcbiAqIEByZXR1cm5zXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBpc0xhdGVzdFN1Y2Nlc3NmdWxSb3V0ZShjb25maWc6IElzTGF0ZXN0U3VjY2Vzc2Z1bFJvdXRlQ29uZmlnKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gIGNvbnN0IHsgZGJ4Um91dGVyVHJhbnNpdGlvblNlcnZpY2UsIGRieFJvdXRlclNlcnZpY2UsIGFjdGl2ZUV4YWN0bHkgfSA9IGNvbmZpZztcbiAgY29uc3Qgcm91dGVzID0gYXNBcnJheShjb25maWcucm91dGVzKTtcbiAgY29uc3QgY2hlY2tSb3V0ZTogKHJvdXRlOiBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rKSA9PiBib29sZWFuID0gYWN0aXZlRXhhY3RseSA/IChyb3V0ZTogU2VndWVSZWZPclNlZ3VlUmVmUm91dGVyTGluaykgPT4gZGJ4Um91dGVyU2VydmljZS5pc0FjdGl2ZUV4YWN0bHkocm91dGUpIDogKHJvdXRlOiBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rKSA9PiBkYnhSb3V0ZXJTZXJ2aWNlLmlzQWN0aXZlKHJvdXRlKTtcblxuICByZXR1cm4gc3VjY2Vzc1RyYW5zaXRpb24oZGJ4Um91dGVyVHJhbnNpdGlvblNlcnZpY2UudHJhbnNpdGlvbnMkKS5waXBlKFxuICAgIHN0YXJ0V2l0aCh1bmRlZmluZWQpLFxuICAgIG1hcCgoKSA9PiB7XG4gICAgICBjb25zdCBpc0FjdGl2ZSA9IHJvdXRlcy5maW5kSW5kZXgoY2hlY2tSb3V0ZSkgIT09IC0xO1xuICAgICAgcmV0dXJuIGlzQWN0aXZlO1xuICAgIH0pLFxuICAgIGRpc3RpbmN0VW50aWxDaGFuZ2VkKCksXG4gICAgc2hhcmVSZXBsYXkoMSlcbiAgKTtcbn1cbiJdfQ==
|
|
@@ -1709,7 +1709,7 @@ class DbxAuthService {
|
|
|
1709
1709
|
* This generates a TransitionHookFn that can be used with redirecting routes.
|
|
1710
1710
|
*/
|
|
1711
1711
|
function makeAuthTransitionHook(config) {
|
|
1712
|
-
const { defaultRedirectTarget, errorRedirectTarget = defaultRedirectTarget } = config;
|
|
1712
|
+
const { defaultRedirectTarget, errorRedirectTarget = defaultRedirectTarget, timeoutTime = 1000 } = config;
|
|
1713
1713
|
// https://ui-router.github.io/ng2/docs/latest/modules/transition.html#hookresult
|
|
1714
1714
|
const assertIsAuthenticated = (transition) => {
|
|
1715
1715
|
const injector = transition.injector();
|
|
@@ -1748,8 +1748,8 @@ function makeAuthTransitionHook(config) {
|
|
|
1748
1748
|
return redirectToObs;
|
|
1749
1749
|
}
|
|
1750
1750
|
const resultObs = decisionObs.pipe(
|
|
1751
|
-
// after
|
|
1752
|
-
timeoutStartWith(false,
|
|
1751
|
+
// after the timeoutTime seconds of no transition working, redirect with a false decision
|
|
1752
|
+
timeoutStartWith(false, timeoutTime), first(), switchMap((decision) => {
|
|
1753
1753
|
if (typeof decision === 'boolean') {
|
|
1754
1754
|
if (decision) {
|
|
1755
1755
|
return of(true);
|
|
@@ -1763,7 +1763,7 @@ function makeAuthTransitionHook(config) {
|
|
|
1763
1763
|
return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams, segueRef.refOptions));
|
|
1764
1764
|
}
|
|
1765
1765
|
}), catchError((x) => {
|
|
1766
|
-
console.warn(
|
|
1766
|
+
console.warn(`Encountered error in auth transition hook. Attempting redirect to ${errorRedirectTarget}.`, x);
|
|
1767
1767
|
return of($state.target(errorRedirectTarget, { location: true })); // Redirect to home
|
|
1768
1768
|
}));
|
|
1769
1769
|
return firstValueFrom(resultObs);
|
|
@@ -2486,7 +2486,7 @@ function isLatestSuccessfulRoute(config) {
|
|
|
2486
2486
|
const { dbxRouterTransitionService, dbxRouterService, activeExactly } = config;
|
|
2487
2487
|
const routes = asArray(config.routes);
|
|
2488
2488
|
const checkRoute = activeExactly ? (route) => dbxRouterService.isActiveExactly(route) : (route) => dbxRouterService.isActive(route);
|
|
2489
|
-
return successTransition(dbxRouterTransitionService.transitions$).pipe(map(() => {
|
|
2489
|
+
return successTransition(dbxRouterTransitionService.transitions$).pipe(startWith(undefined), map(() => {
|
|
2490
2490
|
const isActive = routes.findIndex(checkRoute) !== -1;
|
|
2491
2491
|
return isActive;
|
|
2492
2492
|
}), distinctUntilChanged(), shareReplay(1));
|