@odx/auth 3.1.1 → 3.1.2
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.component.mjs +3 -3
- package/esm2020/lib/auth.guard.mjs +6 -5
- package/esm2020/lib/auth.service.mjs +19 -17
- package/esm2020/lib/helpers/create-inititals.mjs +5 -2
- package/esm2020/lib/helpers/resolve-username.mjs +6 -3
- package/fesm2015/odx-auth.mjs +31 -25
- package/fesm2015/odx-auth.mjs.map +1 -1
- package/fesm2020/odx-auth.mjs +34 -25
- package/fesm2020/odx-auth.mjs.map +1 -1
- package/lib/auth.service.d.ts +4 -2
- package/package.json +1 -1
|
@@ -33,13 +33,13 @@ export class AuthComponent {
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
AuthComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
36
|
-
AuthComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: AuthComponent, isStandalone: true, selector: "odx-auth", inputs: { signInButtonText: "signInButtonText", signOutButtonText: "signOutButtonText" }, ngImport: i0, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n
|
|
36
|
+
AuthComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: AuthComponent, isStandalone: true, selector: "odx-auth", inputs: { signInButtonText: "signInButtonText", signOutButtonText: "signOutButtonText" }, ngImport: i0, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <odx-action-group>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n {{ signOutButtonText }}\n <odx-icon name=\"logout\" alignRight></odx-icon>\n </button>\n </odx-action-group>\n </div>\n </ng-template>\n </ng-template>\n <ng-template #notAuthenticated>\n <button class=\"odx-auth-sign-in\" odxButton odxAuthSignIn variant=\"secondary\" data-testid=\"odx-auth-sign-in-button\">\n <odx-icon name=\"user\" alignLeft></odx-icon>\n {{ signInButtonText }}\n </button>\n </ng-template>\n <ng-template #userAvatar>\n <odx-avatar class=\"odx-auth-user-avatar\">\n {{ vm.idClaims?.initials ?? '' }}\n </odx-avatar>\n </ng-template>\n </ng-template>\n <ng-template [ngIf]=\"authConfig.showRedirectOverlay\">\n <div class=\"odx-auth-overlay\" [odxLoadingSpinner]=\"true\" *ngIf=\"authService.isLoading$ | async\"></div>\n </ng-template>\n</odx-action-group>\n", styles: [".odx-auth-user-profile .odx-dropdown__inner>.odx-area-header{max-width:max(360px,25vw);min-width:296px}.odx-auth-overlay{position:fixed;z-index:var(--odx-v-layer-5);inset:0}\n"], dependencies: [{ kind: "ngmodule", type: CoreModule }, { kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }, { kind: "directive", type: i2.LetDirective, selector: "[ngrxLet]", inputs: ["ngrxLet", "ngrxLetSuspenseTpl"] }, { kind: "ngmodule", type: AreaHeaderModule }, { kind: "component", type: i3.AreaHeaderComponent, selector: "odx-area-header", inputs: ["size"] }, { kind: "directive", type: i3.AreaHeaderSubtitleDirective, selector: "odx-area-header-subtitle" }, { kind: "component", type: i4.AvatarComponent, selector: "odx-avatar", inputs: ["size", "variant"] }, { kind: "component", type: i5.ActionGroupComponent, selector: "odx-action-group", inputs: ["reverse"] }, { kind: "component", type: i6.ButtonComponent, selector: "button[odxButton], a[odxButton]", inputs: ["variant", "size"] }, { kind: "component", type: i7.IconComponent, selector: "odx-icon", inputs: ["inline", "size", "name", "iconSet"] }, { kind: "ngmodule", type: DropdownModule }, { kind: "directive", type: i8.DropdownDirective, selector: "[odxDropdown]", inputs: ["odxDropdown", "odxDropdownDisabled", "odxDropdownShowLoader", "odxDropdownClickOutsideActive", "odxDropdownOptions", "odxDropdownReferenceElement", "odxDropdownTriggerElement", "odxDropdownHost", "odxDropdownOpenTrigger", "odxDropdownCloseTrigger"], outputs: ["odxDropdownBeforeOpen", "odxDropdownAfterOpen", "odxDropdownBeforeClose", "odxDropdownAfterClose"], exportAs: ["odxDropdown"] }, { kind: "ngmodule", type: HeaderModule }, { kind: "directive", type: LogoDirective, selector: "odx-logo", inputs: ["size", "variant"] }, { kind: "directive", type: SignInDirective, selector: "[odxButton][odxAuthSignIn]", outputs: ["odxAuthSignIn"] }, { kind: "directive", type: SignOutDirective, selector: "[odxButton][odxAuthSignOut]", outputs: ["odxAuthSignOut"] }, { kind: "ngmodule", type: LoadingSpinnerModule }, { kind: "directive", type: i9.LoadingSpinnerDirective, selector: "[odxLoadingSpinner]", inputs: ["odxLoadingSpinnerAutoColor", "odxLoadingSpinner", "odxLoadingSpinnerMinHeight"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
|
|
37
37
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthComponent, decorators: [{
|
|
38
38
|
type: Component,
|
|
39
|
-
args: [{ standalone: true, selector: 'odx-auth', imports: [CoreModule, AreaHeaderModule, DropdownModule, HeaderModule, LogoDirective, SignInDirective, SignOutDirective, LoadingSpinnerModule], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n
|
|
39
|
+
args: [{ standalone: true, selector: 'odx-auth', imports: [CoreModule, AreaHeaderModule, DropdownModule, HeaderModule, LogoDirective, SignInDirective, SignOutDirective, LoadingSpinnerModule], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <odx-action-group>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n {{ signOutButtonText }}\n <odx-icon name=\"logout\" alignRight></odx-icon>\n </button>\n </odx-action-group>\n </div>\n </ng-template>\n </ng-template>\n <ng-template #notAuthenticated>\n <button class=\"odx-auth-sign-in\" odxButton odxAuthSignIn variant=\"secondary\" data-testid=\"odx-auth-sign-in-button\">\n <odx-icon name=\"user\" alignLeft></odx-icon>\n {{ signInButtonText }}\n </button>\n </ng-template>\n <ng-template #userAvatar>\n <odx-avatar class=\"odx-auth-user-avatar\">\n {{ vm.idClaims?.initials ?? '' }}\n </odx-avatar>\n </ng-template>\n </ng-template>\n <ng-template [ngIf]=\"authConfig.showRedirectOverlay\">\n <div class=\"odx-auth-overlay\" [odxLoadingSpinner]=\"true\" *ngIf=\"authService.isLoading$ | async\"></div>\n </ng-template>\n</odx-action-group>\n", styles: [".odx-auth-user-profile .odx-dropdown__inner>.odx-area-header{max-width:max(360px,25vw);min-width:296px}.odx-auth-overlay{position:fixed;z-index:var(--odx-v-layer-5);inset:0}\n"] }]
|
|
40
40
|
}], propDecorators: { signInButtonText: [{
|
|
41
41
|
type: Input
|
|
42
42
|
}], signOutButtonText: [{
|
|
43
43
|
type: Input
|
|
44
44
|
}] } });
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hdXRoL3NyYy9saWIvYXV0aC5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hdXRoL3NyYy9saWIvYXV0aC5jb21wb25lbnQuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDckcsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMxQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN2RSxPQUFPLEVBQUUsY0FBYyxFQUFtQixNQUFNLGtDQUFrQyxDQUFDO0FBQ25GLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM5RCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDN0QsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNqRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0MsT0FBTyxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGNBQWMsQ0FBQzs7Ozs7Ozs7Ozs7QUFXakUsTUFBTSxPQUFPLGFBQWE7SUFUMUI7UUFVcUIsZUFBVSxHQUFHLGdCQUFnQixFQUFFLENBQUM7UUFDaEMsZ0JBQVcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbEMsb0JBQWUsR0FBRztZQUNuQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFVBQVU7WUFDN0IsY0FBYyxFQUFFLEtBQUs7WUFDckIsY0FBYyxFQUFFLHVCQUF1QjtTQUNaLENBQUM7UUFHdkIscUJBQWdCLEdBQUcsU0FBUyxDQUFDO1FBRzdCLHNCQUFpQixHQUFHLFVBQVUsQ0FBQztLQUN2Qzs7MEdBZFksYUFBYTs4RkFBYixhQUFhLDhKQ3JCMUIsMGpFQTBDQSx3T0QzQlksVUFBVSw4Y0FBRSxnQkFBZ0IsbXFCQUFFLGNBQWMsMGZBQUUsWUFBWSwrQkFBRSxhQUFhLGtGQUFFLGVBQWUsbUdBQUUsZ0JBQWdCLG9HQUFFLG9CQUFvQjsyRkFNakksYUFBYTtrQkFUekIsU0FBUztpQ0FDSSxJQUFJLFlBQ04sVUFBVSxXQUNYLENBQUMsVUFBVSxFQUFFLGdCQUFnQixFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxvQkFBb0IsQ0FBQyxtQkFHNUgsdUJBQXVCLENBQUMsTUFBTSxpQkFDaEMsaUJBQWlCLENBQUMsSUFBSTs4QkFZOUIsZ0JBQWdCO3NCQUR0QixLQUFLO2dCQUlDLGlCQUFpQjtzQkFEdkIsS0FBSyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENoYW5nZURldGVjdGlvblN0cmF0ZWd5LCBDb21wb25lbnQsIGluamVjdCwgSW5wdXQsIFZpZXdFbmNhcHN1bGF0aW9uIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDb3JlTW9kdWxlIH0gZnJvbSAnQG9keC9hbmd1bGFyJztcbmltcG9ydCB7IEFyZWFIZWFkZXJNb2R1bGUgfSBmcm9tICdAb2R4L2FuZ3VsYXIvY29tcG9uZW50cy9hcmVhLWhlYWRlcic7XG5pbXBvcnQgeyBEcm9wZG93bk1vZHVsZSwgRHJvcGRvd25PcHRpb25zIH0gZnJvbSAnQG9keC9hbmd1bGFyL2NvbXBvbmVudHMvZHJvcGRvd24nO1xuaW1wb3J0IHsgSGVhZGVyTW9kdWxlIH0gZnJvbSAnQG9keC9hbmd1bGFyL2NvbXBvbmVudHMvaGVhZGVyJztcbmltcG9ydCB7IExvYWRpbmdTcGlubmVyTW9kdWxlIH0gZnJvbSAnQG9keC9hbmd1bGFyL2NvbXBvbmVudHMvbG9hZGluZy1zcGlubmVyJztcbmltcG9ydCB7IExvZ29EaXJlY3RpdmUgfSBmcm9tICdAb2R4L2FuZ3VsYXIvY29tcG9uZW50cy9sb2dvJztcbmltcG9ydCB7IFBvc2l0aW9uIH0gZnJvbSAnQG9keC9hbmd1bGFyL3V0aWxzJztcbmltcG9ydCB7IGluamVjdEF1dGhDb25maWcgfSBmcm9tICcuL2F1dGguY29uZmlnJztcbmltcG9ydCB7IEF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgU2lnbkluRGlyZWN0aXZlLCBTaWduT3V0RGlyZWN0aXZlIH0gZnJvbSAnLi9kaXJlY3RpdmVzJztcblxuQENvbXBvbmVudCh7XG4gIHN0YW5kYWxvbmU6IHRydWUsXG4gIHNlbGVjdG9yOiAnb2R4LWF1dGgnLFxuICBpbXBvcnRzOiBbQ29yZU1vZHVsZSwgQXJlYUhlYWRlck1vZHVsZSwgRHJvcGRvd25Nb2R1bGUsIEhlYWRlck1vZHVsZSwgTG9nb0RpcmVjdGl2ZSwgU2lnbkluRGlyZWN0aXZlLCBTaWduT3V0RGlyZWN0aXZlLCBMb2FkaW5nU3Bpbm5lck1vZHVsZV0sXG4gIHRlbXBsYXRlVXJsOiAnLi9hdXRoLmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vYXV0aC5jb21wb25lbnQuc2NzcyddLFxuICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaCxcbiAgZW5jYXBzdWxhdGlvbjogVmlld0VuY2Fwc3VsYXRpb24uTm9uZSxcbn0pXG5leHBvcnQgY2xhc3MgQXV0aENvbXBvbmVudCB7XG4gIHByb3RlY3RlZCByZWFkb25seSBhdXRoQ29uZmlnID0gaW5qZWN0QXV0aENvbmZpZygpO1xuICBwcm90ZWN0ZWQgcmVhZG9ubHkgYXV0aFNlcnZpY2UgPSBpbmplY3QoQXV0aFNlcnZpY2UpO1xuICBwcm90ZWN0ZWQgcmVhZG9ubHkgZHJvcGRvd25PcHRpb25zID0ge1xuICAgIHBvc2l0aW9uOiBQb3NpdGlvbi5CT1RUT01fRU5ELFxuICAgIGVuYWJsZUZhbGxiYWNrOiBmYWxzZSxcbiAgICBjb250YWluZXJDbGFzczogJ29keC1hdXRoLXVzZXItcHJvZmlsZScsXG4gIH0gYXMgUGFydGlhbDxEcm9wZG93bk9wdGlvbnM+O1xuXG4gIEBJbnB1dCgpXG4gIHB1YmxpYyBzaWduSW5CdXR0b25UZXh0ID0gJ1NpZ24gaW4nO1xuXG4gIEBJbnB1dCgpXG4gIHB1YmxpYyBzaWduT3V0QnV0dG9uVGV4dCA9ICdTaWduIG91dCc7XG59XG4iLCI8b2R4LWFjdGlvbi1ncm91cD5cbiAgPG5nLXRlbXBsYXRlIFtuZ3J4TGV0XT1cInsgaWRDbGFpbXM6IGF1dGhTZXJ2aWNlLmlkZW50aXR5Q2xhaW1zJCwgaXNBdXRoZW50aWNhdGVkOiBhdXRoU2VydmljZS5pc0F1dGhlbnRpY2F0ZWQkIH1cIiBsZXQtdm0+XG4gICAgPG5nLXRlbXBsYXRlIFtuZ0lmXT1cInZtLmlzQXV0aGVudGljYXRlZFwiIFtuZ0lmRWxzZV09XCJub3RBdXRoZW50aWNhdGVkXCI+XG4gICAgICA8YnV0dG9uIG9keEJ1dHRvbiBbb2R4RHJvcGRvd25dPVwidXNlclByb2ZpbGVNZW51XCIgW29keERyb3Bkb3duT3B0aW9uc109XCJkcm9wZG93bk9wdGlvbnNcIiBkYXRhLXRlc3RpZD1cIm9keC1hdXRoLXVzZXItcHJvZmlsZS1idXR0b25cIj5cbiAgICAgICAgPG5nLXRlbXBsYXRlIFtuZ1RlbXBsYXRlT3V0bGV0XT1cInVzZXJBdmF0YXJcIj48L25nLXRlbXBsYXRlPlxuICAgICAgPC9idXR0b24+XG4gICAgICA8bmctdGVtcGxhdGUgI3VzZXJQcm9maWxlTWVudT5cbiAgICAgICAgPG9keC1hcmVhLWhlYWRlciBjbGFzcz1cIm9keC1wYWRkaW5nLXgtMTJcIiBzaXplPVwic21hbGxcIj5cbiAgICAgICAgICA8bmctdGVtcGxhdGUgW25nVGVtcGxhdGVPdXRsZXRdPVwidXNlckF2YXRhclwiIG5nUHJvamVjdEFzPVwib2R4LWF2YXRhclwiPjwvbmctdGVtcGxhdGU+XG4gICAgICAgICAge3sgdm0uaWRDbGFpbXM/LnVzZXJuYW1lIH19XG4gICAgICAgICAgPG9keC1hcmVhLWhlYWRlci1zdWJ0aXRsZT5cbiAgICAgICAgICAgIHt7IHZtLmlkQ2xhaW1zPy5lbWFpbCB9fVxuICAgICAgICAgIDwvb2R4LWFyZWEtaGVhZGVyLXN1YnRpdGxlPlxuICAgICAgICA8L29keC1hcmVhLWhlYWRlcj5cbiAgICAgICAgPG5nLWNvbnRlbnQ+PC9uZy1jb250ZW50PlxuICAgICAgICA8ZGl2IGNsYXNzPVwib2R4LW1hcmdpbi10b3AtMTJcIiBvZHhMYXlvdXQ9XCJmbGV4IHZlcnRpY2FsLWNlbnRlclwiPlxuICAgICAgICAgIDxvZHgtbG9nbyBvZHhMYXlvdXQ9XCJhdXRvXCIgY2xhc3M9XCJvZHgtbWFyZ2luLWxlZnQtMTIgb2R4LW1hcmdpbi1yaWdodC1hdXRvXCI+PC9vZHgtbG9nbz5cbiAgICAgICAgICA8b2R4LWFjdGlvbi1ncm91cD5cbiAgICAgICAgICAgIDxidXR0b24gb2R4QnV0dG9uIG9keEF1dGhTaWduT3V0IHZhcmlhbnQ9XCJnaG9zdFwiIGRhdGEtdGVzdGlkPVwib2R4LWF1dGgtc2lnbi1vdXQtYnV0dG9uXCI+XG4gICAgICAgICAgICAgIHt7IHNpZ25PdXRCdXR0b25UZXh0IH19XG4gICAgICAgICAgICAgIDxvZHgtaWNvbiBuYW1lPVwibG9nb3V0XCIgYWxpZ25SaWdodD48L29keC1pY29uPlxuICAgICAgICAgICAgPC9idXR0b24+XG4gICAgICAgICAgPC9vZHgtYWN0aW9uLWdyb3VwPlxuICAgICAgICA8L2Rpdj5cbiAgICAgIDwvbmctdGVtcGxhdGU+XG4gICAgPC9uZy10ZW1wbGF0ZT5cbiAgICA8bmctdGVtcGxhdGUgI25vdEF1dGhlbnRpY2F0ZWQ+XG4gICAgICA8YnV0dG9uIGNsYXNzPVwib2R4LWF1dGgtc2lnbi1pblwiIG9keEJ1dHRvbiBvZHhBdXRoU2lnbkluIHZhcmlhbnQ9XCJzZWNvbmRhcnlcIiBkYXRhLXRlc3RpZD1cIm9keC1hdXRoLXNpZ24taW4tYnV0dG9uXCI+XG4gICAgICAgIDxvZHgtaWNvbiBuYW1lPVwidXNlclwiIGFsaWduTGVmdD48L29keC1pY29uPlxuICAgICAgICB7eyBzaWduSW5CdXR0b25UZXh0IH19XG4gICAgICA8L2J1dHRvbj5cbiAgICA8L25nLXRlbXBsYXRlPlxuICAgIDxuZy10ZW1wbGF0ZSAjdXNlckF2YXRhcj5cbiAgICAgIDxvZHgtYXZhdGFyIGNsYXNzPVwib2R4LWF1dGgtdXNlci1hdmF0YXJcIj5cbiAgICAgICAge3sgdm0uaWRDbGFpbXM/LmluaXRpYWxzID8/ICcnIH19XG4gICAgICA8L29keC1hdmF0YXI+XG4gICAgPC9uZy10ZW1wbGF0ZT5cbiAgPC9uZy10ZW1wbGF0ZT5cbiAgPG5nLXRlbXBsYXRlIFtuZ0lmXT1cImF1dGhDb25maWcuc2hvd1JlZGlyZWN0T3ZlcmxheVwiPlxuICAgIDxkaXYgY2xhc3M9XCJvZHgtYXV0aC1vdmVybGF5XCIgW29keExvYWRpbmdTcGlubmVyXT1cInRydWVcIiAqbmdJZj1cImF1dGhTZXJ2aWNlLmlzTG9hZGluZyQgfCBhc3luY1wiPjwvZGl2PlxuICA8L25nLXRlbXBsYXRlPlxuPC9vZHgtYWN0aW9uLWdyb3VwPlxuIl19
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
import { inject } from '@angular/core';
|
|
2
2
|
import { Router } from '@angular/router';
|
|
3
3
|
import { isString } from '@odx/angular/utils';
|
|
4
|
-
import {
|
|
4
|
+
import { EMPTY, of, switchMap, take, tap } from 'rxjs';
|
|
5
5
|
import { AuthService } from './auth.service';
|
|
6
6
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
7
7
|
export function authGuard(authorizedHandler, redirectTo) {
|
|
8
8
|
return (_, state) => {
|
|
9
9
|
const authService = inject(AuthService);
|
|
10
10
|
const router = inject(Router, { optional: true });
|
|
11
|
-
return authService.isAuthenticated$.pipe(
|
|
11
|
+
return authService.isAuthenticated$.pipe(switchMap((isAuthenticated) => {
|
|
12
12
|
if (!isAuthenticated) {
|
|
13
13
|
authService.signIn(state.url);
|
|
14
|
-
return
|
|
14
|
+
return EMPTY;
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
const isAuthorized = authorizedHandler?.(authService.getIdentityClaims(), authService, router) ?? isAuthenticated;
|
|
17
|
+
return of(isAuthorized);
|
|
17
18
|
}), tap((isAuthorized) => {
|
|
18
19
|
if (isAuthorized || !router)
|
|
19
20
|
return;
|
|
@@ -26,4 +27,4 @@ export function authGuard(authorizedHandler, redirectTo) {
|
|
|
26
27
|
}), take(1));
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2F1dGgvc3JjL2xpYi9hdXRoLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkMsT0FBTyxFQUFpQixNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDdkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRzdDLDhEQUE4RDtBQUM5RCxNQUFNLFVBQVUsU0FBUyxDQUFDLGlCQUFxQyxFQUFFLFVBQTJCO0lBQzFGLE9BQU8sQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUU7UUFDbEIsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUVsRCxPQUFPLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQ3RDLFNBQVMsQ0FBQyxDQUFDLGVBQWUsRUFBRSxFQUFFO1lBQzVCLElBQUksQ0FBQyxlQUFlLEVBQUU7Z0JBQ3BCLFdBQVcsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUU5QixPQUFPLEtBQUssQ0FBQzthQUNkO1lBQ0QsTUFBTSxZQUFZLEdBQUcsaUJBQWlCLEVBQUUsQ0FBQyxXQUFXLENBQUMsaUJBQWlCLEVBQUUsRUFBRSxXQUFXLEVBQUUsTUFBTSxDQUFDLElBQUksZUFBZSxDQUFDO1lBRWxILE9BQU8sRUFBRSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzFCLENBQUMsQ0FBQyxFQUNGLEdBQUcsQ0FBQyxDQUFDLFlBQVksRUFBRSxFQUFFO1lBQ25CLElBQUksWUFBWSxJQUFJLENBQUMsTUFBTTtnQkFBRSxPQUFPO1lBQ3BDLElBQUksUUFBUSxDQUFDLFVBQVUsQ0FBQyxFQUFFO2dCQUN4QixNQUFNLENBQUMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDO2FBQ2xDO2lCQUFNLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtnQkFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQzthQUM3QjtRQUNILENBQUMsQ0FBQyxFQUNGLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FDUixDQUFDO0lBQ0osQ0FBQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGluamVjdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ2FuQWN0aXZhdGVGbiwgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IGlzU3RyaW5nIH0gZnJvbSAnQG9keC9hbmd1bGFyL3V0aWxzJztcbmltcG9ydCB7IEVNUFRZLCBvZiwgc3dpdGNoTWFwLCB0YWtlLCB0YXAgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IEF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQXV0aG9yaXplZEhhbmRsZXIgfSBmcm9tICcuL21vZGVscyc7XG5cbi8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZXhwbGljaXQtYW55XG5leHBvcnQgZnVuY3Rpb24gYXV0aEd1YXJkKGF1dGhvcml6ZWRIYW5kbGVyPzogQXV0aG9yaXplZEhhbmRsZXIsIHJlZGlyZWN0VG8/OiBhbnlbXSB8IHN0cmluZyk6IENhbkFjdGl2YXRlRm4ge1xuICByZXR1cm4gKF8sIHN0YXRlKSA9PiB7XG4gICAgY29uc3QgYXV0aFNlcnZpY2UgPSBpbmplY3QoQXV0aFNlcnZpY2UpO1xuICAgIGNvbnN0IHJvdXRlciA9IGluamVjdChSb3V0ZXIsIHsgb3B0aW9uYWw6IHRydWUgfSk7XG5cbiAgICByZXR1cm4gYXV0aFNlcnZpY2UuaXNBdXRoZW50aWNhdGVkJC5waXBlKFxuICAgICAgc3dpdGNoTWFwKChpc0F1dGhlbnRpY2F0ZWQpID0+IHtcbiAgICAgICAgaWYgKCFpc0F1dGhlbnRpY2F0ZWQpIHtcbiAgICAgICAgICBhdXRoU2VydmljZS5zaWduSW4oc3RhdGUudXJsKTtcblxuICAgICAgICAgIHJldHVybiBFTVBUWTtcbiAgICAgICAgfVxuICAgICAgICBjb25zdCBpc0F1dGhvcml6ZWQgPSBhdXRob3JpemVkSGFuZGxlcj8uKGF1dGhTZXJ2aWNlLmdldElkZW50aXR5Q2xhaW1zKCksIGF1dGhTZXJ2aWNlLCByb3V0ZXIpID8/IGlzQXV0aGVudGljYXRlZDtcblxuICAgICAgICByZXR1cm4gb2YoaXNBdXRob3JpemVkKTtcbiAgICAgIH0pLFxuICAgICAgdGFwKChpc0F1dGhvcml6ZWQpID0+IHtcbiAgICAgICAgaWYgKGlzQXV0aG9yaXplZCB8fCAhcm91dGVyKSByZXR1cm47XG4gICAgICAgIGlmIChpc1N0cmluZyhyZWRpcmVjdFRvKSkge1xuICAgICAgICAgIHJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHJlZGlyZWN0VG8pO1xuICAgICAgICB9IGVsc2UgaWYgKEFycmF5LmlzQXJyYXkocmVkaXJlY3RUbykpIHtcbiAgICAgICAgICByb3V0ZXIubmF2aWdhdGUocmVkaXJlY3RUbyk7XG4gICAgICAgIH1cbiAgICAgIH0pLFxuICAgICAgdGFrZSgxKSxcbiAgICApO1xuICB9O1xufVxuIl19
|
|
@@ -2,7 +2,6 @@ import { HttpErrorResponse } from '@angular/common/http';
|
|
|
2
2
|
import { inject, Injectable } from '@angular/core';
|
|
3
3
|
import { Router } from '@angular/router';
|
|
4
4
|
import { WindowRef } from '@odx/angular';
|
|
5
|
-
import { fromEvents } from '@odx/angular/rxjs';
|
|
6
5
|
import { OAuthErrorEvent, OAuthService } from 'angular-oauth2-oidc';
|
|
7
6
|
import { deepmerge } from 'deepmerge-ts';
|
|
8
7
|
import jwtDecode from 'jwt-decode';
|
|
@@ -18,14 +17,15 @@ export class AuthService {
|
|
|
18
17
|
this.router = inject(Router);
|
|
19
18
|
this.windowRef = inject(WindowRef);
|
|
20
19
|
this.isInitialized$$ = new BehaviorSubject(false);
|
|
20
|
+
this.isRedirecting$$ = new BehaviorSubject(false);
|
|
21
21
|
this.onAccessTokenUpdate$ = fromEvent(this.windowRef.nativeWindow, 'storage').pipe(filter(({ key }) => key === 'access_token' || key === null), startWith(null), share());
|
|
22
22
|
this.onAuthStateChange$ = combineLatest([this.oauthService.events.pipe(startWith(null)), this.windowRef.isOnline$, this.onAccessTokenUpdate$]);
|
|
23
23
|
this.isInitialized$ = this.isInitialized$$.pipe(filter(Boolean), distinctUntilChanged());
|
|
24
|
+
this.isRedirecting$ = this.isRedirecting$$.pipe(distinctUntilChanged(), share());
|
|
25
|
+
this.isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());
|
|
24
26
|
this.isAuthenticated$ = this.isInitialized$.pipe(switchMap(() => this.authPluginManager.pluginsReady$), switchMap(() => this.onAuthStateChange$), map(() => this.isAuthenticated()), shareReplay({ refCount: true }));
|
|
25
27
|
this.identityClaims$ = this.isAuthenticated$.pipe(map(() => this.getIdentityClaims()), shareReplay({ refCount: true }));
|
|
26
28
|
this.errors$ = this.oauthService.events.pipe(filter((event) => event instanceof OAuthErrorEvent), share());
|
|
27
|
-
this.isRedirecting$ = fromEvents(this.windowRef.nativeWindow, 'beforeunload').pipe(map(Boolean), distinctUntilChanged(), share());
|
|
28
|
-
this.isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());
|
|
29
29
|
this.windowRef.isOnline$.subscribe((isOnline) => {
|
|
30
30
|
if (isOnline) {
|
|
31
31
|
this.oauthService.setupAutomaticSilentRefresh();
|
|
@@ -37,10 +37,13 @@ export class AuthService {
|
|
|
37
37
|
this.authPluginManager.runPlugins(this).subscribe();
|
|
38
38
|
}
|
|
39
39
|
async initialize(config) {
|
|
40
|
-
this.oauthService.configure(
|
|
40
|
+
this.oauthService.configure({
|
|
41
|
+
...config,
|
|
42
|
+
openUri: this.redirectToLogin.bind(this),
|
|
43
|
+
});
|
|
41
44
|
try {
|
|
42
45
|
await this.oauthService.loadDiscoveryDocument(this.authConfig.discoveryUrl);
|
|
43
|
-
await this.oauthService.
|
|
46
|
+
await this.oauthService.tryLogin();
|
|
44
47
|
if (this.getRefreshToken() && !this.isAuthenticated()) {
|
|
45
48
|
await this.oauthService.refreshToken();
|
|
46
49
|
}
|
|
@@ -50,18 +53,13 @@ export class AuthService {
|
|
|
50
53
|
}
|
|
51
54
|
}
|
|
52
55
|
catch (error) {
|
|
53
|
-
if (error instanceof HttpErrorResponse) {
|
|
54
|
-
this.isInitialized$$.next(true);
|
|
55
|
-
}
|
|
56
|
-
else if (error instanceof OAuthErrorEvent) {
|
|
57
|
-
if (error.type === 'token_refresh_error') {
|
|
58
|
-
this.signIn(this.windowRef.location.pathname);
|
|
59
|
-
}
|
|
60
|
-
this.isInitialized$$.next(true);
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
56
|
+
if (!(error instanceof HttpErrorResponse || error instanceof OAuthErrorEvent)) {
|
|
63
57
|
throw error;
|
|
64
58
|
}
|
|
59
|
+
if (error.type === 'token_refresh_error') {
|
|
60
|
+
this.signIn(this.windowRef.location.pathname);
|
|
61
|
+
}
|
|
62
|
+
this.isInitialized$$.next(true);
|
|
65
63
|
}
|
|
66
64
|
if (this.oauthService.hasValidAccessToken()) {
|
|
67
65
|
await this.routeToRequestedUrl();
|
|
@@ -72,7 +70,7 @@ export class AuthService {
|
|
|
72
70
|
return new URL(this.oauthService.issuer);
|
|
73
71
|
}
|
|
74
72
|
signIn(url) {
|
|
75
|
-
this.oauthService.
|
|
73
|
+
this.oauthService.initLoginFlow(url);
|
|
76
74
|
}
|
|
77
75
|
signOut() {
|
|
78
76
|
this.oauthService.logOut(!this.getAccessToken());
|
|
@@ -124,6 +122,10 @@ export class AuthService {
|
|
|
124
122
|
const issuedAt = this.getIdentityClaims()?.iat ?? 0;
|
|
125
123
|
return Date.now() - issuedAt * 1000 <= this.authConfig.maxOfflineTime * 1000;
|
|
126
124
|
}
|
|
125
|
+
redirectToLogin(uri) {
|
|
126
|
+
this.windowRef.location.assign(uri);
|
|
127
|
+
this.isRedirecting$$.next(true);
|
|
128
|
+
}
|
|
127
129
|
}
|
|
128
130
|
AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
129
131
|
AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthService, providedIn: 'root' });
|
|
@@ -131,4 +133,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
131
133
|
type: Injectable,
|
|
132
134
|
args: [{ providedIn: 'root' }]
|
|
133
135
|
}], ctorParameters: function () { return []; } });
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../packages/auth/src/lib/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAc,eAAe,EAAE,YAAY,EAAiB,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,SAAyB,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACrJ,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAqB,iBAAiB,EAAE,MAAM,UAAU,CAAC;;AAGhE,MAAM,OAAO,WAAW;IAiCtB;QAhCiB,eAAU,GAAG,gBAAgB,EAAE,CAAC;QAChC,sBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC9C,iBAAY,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QACpC,WAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,cAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAE9B,oBAAe,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC7C,yBAAoB,GAAG,SAAS,CAAe,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,IAAI,CAC1G,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,cAAc,IAAI,GAAG,KAAK,IAAI,CAAC,EAC3D,SAAS,CAAC,IAAI,CAAC,EACf,KAAK,EAAE,CACR,CAAC;QACe,uBAAkB,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAE3I,mBAAc,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACpF,qBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CACzD,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,EACrD,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,EACxC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,EACjC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAChC,CAAC;QACc,oBAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC1D,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EACnC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAChC,CAAC;QACc,YAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CACrD,MAAM,CAAC,CAAC,KAAK,EAA4B,EAAE,CAAC,KAAK,YAAY,eAAe,CAAC,EAC7E,KAAK,EAAE,CACR,CAAC;QACc,mBAAc,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7H,eAAU,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAG3H,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,CAAC;aACjD;iBAAM;gBACL,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;aAC1C;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,MAAkB;QACxC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI;YACF,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE;gBACrD,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;aACxC;YACD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE;gBAC9E,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;aAC9B;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,iBAAiB,EAAE;gBACtC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjC;iBAAM,IAAI,KAAK,YAAY,eAAe,EAAE;gBAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE;oBACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC/C;gBACD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjC;iBAAM;gBACL,MAAM,KAAK,CAAC;aACb;SACF;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE;YAC3C,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAClC;IACH,CAAC;IAEM,SAAS;QACd,oEAAoE;QACpE,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,MAAO,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,GAAY;QACxB,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACnD,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IAC1C,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC;IACpD,CAAC;IAEM,qBAAqB;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEpC,OAAO,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,IAAI,IAAI,CAAC;IACrD,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC;IAChD,CAAC;IAEM,iBAAiB;QACtB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,OAAO,IAAI,CAAC;QACpC,OAAO,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAA0B,CAAC;IACvH,CAAC;IAEM,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAAE,OAAO,IAAI,CAAC;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;IAC/C,CAAC;IAEM,eAAe;QACpB,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC;SACvF;QACD,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACrC,CAAC;IAEM,YAAY,CAAC,iBAA4C;QAC9D,OAAO,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;IACjG,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK;YAAE,OAAO;QACrC,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEO,oBAAoB;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;IAC/E,CAAC;;wGA9IU,WAAW;4GAAX,WAAW,cADE,MAAM;2FACnB,WAAW;kBADvB,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\nimport { inject, Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { WindowRef } from '@odx/angular';\nimport { fromEvents } from '@odx/angular/rxjs';\nimport { AuthConfig, OAuthErrorEvent, OAuthService, TokenResponse } from 'angular-oauth2-oidc';\nimport { deepmerge } from 'deepmerge-ts';\nimport jwtDecode, { JwtPayload } from 'jwt-decode';\nimport { BehaviorSubject, combineLatest, distinctUntilChanged, filter, fromEvent, map, merge, share, shareReplay, startWith, switchMap } from 'rxjs';\nimport { injectAuthConfig } from './auth.config';\nimport { AuthorizedHandler, AuthPluginManager } from './models';\n\n@Injectable({ providedIn: 'root' })\nexport class AuthService {\n  private readonly authConfig = injectAuthConfig();\n  private readonly authPluginManager = inject(AuthPluginManager);\n  private readonly oauthService = inject(OAuthService);\n  private readonly router = inject(Router);\n  private readonly windowRef = inject(WindowRef);\n\n  private readonly isInitialized$$ = new BehaviorSubject(false);\n  private readonly onAccessTokenUpdate$ = fromEvent<StorageEvent>(this.windowRef.nativeWindow, 'storage').pipe(\n    filter(({ key }) => key === 'access_token' || key === null),\n    startWith(null),\n    share(),\n  );\n  private readonly onAuthStateChange$ = combineLatest([this.oauthService.events.pipe(startWith(null)), this.windowRef.isOnline$, this.onAccessTokenUpdate$]);\n\n  public readonly isInitialized$ = this.isInitialized$$.pipe(filter(Boolean), distinctUntilChanged());\n  public readonly isAuthenticated$ = this.isInitialized$.pipe(\n    switchMap(() => this.authPluginManager.pluginsReady$),\n    switchMap(() => this.onAuthStateChange$),\n    map(() => this.isAuthenticated()),\n    shareReplay({ refCount: true }),\n  );\n  public readonly identityClaims$ = this.isAuthenticated$.pipe(\n    map(() => this.getIdentityClaims()),\n    shareReplay({ refCount: true }),\n  );\n  public readonly errors$ = this.oauthService.events.pipe(\n    filter((event): event is OAuthErrorEvent => event instanceof OAuthErrorEvent),\n    share(),\n  );\n  public readonly isRedirecting$ = fromEvents(this.windowRef.nativeWindow, 'beforeunload').pipe(map(Boolean), distinctUntilChanged(), share());\n  public readonly isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());\n\n  constructor() {\n    this.windowRef.isOnline$.subscribe((isOnline) => {\n      if (isOnline) {\n        this.oauthService.setupAutomaticSilentRefresh();\n      } else {\n        this.oauthService.stopAutomaticRefresh();\n      }\n    });\n    this.authPluginManager.runPlugins(this).subscribe();\n  }\n\n  public async initialize(config: AuthConfig): Promise<void> {\n    this.oauthService.configure(config);\n    try {\n      await this.oauthService.loadDiscoveryDocument(this.authConfig.discoveryUrl);\n      await this.oauthService.tryLoginCodeFlow();\n      if (this.getRefreshToken() && !this.isAuthenticated()) {\n        await this.oauthService.refreshToken();\n      }\n      this.isInitialized$$.next(true);\n      if (this.authConfig.loadUserProfile && this.oauthService.hasValidAccessToken()) {\n        await this.loadUserProfile();\n      }\n    } catch (error) {\n      if (error instanceof HttpErrorResponse) {\n        this.isInitialized$$.next(true);\n      } else if (error instanceof OAuthErrorEvent) {\n        if (error.type === 'token_refresh_error') {\n          this.signIn(this.windowRef.location.pathname);\n        }\n        this.isInitialized$$.next(true);\n      } else {\n        throw error;\n      }\n    }\n    if (this.oauthService.hasValidAccessToken()) {\n      await this.routeToRequestedUrl();\n    }\n  }\n\n  public getIssuer(): URL {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    return new URL(this.oauthService.issuer!);\n  }\n\n  public signIn(url?: string): void {\n    this.oauthService.initCodeFlow(url);\n  }\n\n  public signOut(): void {\n    this.oauthService.logOut(!this.getAccessToken());\n  }\n\n  public async loadUserProfile(): Promise<void> {\n    await this.oauthService.loadUserProfile();\n  }\n\n  public async refreshTokens(): Promise<TokenResponse> {\n    return this.oauthService.refreshToken();\n  }\n\n  public getAccessToken(): string | null {\n    return this.oauthService.getAccessToken() ?? null;\n  }\n\n  public getAccessTokenPayload(): (OdxAuth.AccessTokenPayload & Required<JwtPayload>) | null {\n    const token = this.getAccessToken();\n\n    return token ? jwtDecode(token) : null;\n  }\n\n  public getRefreshToken(): string | null {\n    return this.oauthService.getRefreshToken() ?? null;\n  }\n\n  public getIdToken(): string | null {\n    return this.oauthService.getIdToken() ?? null;\n  }\n\n  public getIdentityClaims(): OdxAuth.IdentiyClaims | null {\n    if (!this.getIdToken()) return null;\n    return deepmerge(this.oauthService.getIdentityClaims(), this.authPluginManager.getResult()) as OdxAuth.IdentiyClaims;\n  }\n\n  public getRawIdentityClaims(): OdxAuth.RawIdentityClaims | null {\n    if (!this.getIdToken()) return null;\n    return this.oauthService.getIdentityClaims();\n  }\n\n  public isAuthenticated(): boolean {\n    if (this.windowRef.isOnline()) {\n      return this.oauthService.hasValidAccessToken() && this.oauthService.hasValidIdToken();\n    }\n    return this.hasValidOfflineToken();\n  }\n\n  public isAuthorized(authorizedHandler?: AuthorizedHandler | null): boolean {\n    return this.isAuthenticated() && (authorizedHandler?.(this.getIdentityClaims(), this) ?? true);\n  }\n\n  private async routeToRequestedUrl(): Promise<void> {\n    if (!this.oauthService.state) return;\n    await this.router.navigateByUrl(decodeURIComponent(this.oauthService.state));\n  }\n\n  private hasValidOfflineToken(): boolean {\n    const issuedAt = this.getIdentityClaims()?.iat ?? 0;\n\n    return Date.now() - issuedAt * 1000 <= this.authConfig.maxOfflineTime * 1000;\n  }\n}\n"]}
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../packages/auth/src/lib/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\nimport { inject, Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { WindowRef } from '@odx/angular';\nimport { AuthConfig, OAuthErrorEvent, OAuthService, TokenResponse } from 'angular-oauth2-oidc';\nimport { deepmerge } from 'deepmerge-ts';\nimport jwtDecode, { JwtPayload } from 'jwt-decode';\nimport { BehaviorSubject, combineLatest, distinctUntilChanged, filter, fromEvent, map, merge, share, shareReplay, startWith, switchMap } from 'rxjs';\nimport { injectAuthConfig } from './auth.config';\nimport { AuthorizedHandler, AuthPluginManager } from './models';\n\n@Injectable({ providedIn: 'root' })\nexport class AuthService {\n  private readonly authConfig = injectAuthConfig();\n  private readonly authPluginManager = inject(AuthPluginManager);\n  private readonly oauthService = inject(OAuthService);\n  private readonly router = inject(Router);\n  private readonly windowRef = inject(WindowRef);\n\n  private readonly isInitialized$$ = new BehaviorSubject(false);\n  private readonly isRedirecting$$ = new BehaviorSubject(false);\n  private readonly onAccessTokenUpdate$ = fromEvent<StorageEvent>(this.windowRef.nativeWindow, 'storage').pipe(\n    filter(({ key }) => key === 'access_token' || key === null),\n    startWith(null),\n    share(),\n  );\n  private readonly onAuthStateChange$ = combineLatest([this.oauthService.events.pipe(startWith(null)), this.windowRef.isOnline$, this.onAccessTokenUpdate$]);\n\n  public readonly isInitialized$ = this.isInitialized$$.pipe(filter(Boolean), distinctUntilChanged());\n  public readonly isRedirecting$ = this.isRedirecting$$.pipe(distinctUntilChanged(), share());\n  public readonly isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());\n  public readonly isAuthenticated$ = this.isInitialized$.pipe(\n    switchMap(() => this.authPluginManager.pluginsReady$),\n    switchMap(() => this.onAuthStateChange$),\n    map(() => this.isAuthenticated()),\n    shareReplay({ refCount: true }),\n  );\n  public readonly identityClaims$ = this.isAuthenticated$.pipe(\n    map(() => this.getIdentityClaims()),\n    shareReplay({ refCount: true }),\n  );\n  public readonly errors$ = this.oauthService.events.pipe(\n    filter((event): event is OAuthErrorEvent => event instanceof OAuthErrorEvent),\n    share(),\n  );\n\n  constructor() {\n    this.windowRef.isOnline$.subscribe((isOnline) => {\n      if (isOnline) {\n        this.oauthService.setupAutomaticSilentRefresh();\n      } else {\n        this.oauthService.stopAutomaticRefresh();\n      }\n    });\n    this.authPluginManager.runPlugins(this).subscribe();\n  }\n\n  public async initialize(config: AuthConfig): Promise<void> {\n    this.oauthService.configure({\n      ...config,\n      openUri: this.redirectToLogin.bind(this),\n    });\n    try {\n      await this.oauthService.loadDiscoveryDocument(this.authConfig.discoveryUrl);\n      await this.oauthService.tryLogin();\n      if (this.getRefreshToken() && !this.isAuthenticated()) {\n        await this.oauthService.refreshToken();\n      }\n      this.isInitialized$$.next(true);\n      if (this.authConfig.loadUserProfile && this.oauthService.hasValidAccessToken()) {\n        await this.loadUserProfile();\n      }\n    } catch (error) {\n      if (!(error instanceof HttpErrorResponse || error instanceof OAuthErrorEvent)) {\n        throw error;\n      }\n      if (error.type === 'token_refresh_error') {\n        this.signIn(this.windowRef.location.pathname);\n      }\n      this.isInitialized$$.next(true);\n    }\n    if (this.oauthService.hasValidAccessToken()) {\n      await this.routeToRequestedUrl();\n    }\n  }\n\n  public getIssuer(): URL {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    return new URL(this.oauthService.issuer!);\n  }\n\n  public signIn(url?: string): void {\n    this.oauthService.initLoginFlow(url);\n  }\n\n  public signOut(): void {\n    this.oauthService.logOut(!this.getAccessToken());\n  }\n\n  public async loadUserProfile(): Promise<void> {\n    await this.oauthService.loadUserProfile();\n  }\n\n  public async refreshTokens(): Promise<TokenResponse> {\n    return this.oauthService.refreshToken();\n  }\n\n  public getAccessToken(): string | null {\n    return this.oauthService.getAccessToken() ?? null;\n  }\n\n  public getAccessTokenPayload(): (OdxAuth.AccessTokenPayload & Required<JwtPayload>) | null {\n    const token = this.getAccessToken();\n\n    return token ? jwtDecode(token) : null;\n  }\n\n  public getRefreshToken(): string | null {\n    return this.oauthService.getRefreshToken() ?? null;\n  }\n\n  public getIdToken(): string | null {\n    return this.oauthService.getIdToken() ?? null;\n  }\n\n  public getIdentityClaims(): OdxAuth.IdentiyClaims | null {\n    if (!this.getIdToken()) return null;\n    return deepmerge(this.oauthService.getIdentityClaims(), this.authPluginManager.getResult()) as OdxAuth.IdentiyClaims;\n  }\n\n  public getRawIdentityClaims(): OdxAuth.RawIdentityClaims | null {\n    if (!this.getIdToken()) return null;\n    return this.oauthService.getIdentityClaims();\n  }\n\n  public isAuthenticated(): boolean {\n    if (this.windowRef.isOnline()) {\n      return this.oauthService.hasValidAccessToken() && this.oauthService.hasValidIdToken();\n    }\n    return this.hasValidOfflineToken();\n  }\n\n  public isAuthorized(authorizedHandler?: AuthorizedHandler | null): boolean {\n    return this.isAuthenticated() && (authorizedHandler?.(this.getIdentityClaims(), this) ?? true);\n  }\n\n  private async routeToRequestedUrl(): Promise<void> {\n    if (!this.oauthService.state) return;\n    await this.router.navigateByUrl(decodeURIComponent(this.oauthService.state));\n  }\n\n  private hasValidOfflineToken(): boolean {\n    const issuedAt = this.getIdentityClaims()?.iat ?? 0;\n\n    return Date.now() - issuedAt * 1000 <= this.authConfig.maxOfflineTime * 1000;\n  }\n\n  private redirectToLogin(uri: string): void {\n    this.windowRef.location.assign(uri);\n    this.isRedirecting$$.next(true);\n  }\n}\n"]}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
export function createInitials(value) {
|
|
2
2
|
if (!value)
|
|
3
3
|
return '';
|
|
4
|
-
const parts = value
|
|
4
|
+
const parts = value
|
|
5
|
+
.replace(/\([^()]*\)/, '')
|
|
6
|
+
.trim()
|
|
7
|
+
.split(' ');
|
|
5
8
|
return parts.reduce((initials, curr, index) => {
|
|
6
9
|
if (index === 0 || index === parts.length - 1) {
|
|
7
10
|
initials += curr[0].toUpperCase();
|
|
@@ -9,4 +12,4 @@ export function createInitials(value) {
|
|
|
9
12
|
return initials;
|
|
10
13
|
}, '');
|
|
11
14
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWluaXRpdGFscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2F1dGgvc3JjL2xpYi9oZWxwZXJzL2NyZWF0ZS1pbml0aXRhbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLGNBQWMsQ0FBQyxLQUFxQjtJQUNsRCxJQUFJLENBQUMsS0FBSztRQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ3RCLE1BQU0sS0FBSyxHQUFHLEtBQUs7U0FDaEIsT0FBTyxDQUFDLFlBQVksRUFBRSxFQUFFLENBQUM7U0FDekIsSUFBSSxFQUFFO1NBQ04sS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBRWQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRTtRQUM1QyxJQUFJLEtBQUssS0FBSyxDQUFDLElBQUksS0FBSyxLQUFLLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQzdDLFFBQVEsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7U0FDbkM7UUFDRCxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDVCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNyZWF0ZUluaXRpYWxzKHZhbHVlPzogc3RyaW5nIHwgbnVsbCk6IHN0cmluZyB7XG4gIGlmICghdmFsdWUpIHJldHVybiAnJztcbiAgY29uc3QgcGFydHMgPSB2YWx1ZVxuICAgIC5yZXBsYWNlKC9cXChbXigpXSpcXCkvLCAnJylcbiAgICAudHJpbSgpXG4gICAgLnNwbGl0KCcgJyk7XG5cbiAgcmV0dXJuIHBhcnRzLnJlZHVjZSgoaW5pdGlhbHMsIGN1cnIsIGluZGV4KSA9PiB7XG4gICAgaWYgKGluZGV4ID09PSAwIHx8IGluZGV4ID09PSBwYXJ0cy5sZW5ndGggLSAxKSB7XG4gICAgICBpbml0aWFscyArPSBjdXJyWzBdLnRvVXBwZXJDYXNlKCk7XG4gICAgfVxuICAgIHJldHVybiBpbml0aWFscztcbiAgfSwgJycpO1xufVxuIl19
|
|
@@ -3,12 +3,15 @@ export function resolveUsername(claims) {
|
|
|
3
3
|
if (isString(claims['firstname']) && isString(claims['lastname'])) {
|
|
4
4
|
return `${claims['firstname']} ${claims['lastname']}`;
|
|
5
5
|
}
|
|
6
|
-
if (isString(claims['
|
|
7
|
-
return claims['
|
|
6
|
+
if (isString(claims['given_name']) && isString(claims['family_name'])) {
|
|
7
|
+
return `${claims['given_name']} ${claims['family_name']}`;
|
|
8
8
|
}
|
|
9
9
|
if (isString(claims['name'])) {
|
|
10
10
|
return claims['name'];
|
|
11
11
|
}
|
|
12
|
+
if (isString(claims['displayname'])) {
|
|
13
|
+
return claims['displayname'];
|
|
14
|
+
}
|
|
12
15
|
return '';
|
|
13
16
|
}
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS11c2VybmFtZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2F1dGgvc3JjL2xpYi9oZWxwZXJzL3Jlc29sdmUtdXNlcm5hbWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlDLE1BQU0sVUFBVSxlQUFlLENBQUMsTUFBaUM7SUFDL0QsSUFBSSxRQUFRLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxFQUFFO1FBQ2pFLE9BQU8sR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7S0FDdkQ7SUFDRCxJQUFJLFFBQVEsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxRQUFRLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUU7UUFDckUsT0FBTyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQztLQUMzRDtJQUNELElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFO1FBQzVCLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQ3ZCO0lBQ0QsSUFBSSxRQUFRLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUU7UUFDbkMsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7S0FDOUI7SUFFRCxPQUFPLEVBQUUsQ0FBQztBQUNaLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpc1N0cmluZyB9IGZyb20gJ0BvZHgvYW5ndWxhci91dGlscyc7XG5cbmV4cG9ydCBmdW5jdGlvbiByZXNvbHZlVXNlcm5hbWUoY2xhaW1zOiBPZHhBdXRoLlJhd0lkZW50aXR5Q2xhaW1zKTogc3RyaW5nIHtcbiAgaWYgKGlzU3RyaW5nKGNsYWltc1snZmlyc3RuYW1lJ10pICYmIGlzU3RyaW5nKGNsYWltc1snbGFzdG5hbWUnXSkpIHtcbiAgICByZXR1cm4gYCR7Y2xhaW1zWydmaXJzdG5hbWUnXX0gJHtjbGFpbXNbJ2xhc3RuYW1lJ119YDtcbiAgfVxuICBpZiAoaXNTdHJpbmcoY2xhaW1zWydnaXZlbl9uYW1lJ10pICYmIGlzU3RyaW5nKGNsYWltc1snZmFtaWx5X25hbWUnXSkpIHtcbiAgICByZXR1cm4gYCR7Y2xhaW1zWydnaXZlbl9uYW1lJ119ICR7Y2xhaW1zWydmYW1pbHlfbmFtZSddfWA7XG4gIH1cbiAgaWYgKGlzU3RyaW5nKGNsYWltc1snbmFtZSddKSkge1xuICAgIHJldHVybiBjbGFpbXNbJ25hbWUnXTtcbiAgfVxuICBpZiAoaXNTdHJpbmcoY2xhaW1zWydkaXNwbGF5bmFtZSddKSkge1xuICAgIHJldHVybiBjbGFpbXNbJ2Rpc3BsYXluYW1lJ107XG4gIH1cblxuICByZXR1cm4gJyc7XG59XG4iXX0=
|
package/fesm2015/odx-auth.mjs
CHANGED
|
@@ -13,11 +13,10 @@ import { isString, createConfigTokens, untilDestroyed, Position, buildUrl } from
|
|
|
13
13
|
import { __awaiter } from 'tslib';
|
|
14
14
|
import { HttpErrorResponse } from '@angular/common/http';
|
|
15
15
|
import { Router } from '@angular/router';
|
|
16
|
-
import { fromEvents } from '@odx/angular/rxjs';
|
|
17
16
|
import { OAuthService, OAuthErrorEvent, provideOAuthClient, OAuthModuleConfig, OAuthStorage } from 'angular-oauth2-oidc';
|
|
18
17
|
import { deepmerge } from 'deepmerge-ts';
|
|
19
18
|
import jwtDecode from 'jwt-decode';
|
|
20
|
-
import { BehaviorSubject, filter, map, distinctUntilChanged, share, of, switchMap, combineLatest, tap, take, fromEvent, startWith, shareReplay,
|
|
19
|
+
import { BehaviorSubject, filter, map, distinctUntilChanged, share, of, switchMap, combineLatest, tap, take, fromEvent, startWith, merge, shareReplay, EMPTY } from 'rxjs';
|
|
21
20
|
import * as i1$1 from '@angular/common';
|
|
22
21
|
import { NgIf } from '@angular/common';
|
|
23
22
|
import * as i2 from '@ngrx/component';
|
|
@@ -29,7 +28,10 @@ import * as i7 from '@odx/angular/components/icon';
|
|
|
29
28
|
function createInitials(value) {
|
|
30
29
|
if (!value)
|
|
31
30
|
return '';
|
|
32
|
-
const parts = value
|
|
31
|
+
const parts = value
|
|
32
|
+
.replace(/\([^()]*\)/, '')
|
|
33
|
+
.trim()
|
|
34
|
+
.split(' ');
|
|
33
35
|
return parts.reduce((initials, curr, index) => {
|
|
34
36
|
if (index === 0 || index === parts.length - 1) {
|
|
35
37
|
initials += curr[0].toUpperCase();
|
|
@@ -55,12 +57,15 @@ function resolveUsername(claims) {
|
|
|
55
57
|
if (isString(claims['firstname']) && isString(claims['lastname'])) {
|
|
56
58
|
return `${claims['firstname']} ${claims['lastname']}`;
|
|
57
59
|
}
|
|
58
|
-
if (isString(claims['
|
|
59
|
-
return claims['
|
|
60
|
+
if (isString(claims['given_name']) && isString(claims['family_name'])) {
|
|
61
|
+
return `${claims['given_name']} ${claims['family_name']}`;
|
|
60
62
|
}
|
|
61
63
|
if (isString(claims['name'])) {
|
|
62
64
|
return claims['name'];
|
|
63
65
|
}
|
|
66
|
+
if (isString(claims['displayname'])) {
|
|
67
|
+
return claims['displayname'];
|
|
68
|
+
}
|
|
64
69
|
return '';
|
|
65
70
|
}
|
|
66
71
|
|
|
@@ -167,14 +172,15 @@ class AuthService {
|
|
|
167
172
|
this.router = inject(Router);
|
|
168
173
|
this.windowRef = inject(WindowRef);
|
|
169
174
|
this.isInitialized$$ = new BehaviorSubject(false);
|
|
175
|
+
this.isRedirecting$$ = new BehaviorSubject(false);
|
|
170
176
|
this.onAccessTokenUpdate$ = fromEvent(this.windowRef.nativeWindow, 'storage').pipe(filter(({ key }) => key === 'access_token' || key === null), startWith(null), share());
|
|
171
177
|
this.onAuthStateChange$ = combineLatest([this.oauthService.events.pipe(startWith(null)), this.windowRef.isOnline$, this.onAccessTokenUpdate$]);
|
|
172
178
|
this.isInitialized$ = this.isInitialized$$.pipe(filter(Boolean), distinctUntilChanged());
|
|
179
|
+
this.isRedirecting$ = this.isRedirecting$$.pipe(distinctUntilChanged(), share());
|
|
180
|
+
this.isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());
|
|
173
181
|
this.isAuthenticated$ = this.isInitialized$.pipe(switchMap(() => this.authPluginManager.pluginsReady$), switchMap(() => this.onAuthStateChange$), map(() => this.isAuthenticated()), shareReplay({ refCount: true }));
|
|
174
182
|
this.identityClaims$ = this.isAuthenticated$.pipe(map(() => this.getIdentityClaims()), shareReplay({ refCount: true }));
|
|
175
183
|
this.errors$ = this.oauthService.events.pipe(filter((event) => event instanceof OAuthErrorEvent), share());
|
|
176
|
-
this.isRedirecting$ = fromEvents(this.windowRef.nativeWindow, 'beforeunload').pipe(map(Boolean), distinctUntilChanged(), share());
|
|
177
|
-
this.isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());
|
|
178
184
|
this.windowRef.isOnline$.subscribe((isOnline) => {
|
|
179
185
|
if (isOnline) {
|
|
180
186
|
this.oauthService.setupAutomaticSilentRefresh();
|
|
@@ -187,10 +193,10 @@ class AuthService {
|
|
|
187
193
|
}
|
|
188
194
|
initialize(config) {
|
|
189
195
|
return __awaiter(this, void 0, void 0, function* () {
|
|
190
|
-
this.oauthService.configure(config);
|
|
196
|
+
this.oauthService.configure(Object.assign(Object.assign({}, config), { openUri: this.redirectToLogin.bind(this) }));
|
|
191
197
|
try {
|
|
192
198
|
yield this.oauthService.loadDiscoveryDocument(this.authConfig.discoveryUrl);
|
|
193
|
-
yield this.oauthService.
|
|
199
|
+
yield this.oauthService.tryLogin();
|
|
194
200
|
if (this.getRefreshToken() && !this.isAuthenticated()) {
|
|
195
201
|
yield this.oauthService.refreshToken();
|
|
196
202
|
}
|
|
@@ -200,18 +206,13 @@ class AuthService {
|
|
|
200
206
|
}
|
|
201
207
|
}
|
|
202
208
|
catch (error) {
|
|
203
|
-
if (error instanceof HttpErrorResponse) {
|
|
204
|
-
this.isInitialized$$.next(true);
|
|
205
|
-
}
|
|
206
|
-
else if (error instanceof OAuthErrorEvent) {
|
|
207
|
-
if (error.type === 'token_refresh_error') {
|
|
208
|
-
this.signIn(this.windowRef.location.pathname);
|
|
209
|
-
}
|
|
210
|
-
this.isInitialized$$.next(true);
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
209
|
+
if (!(error instanceof HttpErrorResponse || error instanceof OAuthErrorEvent)) {
|
|
213
210
|
throw error;
|
|
214
211
|
}
|
|
212
|
+
if (error.type === 'token_refresh_error') {
|
|
213
|
+
this.signIn(this.windowRef.location.pathname);
|
|
214
|
+
}
|
|
215
|
+
this.isInitialized$$.next(true);
|
|
215
216
|
}
|
|
216
217
|
if (this.oauthService.hasValidAccessToken()) {
|
|
217
218
|
yield this.routeToRequestedUrl();
|
|
@@ -223,7 +224,7 @@ class AuthService {
|
|
|
223
224
|
return new URL(this.oauthService.issuer);
|
|
224
225
|
}
|
|
225
226
|
signIn(url) {
|
|
226
|
-
this.oauthService.
|
|
227
|
+
this.oauthService.initLoginFlow(url);
|
|
227
228
|
}
|
|
228
229
|
signOut() {
|
|
229
230
|
this.oauthService.logOut(!this.getAccessToken());
|
|
@@ -286,6 +287,10 @@ class AuthService {
|
|
|
286
287
|
const issuedAt = (_b = (_a = this.getIdentityClaims()) === null || _a === void 0 ? void 0 : _a.iat) !== null && _b !== void 0 ? _b : 0;
|
|
287
288
|
return Date.now() - issuedAt * 1000 <= this.authConfig.maxOfflineTime * 1000;
|
|
288
289
|
}
|
|
290
|
+
redirectToLogin(uri) {
|
|
291
|
+
this.windowRef.location.assign(uri);
|
|
292
|
+
this.isRedirecting$$.next(true);
|
|
293
|
+
}
|
|
289
294
|
}
|
|
290
295
|
AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
291
296
|
AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthService, providedIn: 'root' });
|
|
@@ -383,10 +388,10 @@ class AuthComponent {
|
|
|
383
388
|
}
|
|
384
389
|
}
|
|
385
390
|
AuthComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
386
|
-
AuthComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: AuthComponent, isStandalone: true, selector: "odx-auth", inputs: { signInButtonText: "signInButtonText", signOutButtonText: "signOutButtonText" }, ngImport: i0, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n
|
|
391
|
+
AuthComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: AuthComponent, isStandalone: true, selector: "odx-auth", inputs: { signInButtonText: "signInButtonText", signOutButtonText: "signOutButtonText" }, ngImport: i0, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <odx-action-group>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n {{ signOutButtonText }}\n <odx-icon name=\"logout\" alignRight></odx-icon>\n </button>\n </odx-action-group>\n </div>\n </ng-template>\n </ng-template>\n <ng-template #notAuthenticated>\n <button class=\"odx-auth-sign-in\" odxButton odxAuthSignIn variant=\"secondary\" data-testid=\"odx-auth-sign-in-button\">\n <odx-icon name=\"user\" alignLeft></odx-icon>\n {{ signInButtonText }}\n </button>\n </ng-template>\n <ng-template #userAvatar>\n <odx-avatar class=\"odx-auth-user-avatar\">\n {{ vm.idClaims?.initials ?? '' }}\n </odx-avatar>\n </ng-template>\n </ng-template>\n <ng-template [ngIf]=\"authConfig.showRedirectOverlay\">\n <div class=\"odx-auth-overlay\" [odxLoadingSpinner]=\"true\" *ngIf=\"authService.isLoading$ | async\"></div>\n </ng-template>\n</odx-action-group>\n", styles: [".odx-auth-user-profile .odx-dropdown__inner>.odx-area-header{max-width:max(360px,25vw);min-width:296px}.odx-auth-overlay{position:fixed;z-index:var(--odx-v-layer-5);inset:0}\n"], dependencies: [{ kind: "ngmodule", type: CoreModule }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }, { kind: "directive", type: i2.LetDirective, selector: "[ngrxLet]", inputs: ["ngrxLet", "ngrxLetSuspenseTpl"] }, { kind: "ngmodule", type: AreaHeaderModule }, { kind: "component", type: i3.AreaHeaderComponent, selector: "odx-area-header", inputs: ["size"] }, { kind: "directive", type: i3.AreaHeaderSubtitleDirective, selector: "odx-area-header-subtitle" }, { kind: "component", type: i4.AvatarComponent, selector: "odx-avatar", inputs: ["size", "variant"] }, { kind: "component", type: i5.ActionGroupComponent, selector: "odx-action-group", inputs: ["reverse"] }, { kind: "component", type: i6.ButtonComponent, selector: "button[odxButton], a[odxButton]", inputs: ["variant", "size"] }, { kind: "component", type: i7.IconComponent, selector: "odx-icon", inputs: ["inline", "size", "name", "iconSet"] }, { kind: "ngmodule", type: DropdownModule }, { kind: "directive", type: i8.DropdownDirective, selector: "[odxDropdown]", inputs: ["odxDropdown", "odxDropdownDisabled", "odxDropdownShowLoader", "odxDropdownClickOutsideActive", "odxDropdownOptions", "odxDropdownReferenceElement", "odxDropdownTriggerElement", "odxDropdownHost", "odxDropdownOpenTrigger", "odxDropdownCloseTrigger"], outputs: ["odxDropdownBeforeOpen", "odxDropdownAfterOpen", "odxDropdownBeforeClose", "odxDropdownAfterClose"], exportAs: ["odxDropdown"] }, { kind: "ngmodule", type: HeaderModule }, { kind: "directive", type: LogoDirective, selector: "odx-logo", inputs: ["size", "variant"] }, { kind: "directive", type: SignInDirective, selector: "[odxButton][odxAuthSignIn]", outputs: ["odxAuthSignIn"] }, { kind: "directive", type: SignOutDirective, selector: "[odxButton][odxAuthSignOut]", outputs: ["odxAuthSignOut"] }, { kind: "ngmodule", type: LoadingSpinnerModule }, { kind: "directive", type: i1.LoadingSpinnerDirective, selector: "[odxLoadingSpinner]", inputs: ["odxLoadingSpinnerAutoColor", "odxLoadingSpinner", "odxLoadingSpinnerMinHeight"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None });
|
|
387
392
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthComponent, decorators: [{
|
|
388
393
|
type: Component,
|
|
389
|
-
args: [{ standalone: true, selector: 'odx-auth', imports: [CoreModule, AreaHeaderModule, DropdownModule, HeaderModule, LogoDirective, SignInDirective, SignOutDirective, LoadingSpinnerModule], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n
|
|
394
|
+
args: [{ standalone: true, selector: 'odx-auth', imports: [CoreModule, AreaHeaderModule, DropdownModule, HeaderModule, LogoDirective, SignInDirective, SignOutDirective, LoadingSpinnerModule], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, template: "<odx-action-group>\n <ng-template [ngrxLet]=\"{ idClaims: authService.identityClaims$, isAuthenticated: authService.isAuthenticated$ }\" let-vm>\n <ng-template [ngIf]=\"vm.isAuthenticated\" [ngIfElse]=\"notAuthenticated\">\n <button odxButton [odxDropdown]=\"userProfileMenu\" [odxDropdownOptions]=\"dropdownOptions\" data-testid=\"odx-auth-user-profile-button\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\"></ng-template>\n </button>\n <ng-template #userProfileMenu>\n <odx-area-header class=\"odx-padding-x-12\" size=\"small\">\n <ng-template [ngTemplateOutlet]=\"userAvatar\" ngProjectAs=\"odx-avatar\"></ng-template>\n {{ vm.idClaims?.username }}\n <odx-area-header-subtitle>\n {{ vm.idClaims?.email }}\n </odx-area-header-subtitle>\n </odx-area-header>\n <ng-content></ng-content>\n <div class=\"odx-margin-top-12\" odxLayout=\"flex vertical-center\">\n <odx-logo odxLayout=\"auto\" class=\"odx-margin-left-12 odx-margin-right-auto\"></odx-logo>\n <odx-action-group>\n <button odxButton odxAuthSignOut variant=\"ghost\" data-testid=\"odx-auth-sign-out-button\">\n {{ signOutButtonText }}\n <odx-icon name=\"logout\" alignRight></odx-icon>\n </button>\n </odx-action-group>\n </div>\n </ng-template>\n </ng-template>\n <ng-template #notAuthenticated>\n <button class=\"odx-auth-sign-in\" odxButton odxAuthSignIn variant=\"secondary\" data-testid=\"odx-auth-sign-in-button\">\n <odx-icon name=\"user\" alignLeft></odx-icon>\n {{ signInButtonText }}\n </button>\n </ng-template>\n <ng-template #userAvatar>\n <odx-avatar class=\"odx-auth-user-avatar\">\n {{ vm.idClaims?.initials ?? '' }}\n </odx-avatar>\n </ng-template>\n </ng-template>\n <ng-template [ngIf]=\"authConfig.showRedirectOverlay\">\n <div class=\"odx-auth-overlay\" [odxLoadingSpinner]=\"true\" *ngIf=\"authService.isLoading$ | async\"></div>\n </ng-template>\n</odx-action-group>\n", styles: [".odx-auth-user-profile .odx-dropdown__inner>.odx-area-header{max-width:max(360px,25vw);min-width:296px}.odx-auth-overlay{position:fixed;z-index:var(--odx-v-layer-5);inset:0}\n"] }]
|
|
390
395
|
}], propDecorators: { signInButtonText: [{
|
|
391
396
|
type: Input
|
|
392
397
|
}], signOutButtonText: [{
|
|
@@ -433,13 +438,14 @@ function authGuard(authorizedHandler, redirectTo) {
|
|
|
433
438
|
return (_, state) => {
|
|
434
439
|
const authService = inject(AuthService);
|
|
435
440
|
const router = inject(Router, { optional: true });
|
|
436
|
-
return authService.isAuthenticated$.pipe(
|
|
441
|
+
return authService.isAuthenticated$.pipe(switchMap((isAuthenticated) => {
|
|
437
442
|
var _a;
|
|
438
443
|
if (!isAuthenticated) {
|
|
439
444
|
authService.signIn(state.url);
|
|
440
|
-
return
|
|
445
|
+
return EMPTY;
|
|
441
446
|
}
|
|
442
|
-
|
|
447
|
+
const isAuthorized = (_a = authorizedHandler === null || authorizedHandler === void 0 ? void 0 : authorizedHandler(authService.getIdentityClaims(), authService, router)) !== null && _a !== void 0 ? _a : isAuthenticated;
|
|
448
|
+
return of(isAuthorized);
|
|
443
449
|
}), tap((isAuthorized) => {
|
|
444
450
|
if (isAuthorized || !router)
|
|
445
451
|
return;
|