@dereekb/dbx-core 5.3.0 → 7.0.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/action/directive/state/action.enforce.modified.directive.mjs +1 -1
- package/esm2020/lib/auth/router/provider/uirouter/hook.mjs +6 -4
- package/esm2020/lib/auth/router/provider/uirouter/redirect.mjs +1 -1
- package/esm2020/lib/auth/router/provider/uirouter/role.hook.mjs +3 -4
- package/esm2020/lib/auth/router/provider/uirouter/state.hook.mjs +3 -3
- package/fesm2015/dereekb-dbx-core.mjs +8 -7
- package/fesm2015/dereekb-dbx-core.mjs.map +1 -1
- package/fesm2020/dereekb-dbx-core.mjs +8 -7
- package/fesm2020/dereekb-dbx-core.mjs.map +1 -1
- package/lib/auth/router/provider/uirouter/hook.d.ts +4 -4
- package/lib/auth/router/provider/uirouter/state.hook.d.ts +2 -2
- package/package.json +4 -4
|
@@ -47,4 +47,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
|
|
|
47
47
|
type: Input,
|
|
48
48
|
args: ['dbxActionEnforceModified']
|
|
49
49
|
}] } });
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aW9uLmVuZm9yY2UubW9kaWZpZWQuZGlyZWN0aXZlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvZGJ4LWNvcmUvc3JjL2xpYi9hY3Rpb24vZGlyZWN0aXZlL3N0YXRlL2FjdGlvbi5lbmZvcmNlLm1vZGlmaWVkLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQXFCLE1BQU0sZUFBZSxDQUFDO0FBRTFFLE9BQU8sRUFBRSxlQUFlLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUM3RCxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsbUNBQW1DLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQzs7O0FBRWhGLE1BQU0sQ0FBQyxNQUFNLHlDQUF5QyxHQUFHLDZCQUE2QixDQUFDO0FBRXZGOztHQUVHO0FBSUgsTUFBTSxPQUFPLGlDQUFrQyxTQUFRLDZCQUE2QjtJQUdsRixZQUFvQyxNQUEyQztRQUM3RSxLQUFLLEVBQUUsQ0FBQztRQUQwQixXQUFNLEdBQU4sTUFBTSxDQUFxQztRQUZ2RSxhQUFRLEdBQUcsSUFBSSxlQUFlLENBQVUsSUFBSSxDQUFDLENBQUM7SUFJdEQsQ0FBQztJQUVELFFBQVE7UUFDTixJQUFJLENBQUMsR0FBRyxHQUFHLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQzthQUMvRCxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ2QsU0FBUyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsZUFBZSxDQUFDLEVBQUUsRUFBRTtZQUN6QyxNQUFNLE9BQU8sR0FBRyxlQUFlLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDN0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMseUNBQXlDLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDMUUsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRVEsV0FBVztRQUNsQixLQUFLLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6QixJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFFRCxJQUNJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDO0lBQzdCLENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxPQUE0QjtRQUN0QyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLEtBQUssS0FBSyxDQUFDLENBQUM7SUFDeEMsQ0FBQzs7OEhBN0JVLGlDQUFpQztrSEFBakMsaUNBQWlDOzJGQUFqQyxpQ0FBaUM7a0JBSDdDLFNBQVM7bUJBQUM7b0JBQ1QsUUFBUSxFQUFFLDRCQUE0QjtpQkFDdkM7OzBCQUljLElBQUk7NENBb0JiLE9BQU87c0JBRFYsS0FBSzt1QkFBQywwQkFBMEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEaXJlY3RpdmUsIEhvc3QsIElucHV0LCBPbkluaXQsIE9uRGVzdHJveSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTWF5YmUgfSBmcm9tICdAZGVyZWVrYi91dGlsJztcbmltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgY29tYmluZUxhdGVzdCwgZGVsYXkgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IEFic3RyYWN0U3Vic2NyaXB0aW9uRGlyZWN0aXZlIH0gZnJvbSAnLi4vLi4vLi4vc3Vic2NyaXB0aW9uJztcbmltcG9ydCB7IERieEFjdGlvbkNvbnRleHRTdG9yZVNvdXJjZUluc3RhbmNlIH0gZnJvbSAnLi4vLi4vYWN0aW9uLnN0b3JlLnNvdXJjZSc7XG5cbmV4cG9ydCBjb25zdCBBUFBfQUNUSU9OX0VORk9SQ0VfTU9ESUZJRURfRElSRUNUSVZFX0tFWSA9ICdkYnhfYWN0aW9uX2VuZm9yY2VfbW9kaWZpZWQnO1xuXG4vKipcbiAqIERpcmVjdGl2ZSB0aGF0IHRvZ2dsZXMgZGlzYWJsaW5nIGFuIGFjdGlvbiBpZiB0aGUgYWN0aW9uIGlzIG5vdCBtYXJrZWQgbW9kaWZpZWQuXG4gKi9cbkBEaXJlY3RpdmUoe1xuICBzZWxlY3RvcjogJ1tkYnhBY3Rpb25FbmZvcmNlTW9kaWZpZWRdJ1xufSlcbmV4cG9ydCBjbGFzcyBEYnhBY3Rpb25FbmZvcmNlTW9kaWZpZWREaXJlY3RpdmUgZXh0ZW5kcyBBYnN0cmFjdFN1YnNjcmlwdGlvbkRpcmVjdGl2ZSBpbXBsZW1lbnRzIE9uSW5pdCwgT25EZXN0cm95IHtcbiAgcHJpdmF0ZSBfZW5hYmxlZCA9IG5ldyBCZWhhdmlvclN1YmplY3Q8Ym9vbGVhbj4odHJ1ZSk7XG5cbiAgY29uc3RydWN0b3IoQEhvc3QoKSBwdWJsaWMgcmVhZG9ubHkgc291cmNlOiBEYnhBY3Rpb25Db250ZXh0U3RvcmVTb3VyY2VJbnN0YW5jZSkge1xuICAgIHN1cGVyKCk7XG4gIH1cblxuICBuZ09uSW5pdCgpOiB2b2lkIHtcbiAgICB0aGlzLnN1YiA9IGNvbWJpbmVMYXRlc3QoW3RoaXMuc291cmNlLmlzTW9kaWZpZWQkLCB0aGlzLl9lbmFibGVkXSlcbiAgICAgIC5waXBlKGRlbGF5KDApKVxuICAgICAgLnN1YnNjcmliZSgoW21vZGlmaWVkLCBlbmFibGVEaXJlY3RpdmVdKSA9PiB7XG4gICAgICAgIGNvbnN0IGRpc2FibGUgPSBlbmFibGVEaXJlY3RpdmUgJiYgIW1vZGlmaWVkO1xuICAgICAgICB0aGlzLnNvdXJjZS5kaXNhYmxlKEFQUF9BQ1RJT05fRU5GT1JDRV9NT0RJRklFRF9ESVJFQ1RJVkVfS0VZLCBkaXNhYmxlKTtcbiAgICAgIH0pO1xuICB9XG5cbiAgb3ZlcnJpZGUgbmdPbkRlc3Ryb3koKTogdm9pZCB7XG4gICAgc3VwZXIubmdPbkRlc3Ryb3koKTtcbiAgICB0aGlzLl9lbmFibGVkLmNvbXBsZXRlKCk7XG4gICAgdGhpcy5zb3VyY2UuZW5hYmxlKEFQUF9BQ1RJT05fRU5GT1JDRV9NT0RJRklFRF9ESVJFQ1RJVkVfS0VZKTtcbiAgfVxuXG4gIEBJbnB1dCgnZGJ4QWN0aW9uRW5mb3JjZU1vZGlmaWVkJylcbiAgZ2V0IGVuYWJsZWQoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuX2VuYWJsZWQudmFsdWU7XG4gIH1cblxuICBzZXQgZW5hYmxlZChlbmFibGVkOiBNYXliZTxib29sZWFuIHwgJyc+KSB7XG4gICAgdGhpcy5fZW5hYmxlZC5uZXh0KGVuYWJsZWQgIT09IGZhbHNlKTtcbiAgfVxufVxuIl19
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { catchError, map, first, firstValueFrom, of, switchMap } from 'rxjs';
|
|
2
|
-
import { asSegueRefString } from './../../../../router/segue';
|
|
2
|
+
import { asSegueRef, asSegueRefString } from './../../../../router/segue';
|
|
3
3
|
import { DbxAuthService } from '../../../service/auth.service';
|
|
4
4
|
import { getValueFromGetter, isGetter } from '@dereekb/util';
|
|
5
5
|
/**
|
|
@@ -25,7 +25,8 @@ export function makeAuthTransitionHook(config) {
|
|
|
25
25
|
else {
|
|
26
26
|
resultObs = of(redirectTo);
|
|
27
27
|
}
|
|
28
|
-
redirectToObs = resultObs.pipe(map((
|
|
28
|
+
redirectToObs = resultObs.pipe(map((inputStateRef) => {
|
|
29
|
+
const stateRef = asSegueRef(inputStateRef);
|
|
29
30
|
let redirectTarget;
|
|
30
31
|
let redirectParams;
|
|
31
32
|
if (stateRef) {
|
|
@@ -53,7 +54,8 @@ export function makeAuthTransitionHook(config) {
|
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
else {
|
|
56
|
-
|
|
57
|
+
const segueRef = asSegueRef(decision);
|
|
58
|
+
return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams, segueRef.refOptions));
|
|
57
59
|
}
|
|
58
60
|
}), catchError((x) => {
|
|
59
61
|
console.warn('Encountered error in auth transition hook.', x);
|
|
@@ -63,4 +65,4 @@ export function makeAuthTransitionHook(config) {
|
|
|
63
65
|
};
|
|
64
66
|
return assertIsAuthenticated;
|
|
65
67
|
}
|
|
66
|
-
//# 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":"AACA,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAc,EAAE,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAY,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAA4B,kBAAkB,EAAE,QAAQ,EAAS,MAAM,eAAe,CAAC;AA+C9F;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAgC;IACrE,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,GAAG,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEtF,iFAAiF;IACjF,MAAM,qBAAqB,GAAqB,CAAC,UAAsB,EAAc,EAAE;QACrF,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,WAAW,GAAmB,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACjE,MAAM,MAAM,GAAiB,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAE/E,SAAS,WAAW;YAClB,MAAM,SAAS,GAA4B,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC;YACjF,MAAM,UAAU,GAAG,SAAS,EAAE,UAAU,CAAC;YAEzC,IAAI,aAAqC,CAAC;YAE1C,IAAI,UAAU,EAAE;gBACd,IAAI,SAAsC,CAAC;gBAE3C,IAAI,QAAQ,CAA+B,UAAU,CAAC,EAAE;oBACtD,SAAS,GAAG,kBAAkB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAuC,CAAC,CAAC;iBACxH;qBAAM;oBACL,SAAS,GAAG,EAAE,CAAC,UAAsB,CAAC,CAAC;iBACxC;gBAED,aAAa,GAAG,SAAS,CAAC,IAAI,CAC5B,GAAG,CAAC,CAAC,QAAyB,EAAE,EAAE;oBAChC,IAAI,cAAc,CAAC;oBACnB,IAAI,cAAc,CAAC;oBAEnB,IAAI,QAAQ,EAAE;wBACZ,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC;wBAC9B,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC;qBACrC;oBAED,IAAI,CAAC,cAAc,EAAE;wBACnB,cAAc,GAAG,qBAAqB,CAAC;qBACxC;oBAED,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;gBACvD,CAAC,CAAC,CACH,CAAC;aACH;iBAAM;gBACL,aAAa,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC;aAC1D;YAED,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAChC,KAAK,EAAE,EACP,SAAS,CAAC,CAAC,QAAgC,EAA0B,EAAE;YACrE,IAAI,OAAO,QAAQ,KAAK,SAAS,EAAE;gBACjC,IAAI,QAAQ,EAAE;oBACZ,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;iBACjB;qBAAM;oBACL,OAAO,WAAW,EAAE,CAAC;iBACtB;aACF;iBAAM;gBACL,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,SAAsB,EAAE,QAAQ,CAAC,UAA+B,CAAC,CAAC,CAAC;aACrI;QACH,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAC;YAC9D,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,mBAAmB;QACxF,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,cAAc,CAAC,SAAS,CAAe,CAAC;IACjD,CAAC,CAAC;IAEF,OAAO,qBAAqB,CAAC;AAC/B,CAAC","sourcesContent":["import { TransitionHookFn, Transition, HookResult, StateService, UIInjector, TransitionOptions, RawParams } from '@uirouter/core';\nimport { catchError, map, first, firstValueFrom, Observable, of, switchMap } from 'rxjs';\nimport { asSegueRefString, SegueRef } from './../../../../router/segue';\nimport { DbxAuthService } from '../../../service/auth.service';\nimport { FactoryWithRequiredInput, getValueFromGetter, isGetter, Maybe } from '@dereekb/util';\nimport { Injector } from '@angular/core';\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 | SegueRef;\n\nexport interface AuthTransitionDecisionGetterInput {\n  readonly transition: Transition;\n  readonly injector: Injector;\n  readonly authService: DbxAuthService;\n}\n\nexport type AuthTransitionRedirectTarget = Observable<Maybe<SegueRef>>;\nexport type AuthTransitionRedirectTargetGetter = FactoryWithRequiredInput<AuthTransitionRedirectTarget, AuthTransitionDecisionGetterInput>;\nexport type AuthTransitionRedirectTargetOrGetter = Maybe<SegueRef> | 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<SegueRef>>;\n\n        if (isGetter<AuthTransitionRedirectTarget>(redirectTo)) {\n          resultObs = getValueFromGetter(redirectTo, { authService, injector, transition } as AuthTransitionDecisionGetterInput);\n        } else {\n          resultObs = of(redirectTo as SegueRef);\n        }\n\n        redirectToObs = resultObs.pipe(\n          map((stateRef: Maybe<SegueRef>) => {\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      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          return of($state.target(asSegueRefString(decision.ref), decision.refParams as RawParams, decision.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"]}
|
|
68
|
+
//# 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":"AACA,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAc,EAAE,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAgC,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAA4B,kBAAkB,EAAE,QAAQ,EAAS,MAAM,eAAe,CAAC;AA+C9F;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAgC;IACrE,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,GAAG,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEtF,iFAAiF;IACjF,MAAM,qBAAqB,GAAqB,CAAC,UAAsB,EAAc,EAAE;QACrF,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,WAAW,GAAmB,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACjE,MAAM,MAAM,GAAiB,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAE/E,SAAS,WAAW;YAClB,MAAM,SAAS,GAA4B,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC;YACjF,MAAM,UAAU,GAAG,SAAS,EAAE,UAAU,CAAC;YAEzC,IAAI,aAAqC,CAAC;YAE1C,IAAI,UAAU,EAAE;gBACd,IAAI,SAA0D,CAAC;gBAE/D,IAAI,QAAQ,CAA+B,UAAU,CAAC,EAAE;oBACtD,SAAS,GAAG,kBAAkB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAuC,CAAC,CAAC;iBACxH;qBAAM;oBACL,SAAS,GAAG,EAAE,CAAC,UAA0C,CAAC,CAAC;iBAC5D;gBAED,aAAa,GAAG,SAAS,CAAC,IAAI,CAC5B,GAAG,CAAC,CAAC,aAAkD,EAAE,EAAE;oBACzD,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;oBAE3C,IAAI,cAAc,CAAC;oBACnB,IAAI,cAAc,CAAC;oBAEnB,IAAI,QAAQ,EAAE;wBACZ,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC;wBAC9B,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC;qBACrC;oBAED,IAAI,CAAC,cAAc,EAAE;wBACnB,cAAc,GAAG,qBAAqB,CAAC;qBACxC;oBAED,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;gBACvD,CAAC,CAAC,CACH,CAAC;aACH;iBAAM;gBACL,aAAa,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC;aAC1D;YAED,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAChC,KAAK,EAAE,EACP,SAAS,CAAC,CAAC,QAAgC,EAA0B,EAAE;YACrE,IAAI,OAAO,QAAQ,KAAK,SAAS,EAAE;gBACjC,IAAI,QAAQ,EAAE;oBACZ,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;iBACjB;qBAAM;oBACL,OAAO,WAAW,EAAE,CAAC;iBACtB;aACF;iBAAM;gBACL,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACtC,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,SAAsB,EAAE,QAAQ,CAAC,UAA+B,CAAC,CAAC,CAAC;aACrI;QACH,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAC;YAC9D,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,mBAAmB;QACxF,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,cAAc,CAAC,SAAS,CAAe,CAAC;IACjD,CAAC,CAAC;IAEF,OAAO,qBAAqB,CAAC;AAC/B,CAAC","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';\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      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"]}
|
|
@@ -26,4 +26,4 @@ export function redirectBasedOnAuthUserState(stateMap) {
|
|
|
26
26
|
}));
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9kYngtY29yZS9zcmMvbGliL2F1dGgvcm91dGVyL3Byb3ZpZGVyL3Vpcm91dGVyL3JlZGlyZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQWMsRUFBRSxFQUFFLFNBQVMsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN4RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsUUFBUSxFQUFvQixNQUFNLGVBQWUsQ0FBQztBQUsvRTs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSw0QkFBNEIsQ0FBQyxRQUF5RDtJQUNwRyxPQUFPLENBQUMsS0FBd0MsRUFBRSxFQUFFO1FBQ2xELE9BQU8sS0FBSyxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUMxQyxLQUFLLEVBQUUsRUFDUCxTQUFTLENBQUMsQ0FBQyxhQUE0QixFQUFFLEVBQUU7WUFDekMsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQ3ZDLElBQUksTUFBOEQsQ0FBQztZQUVuRSxJQUFJLE1BQU0sRUFBRTtnQkFDVixJQUFJLFFBQVEsQ0FBK0IsTUFBTSxDQUFDLEVBQUU7b0JBQ2xELE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUM7aUJBQzVDO3FCQUFNO29CQUNMLE1BQU0sR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUM7aUJBQ3JCO2FBQ0Y7WUFFRCxJQUFJLENBQUMsTUFBTSxFQUFFO2dCQUNYLE1BQU0sR0FBRyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDeEI7WUFFRCxPQUFPLE1BQU0sQ0FBQztRQUNoQixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZpcnN0LCBPYnNlcnZhYmxlLCBvZiwgc3dpdGNoTWFwIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBnZXRWYWx1ZUZyb21HZXR0ZXIsIGlzR2V0dGVyLCBNYXliZSwgT2JqZWN0TWFwIH0gZnJvbSAnQGRlcmVla2IvdXRpbCc7XG5pbXBvcnQgeyBBdXRoVHJhbnNpdGlvbkRlY2lzaW9uR2V0dGVySW5wdXQsIEF1dGhUcmFuc2l0aW9uUmVkaXJlY3RUYXJnZXQsIEF1dGhUcmFuc2l0aW9uUmVkaXJlY3RUYXJnZXRHZXR0ZXIsIEF1dGhUcmFuc2l0aW9uUmVkaXJlY3RUYXJnZXRPckdldHRlciB9IGZyb20gJy4vaG9vayc7XG5pbXBvcnQgeyBTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rIH0gZnJvbSAnLi4vLi4vLi4vLi4vcm91dGVyL3NlZ3VlJztcbmltcG9ydCB7IEF1dGhVc2VyU3RhdGUgfSBmcm9tICcuLi8uLi8uLi9hdXRoLnVzZXInO1xuXG4vKipcbiAqIENyZWF0ZXMgYSBBdXRoVHJhbnNpdGlvblJlZGlyZWN0VGFyZ2V0R2V0dGVyIHRoYXQgY2FuIHJlZGlyZWN0IHZhbHVlcyBiYXNlZCBvbiB0aGUgY3VycmVudCBhdXRoVXNlclN0YXRlLlxuICpcbiAqIEBwYXJhbSBzdGF0ZU1hcFxuICogQHJldHVybnNcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlZGlyZWN0QmFzZWRPbkF1dGhVc2VyU3RhdGUoc3RhdGVNYXA6IE9iamVjdE1hcDxBdXRoVHJhbnNpdGlvblJlZGlyZWN0VGFyZ2V0T3JHZXR0ZXI+KTogQXV0aFRyYW5zaXRpb25SZWRpcmVjdFRhcmdldEdldHRlciB7XG4gIHJldHVybiAoaW5wdXQ6IEF1dGhUcmFuc2l0aW9uRGVjaXNpb25HZXR0ZXJJbnB1dCkgPT4ge1xuICAgIHJldHVybiBpbnB1dC5hdXRoU2VydmljZS5hdXRoVXNlclN0YXRlJC5waXBlKFxuICAgICAgZmlyc3QoKSxcbiAgICAgIHN3aXRjaE1hcCgoYXV0aFVzZXJTdGF0ZTogQXV0aFVzZXJTdGF0ZSkgPT4ge1xuICAgICAgICBjb25zdCBnZXR0ZXIgPSBzdGF0ZU1hcFthdXRoVXNlclN0YXRlXTtcbiAgICAgICAgbGV0IHJlc3VsdDogTWF5YmU8T2JzZXJ2YWJsZTxNYXliZTxTZWd1ZVJlZk9yU2VndWVSZWZSb3V0ZXJMaW5rPj4+O1xuXG4gICAgICAgIGlmIChnZXR0ZXIpIHtcbiAgICAgICAgICBpZiAoaXNHZXR0ZXI8QXV0aFRyYW5zaXRpb25SZWRpcmVjdFRhcmdldD4oZ2V0dGVyKSkge1xuICAgICAgICAgICAgcmVzdWx0ID0gZ2V0VmFsdWVGcm9tR2V0dGVyKGdldHRlciwgaW5wdXQpO1xuICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICByZXN1bHQgPSBvZihnZXR0ZXIpO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIGlmICghcmVzdWx0KSB7XG4gICAgICAgICAgcmVzdWx0ID0gb2YodW5kZWZpbmVkKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiByZXN1bHQ7XG4gICAgICB9KVxuICAgICk7XG4gIH07XG59XG4iXX0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { map } from 'rxjs';
|
|
2
|
-
import {
|
|
2
|
+
import { setIncludes } from '@dereekb/util';
|
|
3
3
|
import { makeAuthTransitionHook } from './hook';
|
|
4
4
|
/**
|
|
5
5
|
* This hook redirects to the configured default state when a user:
|
|
@@ -22,11 +22,10 @@ export function enableHasAuthRoleHook(transitionService, config) {
|
|
|
22
22
|
const targetState = transition.targetState();
|
|
23
23
|
const data = targetState.state().data;
|
|
24
24
|
const requiredRoles = new Set(data.authRoles);
|
|
25
|
-
|
|
26
|
-
return authService.authUserState$.pipe(map((x) => setIncludes(x)));
|
|
25
|
+
return authService.authRoles$.pipe(map((x) => setIncludes(x, requiredRoles, data.authRolesMode)));
|
|
27
26
|
}
|
|
28
27
|
});
|
|
29
28
|
// Register the "requires auth" hook with the TransitionsService
|
|
30
29
|
transitionService.onBefore(isSecureCriteria, assertHasAuthRole, { priority: 100 });
|
|
31
30
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sZS5ob29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvZGJ4LWNvcmUvc3JjL2xpYi9hdXRoL3JvdXRlci9wcm92aWRlci91aXJvdXRlci9yb2xlLmhvb2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUN2QyxPQUFPLEVBQWtELFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUc1RixPQUFPLEVBQThFLHNCQUFzQixFQUFFLE1BQU0sUUFBUSxDQUFDO0FBcUI1SDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxxQkFBcUIsQ0FBQyxpQkFBb0MsRUFBRSxNQUE2QjtJQUN2RyxvRkFBb0Y7SUFDcEYsTUFBTSxnQkFBZ0IsR0FBc0I7UUFDMUMsUUFBUSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDbEIsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUFFLElBQTRDLENBQUM7WUFDakUsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztZQUN2QyxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUM7S0FDRixDQUFDO0lBRUYsTUFBTSxpQkFBaUIsR0FBcUIsc0JBQXNCLENBQUM7UUFDakUsR0FBRyxNQUFNLENBQUMsT0FBTztRQUNqQixnQkFBZ0IsQ0FBQyxVQUFzQixFQUFFLFdBQTJCO1lBQ2xFLE1BQU0sV0FBVyxHQUFHLFVBQVUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUM3QyxNQUFNLElBQUksR0FBeUIsV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQztZQUM1RCxNQUFNLGFBQWEsR0FBRyxJQUFJLEdBQUcsQ0FBVyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDeEQsT0FBTyxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDcEcsQ0FBQztLQUNGLENBQUMsQ0FBQztJQUVILGdFQUFnRTtJQUNoRSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztBQUNyRixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbWFwLCBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBBdXRoUm9sZSwgU2V0SW5jbHVkZXNNb2RlLCBBcnJheU9yVmFsdWUsIE1heWJlLCBzZXRJbmNsdWRlcyB9IGZyb20gJ0BkZXJlZWtiL3V0aWwnO1xuaW1wb3J0IHsgVHJhbnNpdGlvblNlcnZpY2UsIFRyYW5zaXRpb25Ib29rRm4sIFRyYW5zaXRpb24sIEhvb2tNYXRjaENyaXRlcmlhIH0gZnJvbSAnQHVpcm91dGVyL2NvcmUnO1xuaW1wb3J0IHsgRGJ4QXV0aFNlcnZpY2UgfSBmcm9tICcuLi8uLi8uLi9zZXJ2aWNlL2F1dGguc2VydmljZSc7XG5pbXBvcnQgeyBBdXRoVHJhbnNpdGlvbkRlY2lzaW9uLCBBdXRoVHJhbnNpdGlvbkhvb2tPcHRpb25zLCBBdXRoVHJhbnNpdGlvblN0YXRlRGF0YSwgbWFrZUF1dGhUcmFuc2l0aW9uSG9vayB9IGZyb20gJy4vaG9vayc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSGFzQXV0aFJvbGVIb29rQ29uZmlnIHtcbiAgb3B0aW9uczogQXV0aFRyYW5zaXRpb25Ib29rT3B0aW9ucztcbn1cblxuLyoqXG4gKiBVSVJvdXRlciBTdGF0ZSBkYXRhIHdpdGggY29uZmlndXJhdGlvbiBmb3IgdGhlIGhhc0F1dGhSb2xlSG9vay5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBIYXNBdXRoUm9sZVN0YXRlRGF0YSBleHRlbmRzIEF1dGhUcmFuc2l0aW9uU3RhdGVEYXRhIHtcbiAgLyoqXG4gICAqIEF1dGggcm9sZXMgbWFya2VkIGZvciB0aGlzIHN0YXRlXG4gICAqL1xuICBhdXRoUm9sZXM6IEFycmF5T3JWYWx1ZTxBdXRoUm9sZT47XG5cbiAgLyoqXG4gICAqIEhvdyB0byB1c2UgdGhlIGFib3ZlIGF1dGggcm9sZXMuIFRoaXMgZGVmYXVsdHMgdG8gJ2FsbCcgYnkgZGVmYXVsdC5cbiAgICovXG4gIGF1dGhSb2xlc01vZGU/OiBTZXRJbmNsdWRlc01vZGU7XG59XG5cbi8qKlxuICogVGhpcyBob29rIHJlZGlyZWN0cyB0byB0aGUgY29uZmlndXJlZCBkZWZhdWx0IHN0YXRlIHdoZW4gYSB1c2VyOlxuICpcbiAqIC0gZG9lcyBub3QgaGF2ZSBhbiBhbGxvd2VkIHN0YXRlXG4gKiAtIGhhcyBhIGRpc2FsbG93ZWQgc3RhdGVcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGVuYWJsZUhhc0F1dGhSb2xlSG9vayh0cmFuc2l0aW9uU2VydmljZTogVHJhbnNpdGlvblNlcnZpY2UsIGNvbmZpZzogSGFzQXV0aFJvbGVIb29rQ29uZmlnKTogdm9pZCB7XG4gIC8vIE1hdGNoZXMgaWYgdGhlIGRlc3RpbmF0aW9uIHN0YXRlJ3MgZGF0YSBwcm9wZXJ0eSBoYXMgYSB0cnV0aHkgJ2lzU2VjdXJlJyBwcm9wZXJ0eVxuICBjb25zdCBpc1NlY3VyZUNyaXRlcmlhOiBIb29rTWF0Y2hDcml0ZXJpYSA9IHtcbiAgICBlbnRlcmluZzogKHN0YXRlKSA9PiB7XG4gICAgICBjb25zdCBkYXRhID0gc3RhdGU/LmRhdGEgYXMgTWF5YmU8UGFydGlhbDxIYXNBdXRoUm9sZVN0YXRlRGF0YT4+O1xuICAgICAgY29uc3QgbWF0Y2ggPSBCb29sZWFuKGRhdGE/LmF1dGhSb2xlcyk7XG4gICAgICByZXR1cm4gbWF0Y2g7XG4gICAgfVxuICB9O1xuXG4gIGNvbnN0IGFzc2VydEhhc0F1dGhSb2xlOiBUcmFuc2l0aW9uSG9va0ZuID0gbWFrZUF1dGhUcmFuc2l0aW9uSG9vayh7XG4gICAgLi4uY29uZmlnLm9wdGlvbnMsXG4gICAgbWFrZURlY2lzaW9uc09icyh0cmFuc2l0aW9uOiBUcmFuc2l0aW9uLCBhdXRoU2VydmljZTogRGJ4QXV0aFNlcnZpY2UpOiBPYnNlcnZhYmxlPEF1dGhUcmFuc2l0aW9uRGVjaXNpb24+IHtcbiAgICAgIGNvbnN0IHRhcmdldFN0YXRlID0gdHJhbnNpdGlvbi50YXJnZXRTdGF0ZSgpO1xuICAgICAgY29uc3QgZGF0YTogSGFzQXV0aFJvbGVTdGF0ZURhdGEgPSB0YXJnZXRTdGF0ZS5zdGF0ZSgpLmRhdGE7XG4gICAgICBjb25zdCByZXF1aXJlZFJvbGVzID0gbmV3IFNldDxBdXRoUm9sZT4oZGF0YS5hdXRoUm9sZXMpO1xuICAgICAgcmV0dXJuIGF1dGhTZXJ2aWNlLmF1dGhSb2xlcyQucGlwZShtYXAoKHgpID0+IHNldEluY2x1ZGVzKHgsIHJlcXVpcmVkUm9sZXMsIGRhdGEuYXV0aFJvbGVzTW9kZSkpKTtcbiAgICB9XG4gIH0pO1xuXG4gIC8vIFJlZ2lzdGVyIHRoZSBcInJlcXVpcmVzIGF1dGhcIiBob29rIHdpdGggdGhlIFRyYW5zaXRpb25zU2VydmljZVxuICB0cmFuc2l0aW9uU2VydmljZS5vbkJlZm9yZShpc1NlY3VyZUNyaXRlcmlhLCBhc3NlcnRIYXNBdXRoUm9sZSwgeyBwcmlvcml0eTogMTAwIH0pO1xufVxuIl19
|
|
@@ -22,8 +22,8 @@ export function enableHasAuthStateHook(transitionService, config) {
|
|
|
22
22
|
const targetState = transition.targetState();
|
|
23
23
|
const data = targetState.state().data;
|
|
24
24
|
const config = toHasAuthStateObjectConfig(data.authStates);
|
|
25
|
-
const
|
|
26
|
-
return authService.authUserState$.pipe(map((x) => isAllowed(x,
|
|
25
|
+
const allowedStates = toParsedHasAuthStateConfig(config);
|
|
26
|
+
return authService.authUserState$.pipe(map((x) => isAllowed(x, allowedStates)));
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
29
|
// Register the "requires auth" hook with the TransitionsService
|
|
@@ -50,4 +50,4 @@ function toParsedHasAuthStateConfig(input) {
|
|
|
50
50
|
disallowed: maybeSet(input.disallowedStates)
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGUuaG9vay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2RieC1jb3JlL3NyYy9saWIvYXV0aC9yb3V0ZXIvcHJvdmlkZXIvdWlyb3V0ZXIvc3RhdGUuaG9vay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFjLE1BQU0sTUFBTSxDQUFDO0FBQ3ZDLE9BQU8sRUFBYyxTQUFTLEVBQUUsUUFBUSxFQUF1QixNQUFNLGVBQWUsQ0FBQztBQUlyRixPQUFPLEVBQThFLHNCQUFzQixFQUFFLE1BQU0sUUFBUSxDQUFDO0FBMkI1SDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxpQkFBb0MsRUFBRSxNQUE4QjtJQUN6RyxvRkFBb0Y7SUFDcEYsTUFBTSxnQkFBZ0IsR0FBc0I7UUFDMUMsUUFBUSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDbEIsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUFFLElBQXdDLENBQUM7WUFDN0QsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztZQUN4QyxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUM7S0FDRixDQUFDO0lBRUYsTUFBTSxrQkFBa0IsR0FBcUIsc0JBQXNCLENBQUM7UUFDbEUsR0FBRyxNQUFNLENBQUMsT0FBTztRQUNqQixnQkFBZ0IsQ0FBQyxVQUFzQixFQUFFLFdBQTJCO1lBQ2xFLE1BQU0sV0FBVyxHQUFHLFVBQVUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUM3QyxNQUFNLElBQUksR0FBcUIsV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQztZQUN4RCxNQUFNLE1BQU0sR0FBRywwQkFBMEIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDM0QsTUFBTSxhQUFhLEdBQTZCLDBCQUEwQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRW5GLE9BQU8sV0FBVyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsRixDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsZ0VBQWdFO0lBQ2hFLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0FBQ3RGLENBQUM7QUFFRCxnQkFBZ0I7QUFDaEIsU0FBUywwQkFBMEIsQ0FBQyxLQUF5QjtJQUMzRCxNQUFNLFFBQVEsR0FBRyxPQUFPLEtBQUssS0FBSyxRQUFRLENBQUM7SUFFM0MsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLFFBQVEsRUFBRTtRQUNwQyxJQUFJLFFBQVEsRUFBRTtZQUNaLEtBQUssR0FBRyxDQUFDLEtBQXNCLENBQUMsQ0FBQztTQUNsQztRQUVELE9BQU87WUFDTCxhQUFhLEVBQUUsS0FBd0I7U0FDeEMsQ0FBQztLQUNIO1NBQU07UUFDTCxPQUFPLEtBQWlDLENBQUM7S0FDMUM7QUFDSCxDQUFDO0FBSUQsU0FBUywwQkFBMEIsQ0FBQyxLQUErQjtJQUNqRSxPQUFPO1FBQ0wsT0FBTyxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO1FBQ3RDLFVBQVUsRUFBRSxRQUFRLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDO0tBQzdDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbWFwLCBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBBbGxvd2VkU2V0LCBpc0FsbG93ZWQsIG1heWJlU2V0LCBBcnJheU9yVmFsdWUsIE1heWJlIH0gZnJvbSAnQGRlcmVla2IvdXRpbCc7XG5pbXBvcnQgeyBUcmFuc2l0aW9uU2VydmljZSwgVHJhbnNpdGlvbkhvb2tGbiwgVHJhbnNpdGlvbiwgSG9va01hdGNoQ3JpdGVyaWEgfSBmcm9tICdAdWlyb3V0ZXIvY29yZSc7XG5pbXBvcnQgeyBBdXRoVXNlclN0YXRlIH0gZnJvbSAnLi4vLi4vLi4vYXV0aC51c2VyJztcbmltcG9ydCB7IERieEF1dGhTZXJ2aWNlIH0gZnJvbSAnLi4vLi4vLi4vc2VydmljZS9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQXV0aFRyYW5zaXRpb25EZWNpc2lvbiwgQXV0aFRyYW5zaXRpb25Ib29rT3B0aW9ucywgQXV0aFRyYW5zaXRpb25TdGF0ZURhdGEsIG1ha2VBdXRoVHJhbnNpdGlvbkhvb2sgfSBmcm9tICcuL2hvb2snO1xuXG5leHBvcnQgaW50ZXJmYWNlIEhhc0F1dGhTdGF0ZUhvb2tDb25maWcge1xuICBvcHRpb25zOiBBdXRoVHJhbnNpdGlvbkhvb2tPcHRpb25zO1xufVxuXG5leHBvcnQgdHlwZSBIYXNBdXRoU3RhdGVDb25maWcgPSBBcnJheU9yVmFsdWU8QXV0aFVzZXJTdGF0ZT4gfCBIYXNBdXRoU3RhdGVPYmplY3RDb25maWc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSGFzQXV0aFN0YXRlT2JqZWN0Q29uZmlnIHtcbiAgLyoqXG4gICAqIFdoZXRoZXIgb3Igbm90IHRoaXMgc3RhdGUgb3IgYW55IGNoaWxkIHN0YXRlIGlzIGNvbnNpZGVyZWQgXCJzZWN1cmVcIiwgd2hpY2ggcmVxdWlyZXMgdGhlIHVzZXIgdG8gYmUgbG9nZ2VkIGluLlxuICAgKi9cbiAgYWxsb3dlZFN0YXRlcz86IEFycmF5T3JWYWx1ZTxBdXRoVXNlclN0YXRlPjtcblxuICAvKipcbiAgICogU3RhdGVzIHRoYXQgYXJlIG5vdCBhbGxvd2VkLiBJZiB0aGUgY3VycmVudCBzdGF0ZSBpcyB0aGlzIHN0YXRlLCBhIHJlamVjdGlvbiBpcyByZXR1cm5lZC5cbiAgICovXG4gIGRpc2FsbG93ZWRTdGF0ZXM/OiBBcnJheU9yVmFsdWU8QXV0aFVzZXJTdGF0ZT47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgSGFzQXV0aFN0YXRlRGF0YSBleHRlbmRzIEF1dGhUcmFuc2l0aW9uU3RhdGVEYXRhIHtcbiAgLyoqXG4gICAqIENvbmZpZ3VyYXRpb24gZm9yIHRoZSBoYXNBdXRoU3RhdGVIb29rLlxuICAgKi9cbiAgYXV0aFN0YXRlczogSGFzQXV0aFN0YXRlQ29uZmlnO1xufVxuXG4vKipcbiAqIFRoaXMgaG9vayByZWRpcmVjdHMgdG8gdGhlIGNvbmZpZ3VyZWQgZGVmYXVsdCBzdGF0ZSB3aGVuIGEgdXNlcjpcbiAqXG4gKiAtIGRvZXMgbm90IGhhdmUgYW4gYWxsb3dlZCBzdGF0ZVxuICogLSBoYXMgYSBkaXNhbGxvd2VkIHN0YXRlXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBlbmFibGVIYXNBdXRoU3RhdGVIb29rKHRyYW5zaXRpb25TZXJ2aWNlOiBUcmFuc2l0aW9uU2VydmljZSwgY29uZmlnOiBIYXNBdXRoU3RhdGVIb29rQ29uZmlnKTogdm9pZCB7XG4gIC8vIE1hdGNoZXMgaWYgdGhlIGRlc3RpbmF0aW9uIHN0YXRlJ3MgZGF0YSBwcm9wZXJ0eSBoYXMgYSB0cnV0aHkgJ2lzU2VjdXJlJyBwcm9wZXJ0eVxuICBjb25zdCBpc1NlY3VyZUNyaXRlcmlhOiBIb29rTWF0Y2hDcml0ZXJpYSA9IHtcbiAgICBlbnRlcmluZzogKHN0YXRlKSA9PiB7XG4gICAgICBjb25zdCBkYXRhID0gc3RhdGU/LmRhdGEgYXMgTWF5YmU8UGFydGlhbDxIYXNBdXRoU3RhdGVEYXRhPj47XG4gICAgICBjb25zdCBtYXRjaCA9IEJvb2xlYW4oZGF0YT8uYXV0aFN0YXRlcyk7XG4gICAgICByZXR1cm4gbWF0Y2g7XG4gICAgfVxuICB9O1xuXG4gIGNvbnN0IGFzc2VydEhhc0F1dGhTdGF0ZTogVHJhbnNpdGlvbkhvb2tGbiA9IG1ha2VBdXRoVHJhbnNpdGlvbkhvb2soe1xuICAgIC4uLmNvbmZpZy5vcHRpb25zLFxuICAgIG1ha2VEZWNpc2lvbnNPYnModHJhbnNpdGlvbjogVHJhbnNpdGlvbiwgYXV0aFNlcnZpY2U6IERieEF1dGhTZXJ2aWNlKTogT2JzZXJ2YWJsZTxBdXRoVHJhbnNpdGlvbkRlY2lzaW9uPiB7XG4gICAgICBjb25zdCB0YXJnZXRTdGF0ZSA9IHRyYW5zaXRpb24udGFyZ2V0U3RhdGUoKTtcbiAgICAgIGNvbnN0IGRhdGE6IEhhc0F1dGhTdGF0ZURhdGEgPSB0YXJnZXRTdGF0ZS5zdGF0ZSgpLmRhdGE7XG4gICAgICBjb25zdCBjb25maWcgPSB0b0hhc0F1dGhTdGF0ZU9iamVjdENvbmZpZyhkYXRhLmF1dGhTdGF0ZXMpO1xuICAgICAgY29uc3QgYWxsb3dlZFN0YXRlczogUGFyc2VkSGFzQXV0aFN0YXRlQ29uZmlnID0gdG9QYXJzZWRIYXNBdXRoU3RhdGVDb25maWcoY29uZmlnKTtcblxuICAgICAgcmV0dXJuIGF1dGhTZXJ2aWNlLmF1dGhVc2VyU3RhdGUkLnBpcGUobWFwKCh4KSA9PiBpc0FsbG93ZWQoeCwgYWxsb3dlZFN0YXRlcykpKTtcbiAgICB9XG4gIH0pO1xuXG4gIC8vIFJlZ2lzdGVyIHRoZSBcInJlcXVpcmVzIGF1dGhcIiBob29rIHdpdGggdGhlIFRyYW5zaXRpb25zU2VydmljZVxuICB0cmFuc2l0aW9uU2VydmljZS5vbkJlZm9yZShpc1NlY3VyZUNyaXRlcmlhLCBhc3NlcnRIYXNBdXRoU3RhdGUsIHsgcHJpb3JpdHk6IDEwMCB9KTtcbn1cblxuLy8gTUFSSzogVXRpbGl0eVxuZnVuY3Rpb24gdG9IYXNBdXRoU3RhdGVPYmplY3RDb25maWcoaW5wdXQ6IEhhc0F1dGhTdGF0ZUNvbmZpZyk6IEhhc0F1dGhTdGF0ZU9iamVjdENvbmZpZyB7XG4gIGNvbnN0IGlzU3RyaW5nID0gdHlwZW9mIGlucHV0ID09PSAnc3RyaW5nJztcblxuICBpZiAoQXJyYXkuaXNBcnJheShpbnB1dCkgfHwgaXNTdHJpbmcpIHtcbiAgICBpZiAoaXNTdHJpbmcpIHtcbiAgICAgIGlucHV0ID0gW2lucHV0IGFzIEF1dGhVc2VyU3RhdGVdO1xuICAgIH1cblxuICAgIHJldHVybiB7XG4gICAgICBhbGxvd2VkU3RhdGVzOiBpbnB1dCBhcyBBdXRoVXNlclN0YXRlW11cbiAgICB9O1xuICB9IGVsc2Uge1xuICAgIHJldHVybiBpbnB1dCBhcyBIYXNBdXRoU3RhdGVPYmplY3RDb25maWc7XG4gIH1cbn1cblxudHlwZSBQYXJzZWRIYXNBdXRoU3RhdGVDb25maWcgPSBBbGxvd2VkU2V0PEF1dGhVc2VyU3RhdGU+O1xuXG5mdW5jdGlvbiB0b1BhcnNlZEhhc0F1dGhTdGF0ZUNvbmZpZyhpbnB1dDogSGFzQXV0aFN0YXRlT2JqZWN0Q29uZmlnKTogUGFyc2VkSGFzQXV0aFN0YXRlQ29uZmlnIHtcbiAgcmV0dXJuIHtcbiAgICBhbGxvd2VkOiBtYXliZVNldChpbnB1dC5hbGxvd2VkU3RhdGVzKSxcbiAgICBkaXNhbGxvd2VkOiBtYXliZVNldChpbnB1dC5kaXNhbGxvd2VkU3RhdGVzKVxuICB9O1xufVxuIl19
|
|
@@ -5,7 +5,7 @@ import { SubscriptionObject, LockSet, filterMaybe, LoadingStateType, beginLoadin
|
|
|
5
5
|
import * as i1 from 'rxjs';
|
|
6
6
|
import { switchMap, first, BehaviorSubject, combineLatest, distinctUntilChanged, filter, Subject, debounce, interval, throttle, exhaustMap, mergeMap, map, shareReplay, EMPTY, withLatestFrom, of, startWith, tap, delay, catchError, firstValueFrom, takeUntil, Observable } from 'rxjs';
|
|
7
7
|
import * as i1$6 from '@dereekb/util';
|
|
8
|
-
import { isDefinedAndNotFalse, hasValueOrNotEmpty, BooleanStringKeyArrayUtilityInstance, reduceBooleansWithOrFn, getValueFromGetter, toReadableError, isGetter,
|
|
8
|
+
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';
|
|
9
9
|
import { ComponentStore } from '@ngrx/component-store';
|
|
10
10
|
import { CommonModule, formatDate } from '@angular/common';
|
|
11
11
|
import * as i1$3 from '@ngrx/effects';
|
|
@@ -1723,7 +1723,8 @@ function makeAuthTransitionHook(config) {
|
|
|
1723
1723
|
else {
|
|
1724
1724
|
resultObs = of(redirectTo);
|
|
1725
1725
|
}
|
|
1726
|
-
redirectToObs = resultObs.pipe(map((
|
|
1726
|
+
redirectToObs = resultObs.pipe(map((inputStateRef) => {
|
|
1727
|
+
const stateRef = asSegueRef(inputStateRef);
|
|
1727
1728
|
let redirectTarget;
|
|
1728
1729
|
let redirectParams;
|
|
1729
1730
|
if (stateRef) {
|
|
@@ -1751,7 +1752,8 @@ function makeAuthTransitionHook(config) {
|
|
|
1751
1752
|
}
|
|
1752
1753
|
}
|
|
1753
1754
|
else {
|
|
1754
|
-
|
|
1755
|
+
const segueRef = asSegueRef(decision);
|
|
1756
|
+
return of($state.target(asSegueRefString(segueRef.ref), segueRef.refParams, segueRef.refOptions));
|
|
1755
1757
|
}
|
|
1756
1758
|
}), catchError((x) => {
|
|
1757
1759
|
console.warn('Encountered error in auth transition hook.', x);
|
|
@@ -1827,8 +1829,7 @@ function enableHasAuthRoleHook(transitionService, config) {
|
|
|
1827
1829
|
const targetState = transition.targetState();
|
|
1828
1830
|
const data = targetState.state().data;
|
|
1829
1831
|
const requiredRoles = new Set(data.authRoles);
|
|
1830
|
-
|
|
1831
|
-
return authService.authUserState$.pipe(map((x) => setIncludes(x)));
|
|
1832
|
+
return authService.authRoles$.pipe(map((x) => setIncludes(x, requiredRoles, data.authRolesMode)));
|
|
1832
1833
|
} }));
|
|
1833
1834
|
// Register the "requires auth" hook with the TransitionsService
|
|
1834
1835
|
transitionService.onBefore(isSecureCriteria, assertHasAuthRole, { priority: 100 });
|
|
@@ -1853,8 +1854,8 @@ function enableHasAuthStateHook(transitionService, config) {
|
|
|
1853
1854
|
const targetState = transition.targetState();
|
|
1854
1855
|
const data = targetState.state().data;
|
|
1855
1856
|
const config = toHasAuthStateObjectConfig(data.authStates);
|
|
1856
|
-
const
|
|
1857
|
-
return authService.authUserState$.pipe(map((x) => isAllowed(x,
|
|
1857
|
+
const allowedStates = toParsedHasAuthStateConfig(config);
|
|
1858
|
+
return authService.authUserState$.pipe(map((x) => isAllowed(x, allowedStates)));
|
|
1858
1859
|
} }));
|
|
1859
1860
|
// Register the "requires auth" hook with the TransitionsService
|
|
1860
1861
|
transitionService.onBefore(isSecureCriteria, assertHasAuthState, { priority: 100 });
|