@odx/auth 4.0.6 → 5.0.0
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/README.md +2 -0
- package/esm2020/lib/auth.config.mjs +3 -3
- package/esm2020/lib/auth.providers.mjs +3 -6
- package/esm2020/lib/auth.service.mjs +37 -35
- package/esm2020/lib/auth.typings.mjs +1 -1
- package/esm2020/lib/components/auth-loading-screen/auth-loading-screen.component.mjs +3 -3
- package/esm2020/lib/directives/auth-action.directive.mjs +3 -3
- package/esm2020/lib/models/auth-http-cache.mjs +2 -2
- package/esm2020/lib/plugins/loading-screen-plugin.mjs +3 -3
- package/fesm2015/odx-auth.mjs +50 -44
- package/fesm2015/odx-auth.mjs.map +1 -1
- package/fesm2020/odx-auth.mjs +46 -47
- package/fesm2020/odx-auth.mjs.map +1 -1
- package/lib/auth.config.d.ts +1 -1
- package/lib/auth.service.d.ts +5 -2
- package/lib/auth.typings.d.ts +0 -4
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -41,10 +41,10 @@ export const { AuthDefaultConfig, AuthConfig, injectAuthConfig, provideAuthConfi
|
|
|
41
41
|
createInitials,
|
|
42
42
|
resolveEmail,
|
|
43
43
|
resolveUsername,
|
|
44
|
-
showRedirectOverlay: false,
|
|
45
44
|
plugins: [],
|
|
46
45
|
defaultAuthorizedHandler: null,
|
|
47
|
-
enableLoadingScreen:
|
|
46
|
+
enableLoadingScreen: true,
|
|
48
47
|
loadingScreenMessage: null,
|
|
48
|
+
refreshTokenOnInit: true,
|
|
49
49
|
});
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hdXRoL3NyYy9saWIvYXV0aC5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFeEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBSTFFLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztBQUNwRixNQUFNLENBQUMsTUFBTSxlQUFlLEdBQW9DO0lBQzlELEdBQUcsRUFBRSw4Q0FBOEM7SUFDbkQsS0FBSyxFQUFFLCtDQUErQztJQUN0RCxJQUFJLEVBQUUsMENBQTBDO0NBQ2pELENBQUM7QUFDRixNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBb0M7SUFDeEUsR0FBRyxFQUFFLHFEQUFxRDtJQUMxRCxLQUFLLEVBQUUsc0RBQXNEO0lBQzdELElBQUksRUFBRSx3QkFBd0I7Q0FDL0IsQ0FBQztBQUNGLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLElBQUksY0FBYyxDQUFzQix3QkFBd0IsRUFBRTtJQUNyRyxVQUFVLEVBQUUsTUFBTTtJQUNsQixPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsRUFBRTtDQUNsQixDQUFDLENBQUM7QUFDSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLGNBQWMsQ0FBdUIsMEJBQTBCLEVBQUU7SUFDMUcsVUFBVSxFQUFFLE1BQU07SUFDbEIsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUU7Q0FDbEIsQ0FBQyxDQUFDO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxjQUFjLENBQWUsb0JBQW9CLEVBQUU7SUFDckYsVUFBVSxFQUFFLE1BQU07SUFDbEIsT0FBTyxFQUFFLEdBQUcsRUFBRTtRQUNaLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1FBRWxELE9BQU8sQ0FBQyxHQUFHLFdBQVcsRUFBRSxHQUFHLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztJQUM5RSxDQUFDO0NBQ0YsQ0FBQyxDQUFDO0FBZ0NILE1BQU0sQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEVBQUUsVUFBVSxFQUFFLGdCQUFnQixFQUFFLGlCQUFpQixFQUFFLEdBQUcsa0JBQWtCLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRTtJQUM1SCxXQUFXLEVBQUUsTUFBTTtJQUNuQixZQUFZLEVBQUUsZ0JBQWdCO0lBQzlCLFdBQVcsRUFBRSxFQUFFO0lBQ2YsYUFBYSxFQUFFLElBQUk7SUFDbkIsY0FBYyxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRTtJQUM1QixlQUFlLEVBQUUsS0FBSztJQUN0QixZQUFZLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUN0QixNQUFNLEtBQUssQ0FBQztJQUNkLENBQUM7SUFDRCxjQUFjO0lBQ2QsWUFBWTtJQUNaLGVBQWU7SUFDZixPQUFPLEVBQUUsRUFBRTtJQUNYLHdCQUF3QixFQUFFLElBQUk7SUFDOUIsbUJBQW1CLEVBQUUsSUFBSTtJQUN6QixvQkFBb0IsRUFBRSxJQUFJO0lBQzFCLGtCQUFrQixFQUFFLElBQUk7Q0FDWCxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpbmplY3QsIEluamVjdGlvblRva2VuIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBEeW5hbWljVGV4dENvbnRlbnQgfSBmcm9tICdAb2R4L2FuZ3VsYXIvY2RrL2R5bmFtaWMtdmlldyc7XG5pbXBvcnQgeyBjcmVhdGVDb25maWdUb2tlbnMgfSBmcm9tICdAb2R4L2FuZ3VsYXIvdXRpbHMnO1xuaW1wb3J0IHsgT0F1dGhFcnJvckV2ZW50LCBPQXV0aFN0b3JhZ2UgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcbmltcG9ydCB7IGNyZWF0ZUluaXRpYWxzLCByZXNvbHZlRW1haWwsIHJlc29sdmVVc2VybmFtZSB9IGZyb20gJy4vaGVscGVycyc7XG5cbmltcG9ydCB7IEF1dGhFbnZpcm9ubWVudCwgQXV0aG9yaXplZEhhbmRsZXIsIEF1dGhQbHVnaW4sIEF1dGhQbHVnaW5GYWN0b3J5IH0gZnJvbSAnLi9tb2RlbHMnO1xuXG5leHBvcnQgY29uc3QgREVGQVVMVF9BVVRIX1NDT1BFUyA9IFsnb3BlbmlkJywgJ3Byb2ZpbGUnLCAnZW1haWwnLCAnb2ZmbGluZV9hY2Nlc3MnXTtcbmV4cG9ydCBjb25zdCBERUZBVUxUX0lTU1VFUlM6IFJlY29yZDxBdXRoRW52aXJvbm1lbnQsIHN0cmluZz4gPSB7XG4gIGRldjogJ2h0dHBzOi8vZGV2LmxvZ2luLmRyYWVnZXIuY29tL29hdXRoMi9kZWZhdWx0JyxcbiAgc3RhZ2U6ICdodHRwczovL3Rlc3QubG9naW4uZHJhZWdlci5jb20vb2F1dGgyL2RlZmF1bHQnLFxuICBwcm9kOiAnaHR0cHM6Ly9sb2dpbi5kcmFlZ2VyLmNvbS9vYXV0aDIvZGVmYXVsdCcsXG59O1xuZXhwb3J0IGNvbnN0IERFRkFVTFRfVVNFUl9QUk9GSUxFX1VSTFM6IFJlY29yZDxBdXRoRW52aXJvbm1lbnQsIHN0cmluZz4gPSB7XG4gIGRldjogJ2h0dHBzOi8vbGVtb24tb2NlYW4tMDRhOTIyNzAzLjMuYXp1cmVzdGF0aWNhcHBzLm5ldCcsXG4gIHN0YWdlOiAnaHR0cHM6Ly9wdXJwbGUtY2xpZmYtMGU2MWM1NzAzLjMuYXp1cmVzdGF0aWNhcHBzLm5ldCcsXG4gIHByb2Q6ICdodHRwczovL2lkLmRyYWVnZXIuY29tJyxcbn07XG5leHBvcnQgY29uc3QgT0RYX0FVVEhfQ09SRV9QTFVHSU5TID0gbmV3IEluamVjdGlvblRva2VuPEF1dGhQbHVnaW5GYWN0b3J5W10+KCdAb2R4L2F1dGg6OkNvcmVQbHVnaW5zJywge1xuICBwcm92aWRlZEluOiAncm9vdCcsXG4gIGZhY3Rvcnk6ICgpID0+IFtdLFxufSk7XG5leHBvcnQgY29uc3QgT0RYX0FVVEhfRVJST1JfSEFORExFUlMgPSBuZXcgSW5qZWN0aW9uVG9rZW48QXV0aEVycm9ySGFuZGxlckZuW10+KCdAb2R4L2F1dGg6OkVycm9ySGFuZGxlcnMnLCB7XG4gIHByb3ZpZGVkSW46ICdyb290JyxcbiAgZmFjdG9yeTogKCkgPT4gW10sXG59KTtcbmV4cG9ydCBjb25zdCBPRFhfQVVUSF9QTFVHSU5TID0gbmV3IEluamVjdGlvblRva2VuPEF1dGhQbHVnaW5bXT4oJ0BvZHgvYXV0aDo6UGx1Z2lucycsIHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnLFxuICBmYWN0b3J5OiAoKSA9PiB7XG4gICAgY29uc3QgeyBwbHVnaW5zIH0gPSBpbmplY3RBdXRoQ29uZmlnKCk7XG4gICAgY29uc3QgY29yZVBsdWdpbnMgPSBpbmplY3QoT0RYX0FVVEhfQ09SRV9QTFVHSU5TKTtcblxuICAgIHJldHVybiBbLi4uY29yZVBsdWdpbnMsIC4uLnBsdWdpbnNdLm1hcCgocGx1Z2luRmFjdG9yeSkgPT4gcGx1Z2luRmFjdG9yeSgpKTtcbiAgfSxcbn0pO1xuXG5leHBvcnQgdHlwZSBBdXRoRXJyb3JIYW5kbGVyRm4gPSAoZXJyb3I6IE9BdXRoRXJyb3JFdmVudCkgPT4gdm9pZDtcbmV4cG9ydCB0eXBlIFJlc29sdmVVc2VybmFtZUZuID0gKHJhd0NsYWltczogT2R4QXV0aC5SYXdJZGVudGl0eUNsYWltcykgPT4gc3RyaW5nO1xuZXhwb3J0IHR5cGUgUmVzb2x2ZUVtYWlsRm4gPSAocmF3Q2xhaW1zOiBPZHhBdXRoLlJhd0lkZW50aXR5Q2xhaW1zKSA9PiBzdHJpbmc7XG5leHBvcnQgdHlwZSBDcmVhdGVJbml0aWFsc0ZuID0gKHZhbHVlOiBzdHJpbmcpID0+IHN0cmluZztcblxuZXhwb3J0IGludGVyZmFjZSBBdXRoQ29uZmlnIHtcbiAgZW52aXJvbm1lbnQ6IEF1dGhFbnZpcm9ubWVudDtcbiAgY2xpZW50SWQ/OiBzdHJpbmc7XG4gIGlzc3Vlcj86IHN0cmluZztcbiAgcmVkaXJlY3RQYXRoOiBzdHJpbmc7XG4gIGFsbG93ZWRVcmxzOiBBcnJheTxzdHJpbmcgfCBSZWdFeHA+O1xuICB0aW1lb3V0RmFjdG9yOiBudW1iZXI7XG4gIG1heE9mZmxpbmVUaW1lOiBudW1iZXI7XG4gIGxvYWRVc2VyUHJvZmlsZTogYm9vbGVhbjtcbiAgcG9zdExvZ291dFJlZGlyZWN0VXJsPzogc3RyaW5nO1xuICBzY29wZXM/OiBzdHJpbmdbXTtcbiAgZGlzY292ZXJ5VXJsPzogc3RyaW5nO1xuICBlcnJvckhhbmRsZXI6IEF1dGhFcnJvckhhbmRsZXJGbjtcbiAgY3JlYXRlSW5pdGlhbHM6IENyZWF0ZUluaXRpYWxzRm47XG4gIHJlc29sdmVFbWFpbDogUmVzb2x2ZUVtYWlsRm47XG4gIHJlc29sdmVVc2VybmFtZTogUmVzb2x2ZVVzZXJuYW1lRm47XG4gIHN0b3JhZ2U/OiBPQXV0aFN0b3JhZ2U7XG4gIHBsdWdpbnM6IEF1dGhQbHVnaW5GYWN0b3J5W107XG4gIGRlZmF1bHRBdXRob3JpemVkSGFuZGxlcj86IEF1dGhvcml6ZWRIYW5kbGVyIHwgbnVsbDtcbiAgZW5hYmxlTG9hZGluZ1NjcmVlbjogYm9vbGVhbjtcbiAgcmVmcmVzaFRva2VuT25Jbml0OiBib29sZWFuO1xuICBsb2FkaW5nU2NyZWVuTWVzc2FnZT86IER5bmFtaWNUZXh0Q29udGVudCB8IG51bGw7XG4gIHVzZXJQcm9maWxlVXJsPzogc3RyaW5nO1xufVxuXG5leHBvcnQgY29uc3QgeyBBdXRoRGVmYXVsdENvbmZpZywgQXV0aENvbmZpZywgaW5qZWN0QXV0aENvbmZpZywgcHJvdmlkZUF1dGhDb25maWcgfSA9IGNyZWF0ZUNvbmZpZ1Rva2VucygnQXV0aCcsICdAb2R4L2F1dGgnLCB7XG4gIGVudmlyb25tZW50OiAncHJvZCcsXG4gIHJlZGlyZWN0UGF0aDogJ2xvZ2luL2NhbGxiYWNrJyxcbiAgYWxsb3dlZFVybHM6IFtdLFxuICB0aW1lb3V0RmFjdG9yOiAwLjc1LFxuICBtYXhPZmZsaW5lVGltZTogMjQgKiA2MCAqIDYwLCAvLyAxIGRheVxuICBsb2FkVXNlclByb2ZpbGU6IGZhbHNlLFxuICBlcnJvckhhbmRsZXI6IChlcnJvcikgPT4ge1xuICAgIHRocm93IGVycm9yO1xuICB9LFxuICBjcmVhdGVJbml0aWFscyxcbiAgcmVzb2x2ZUVtYWlsLFxuICByZXNvbHZlVXNlcm5hbWUsXG4gIHBsdWdpbnM6IFtdLFxuICBkZWZhdWx0QXV0aG9yaXplZEhhbmRsZXI6IG51bGwsXG4gIGVuYWJsZUxvYWRpbmdTY3JlZW46IHRydWUsXG4gIGxvYWRpbmdTY3JlZW5NZXNzYWdlOiBudWxsLFxuICByZWZyZXNoVG9rZW5PbkluaXQ6IHRydWUsXG59IGFzIEF1dGhDb25maWcpO1xuIl19
|
|
@@ -10,9 +10,10 @@ import { offlineAuthErrorHandler } from './models';
|
|
|
10
10
|
import { coreIdentityPlugin, loadingScreenPlugin, userProfileUrlPlugin } from './plugins';
|
|
11
11
|
export function configureInterceptor() {
|
|
12
12
|
const { allowedUrls } = injectAuthConfig();
|
|
13
|
+
const urls = allowedUrls.filter(Boolean);
|
|
13
14
|
return {
|
|
14
15
|
resourceServer: {
|
|
15
|
-
customUrlValidation: (url) =>
|
|
16
|
+
customUrlValidation: (url) => urls.some((allowedUrl) => (isString(allowedUrl) ? url.startsWith(allowedUrl) : !!url.match(allowedUrl))),
|
|
16
17
|
sendAccessToken: true,
|
|
17
18
|
},
|
|
18
19
|
};
|
|
@@ -27,10 +28,6 @@ export function initalizeAuthConfig() {
|
|
|
27
28
|
const authService = inject(AuthService);
|
|
28
29
|
const origin = inject(WindowRef).getOrigin();
|
|
29
30
|
const scope = Array.from(new Set(DEFAULT_AUTH_SCOPES.concat(scopes ?? []))).join(' ');
|
|
30
|
-
const tokenClientId = authService.getIdentityClaims()?.aud;
|
|
31
|
-
if (tokenClientId && tokenClientId !== clientId) {
|
|
32
|
-
authService.signOut(true);
|
|
33
|
-
}
|
|
34
31
|
return () => authService.initialize({
|
|
35
32
|
clientId,
|
|
36
33
|
issuer: issuer ?? DEFAULT_ISSUERS[environment],
|
|
@@ -76,4 +73,4 @@ export function provideAuth(config) {
|
|
|
76
73
|
},
|
|
77
74
|
]);
|
|
78
75
|
}
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.providers.js","sourceRoot":"","sources":["../../../../../packages/auth/src/lib/auth.providers.ts"],"names":[],"mappings":"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","sourcesContent":["import { APP_INITIALIZER, EnvironmentProviders, ENVIRONMENT_INITIALIZER, inject, makeEnvironmentProviders } from '@angular/core';\nimport { WindowRef } from '@odx/angular';\nimport { buildUrl, ConfigDependencies, ConfigProvider, isString } from '@odx/angular/utils';\nimport { OAuthModuleConfig, OAuthStorage, provideOAuthClient } from 'angular-oauth2-oidc';\nimport { tap } from 'rxjs';\nimport {\n  AuthConfig,\n  DEFAULT_AUTH_SCOPES,\n  DEFAULT_ISSUERS,\n  injectAuthConfig,\n  ODX_AUTH_CORE_PLUGINS,\n  ODX_AUTH_ERROR_HANDLERS,\n  provideAuthConfig,\n} from './auth.config';\nimport { AuthService } from './auth.service';\nimport { handleAuthError } from './helpers';\nimport { offlineAuthErrorHandler } from './models';\nimport { coreIdentityPlugin, loadingScreenPlugin, userProfileUrlPlugin } from './plugins';\n\nexport function configureInterceptor(): OAuthModuleConfig {\n  const { allowedUrls } = injectAuthConfig();\n  const urls = allowedUrls.filter(Boolean);\n\n  return {\n    resourceServer: {\n      customUrlValidation: (url) => urls.some((allowedUrl) => (isString(allowedUrl) ? url.startsWith(allowedUrl) : !!url.match(allowedUrl))),\n      sendAccessToken: true,\n    },\n  };\n}\n\nexport function initializeAuthErrorHandlers(): void {\n  const authService = inject(AuthService);\n  const handler = handleAuthError(inject(ODX_AUTH_ERROR_HANDLERS));\n\n  authService.errors$.pipe(tap((error) => handler(error))).subscribe();\n}\n\nexport function initalizeAuthConfig(): () => Promise<void> {\n  const { clientId, scopes, redirectPath, environment, postLogoutRedirectUrl, issuer, timeoutFactor, discoveryUrl } = injectAuthConfig();\n  const authService = inject(AuthService);\n  const origin = inject(WindowRef).getOrigin();\n  const scope = Array.from(new Set(DEFAULT_AUTH_SCOPES.concat(scopes ?? []))).join(' ');\n\n  return () =>\n    authService.initialize({\n      clientId,\n      issuer: issuer ?? DEFAULT_ISSUERS[environment],\n      scope,\n      redirectUri: buildUrl(origin, redirectPath),\n      postLogoutRedirectUri: postLogoutRedirectUrl,\n      preserveRequestedRoute: true,\n      strictDiscoveryDocumentValidation: !discoveryUrl,\n      responseType: 'code',\n      showDebugInformation: environment === 'dev',\n      timeoutFactor,\n    });\n}\n\nexport function provideAuth<D extends ConfigDependencies>(config: ConfigProvider<Partial<AuthConfig>, D>): EnvironmentProviders {\n  return makeEnvironmentProviders([\n    provideAuthConfig(config),\n    provideOAuthClient(),\n    {\n      provide: OAuthModuleConfig,\n      useFactory: configureInterceptor,\n    },\n    {\n      provide: ENVIRONMENT_INITIALIZER,\n      useValue: initializeAuthErrorHandlers,\n      multi: true,\n    },\n    {\n      provide: ODX_AUTH_ERROR_HANDLERS,\n      useFactory: () => [offlineAuthErrorHandler, injectAuthConfig().errorHandler],\n    },\n    {\n      provide: APP_INITIALIZER,\n      useFactory: initalizeAuthConfig,\n      multi: true,\n    },\n    {\n      provide: OAuthStorage,\n      useFactory: () => injectAuthConfig().storage ?? inject(WindowRef).nativeWindow.localStorage,\n    },\n    {\n      provide: ODX_AUTH_CORE_PLUGINS,\n      useValue: [coreIdentityPlugin, loadingScreenPlugin, userProfileUrlPlugin],\n    },\n  ]);\n}\n"]}
|
|
@@ -4,8 +4,7 @@ import { Router } from '@angular/router';
|
|
|
4
4
|
import { WindowRef } from '@odx/angular';
|
|
5
5
|
import { OAuthErrorEvent, OAuthService } from 'angular-oauth2-oidc';
|
|
6
6
|
import { deepmerge } from 'deepmerge-ts';
|
|
7
|
-
import
|
|
8
|
-
import { BehaviorSubject, combineLatest, distinctUntilChanged, filter, fromEvent, map, merge, share, shareReplay, startWith, switchMap, } from 'rxjs';
|
|
7
|
+
import { BehaviorSubject, combineLatest, distinctUntilChanged, filter, fromEvent, map, merge, share, shareReplay, startWith, switchMap, tap, } from 'rxjs';
|
|
9
8
|
import { injectAuthConfig } from './auth.config';
|
|
10
9
|
import { AuthPluginManager } from './models';
|
|
11
10
|
import * as i0 from "@angular/core";
|
|
@@ -19,54 +18,37 @@ export class AuthService {
|
|
|
19
18
|
this.isInitialized$$ = new BehaviorSubject(false);
|
|
20
19
|
this.isRedirecting$$ = new BehaviorSubject(false);
|
|
21
20
|
this.onAccessTokenUpdate$ = fromEvent(this.windowRef.nativeWindow, 'storage').pipe(filter(({ key }) => key === 'access_token' || key === null), startWith(null), share());
|
|
21
|
+
this.silentRefreshHandler$ = this.isInitialized$$.pipe(filter(Boolean), switchMap(() => this.windowRef.isOnline$), tap((isOnline) => this.updateSilentRefresh(isOnline)));
|
|
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(),
|
|
24
|
+
this.isRedirecting$ = this.isRedirecting$$.pipe(distinctUntilChanged(), shareReplay({ refCount: true }));
|
|
25
25
|
this.isLoading$ = merge(this.isRedirecting$, this.authPluginManager.pluginsLoading$).pipe(distinctUntilChanged());
|
|
26
26
|
this.isAuthenticated$ = this.isInitialized$.pipe(switchMap(() => this.authPluginManager.pluginsReady$), switchMap(() => this.onAuthStateChange$), map(() => this.isAuthenticated()), shareReplay({ refCount: true }));
|
|
27
27
|
this.identityClaims$ = this.isAuthenticated$.pipe(map(() => this.getIdentityClaims()), shareReplay({ refCount: true }));
|
|
28
28
|
this.errors$ = this.oauthService.events.pipe(filter((event) => event instanceof OAuthErrorEvent), share());
|
|
29
|
-
const isOnline$ = this.isInitialized$.pipe(filter(Boolean), switchMap(() => this.windowRef.isOnline$));
|
|
30
|
-
isOnline$.subscribe((isOnline) => {
|
|
31
|
-
if (isOnline) {
|
|
32
|
-
this.oauthService.setupAutomaticSilentRefresh();
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
this.oauthService.stopAutomaticRefresh();
|
|
36
|
-
}
|
|
37
|
-
});
|
|
38
29
|
this.authPluginManager.runPlugins(this).subscribe();
|
|
30
|
+
this.silentRefreshHandler$.subscribe();
|
|
39
31
|
}
|
|
40
32
|
async initialize(config) {
|
|
41
|
-
this.
|
|
42
|
-
|
|
43
|
-
openUri: this.redirectToLogin.bind(this),
|
|
44
|
-
});
|
|
33
|
+
this.assertAudience(config.clientId);
|
|
34
|
+
this.oauthService.configure({ ...config, openUri: this.redirectToLogin.bind(this) });
|
|
45
35
|
try {
|
|
46
36
|
await this.oauthService.loadDiscoveryDocument(this.authConfig.discoveryUrl);
|
|
47
37
|
await this.oauthService.tryLogin();
|
|
48
|
-
|
|
49
|
-
await this.oauthService.refreshToken();
|
|
50
|
-
}
|
|
51
|
-
this.isInitialized$$.next(true);
|
|
52
|
-
if (this.authConfig.loadUserProfile && this.oauthService.hasValidAccessToken()) {
|
|
53
|
-
await this.loadUserProfile();
|
|
54
|
-
}
|
|
38
|
+
await this.tryRefreshToken();
|
|
55
39
|
}
|
|
56
40
|
catch (error) {
|
|
57
41
|
if (!(error instanceof HttpErrorResponse || error instanceof OAuthErrorEvent)) {
|
|
58
42
|
throw error;
|
|
59
43
|
}
|
|
60
|
-
|
|
61
|
-
if (error.type === 'token_refresh_error' || isUnauthenticated) {
|
|
44
|
+
if (error.type === 'token_refresh_error' || (error instanceof HttpErrorResponse && error.status === 401)) {
|
|
62
45
|
this.signOut(true);
|
|
63
46
|
this.signIn(this.windowRef.location.pathname);
|
|
64
47
|
}
|
|
65
|
-
this.isInitialized$$.next(true);
|
|
66
|
-
}
|
|
67
|
-
if (this.oauthService.hasValidAccessToken()) {
|
|
68
|
-
await this.routeToRequestedUrl();
|
|
69
48
|
}
|
|
49
|
+
this.isInitialized$$.next(true);
|
|
50
|
+
await this.tryLoadUserProfile();
|
|
51
|
+
await this.routeToRequestedUrl();
|
|
70
52
|
}
|
|
71
53
|
getIssuer() {
|
|
72
54
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
@@ -87,10 +69,6 @@ export class AuthService {
|
|
|
87
69
|
getAccessToken() {
|
|
88
70
|
return this.oauthService.getAccessToken() ?? null;
|
|
89
71
|
}
|
|
90
|
-
getAccessTokenPayload() {
|
|
91
|
-
const token = this.getAccessToken();
|
|
92
|
-
return token ? jwtDecode(token) : null;
|
|
93
|
-
}
|
|
94
72
|
getRefreshToken() {
|
|
95
73
|
return this.oauthService.getRefreshToken() ?? null;
|
|
96
74
|
}
|
|
@@ -121,7 +99,7 @@ export class AuthService {
|
|
|
121
99
|
return this.isAuthenticated$.pipe(map(() => this.isAuthorized(authorizedHandler)));
|
|
122
100
|
}
|
|
123
101
|
async routeToRequestedUrl() {
|
|
124
|
-
if (!this.oauthService.state)
|
|
102
|
+
if (!this.oauthService.state || !this.oauthService.hasValidAccessToken())
|
|
125
103
|
return;
|
|
126
104
|
await this.router.navigateByUrl(decodeURIComponent(this.oauthService.state));
|
|
127
105
|
}
|
|
@@ -133,6 +111,30 @@ export class AuthService {
|
|
|
133
111
|
this.windowRef.location.assign(uri);
|
|
134
112
|
this.isRedirecting$$.next(true);
|
|
135
113
|
}
|
|
114
|
+
async tryRefreshToken() {
|
|
115
|
+
if (!this.authConfig.refreshTokenOnInit || !this.getRefreshToken())
|
|
116
|
+
return;
|
|
117
|
+
await this.oauthService.refreshToken();
|
|
118
|
+
}
|
|
119
|
+
async tryLoadUserProfile() {
|
|
120
|
+
if (!this.authConfig.loadUserProfile || !this.oauthService.hasValidAccessToken())
|
|
121
|
+
return;
|
|
122
|
+
await this.loadUserProfile().catch(() => null);
|
|
123
|
+
}
|
|
124
|
+
assertAudience(clientId) {
|
|
125
|
+
const tokenClientId = this.getIdentityClaims()?.aud;
|
|
126
|
+
if (!clientId || !tokenClientId || clientId === tokenClientId)
|
|
127
|
+
return;
|
|
128
|
+
this.signOut(true);
|
|
129
|
+
}
|
|
130
|
+
updateSilentRefresh(enabled) {
|
|
131
|
+
if (enabled) {
|
|
132
|
+
this.oauthService.setupAutomaticSilentRefresh();
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
this.oauthService.stopAutomaticRefresh();
|
|
136
|
+
}
|
|
137
|
+
}
|
|
136
138
|
}
|
|
137
139
|
AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
138
140
|
AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthService, providedIn: 'root' });
|
|
@@ -140,4 +142,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
140
142
|
type: Injectable,
|
|
141
143
|
args: [{ providedIn: 'root' }]
|
|
142
144
|
}], ctorParameters: function () { return []; } });
|
|
143
|
-
//# 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 {\n  BehaviorSubject,\n  combineLatest,\n  distinctUntilChanged,\n  filter,\n  fromEvent,\n  map,\n  merge,\n  Observable,\n  share,\n  shareReplay,\n  startWith,\n  switchMap,\n} 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    const isOnline$ = this.isInitialized$.pipe(\n      filter(Boolean),\n      switchMap(() => this.windowRef.isOnline$),\n    );\n    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()) {\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      const isUnauthenticated = error instanceof HttpErrorResponse && error.status === 401;\n      if (error.type === 'token_refresh_error' || isUnauthenticated) {\n        this.signOut(true);\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(noRedirect?: boolean): void {\n    this.oauthService.logOut(noRedirect || !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    const handler = authorizedHandler ?? this.authConfig.defaultAuthorizedHandler;\n\n    return this.isAuthenticated() && (handler?.(this.getIdentityClaims(), this, this.router) ?? true);\n  }\n\n  public isAuthorized$(authorizedHandler?: AuthorizedHandler | null): Observable<boolean> {\n    return this.isAuthenticated$.pipe(map(() => this.isAuthorized(authorizedHandler)));\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"]}
|
|
145
|
+
//# 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,EAAc,eAAe,EAAE,YAAY,EAAiB,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,MAAM,EACN,SAAS,EACT,GAAG,EACH,KAAK,EAEL,KAAK,EACL,WAAW,EACX,SAAS,EACT,SAAS,EACT,GAAG,GACJ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAqB,iBAAiB,EAAE,MAAM,UAAU,CAAC;;AAGhE,MAAM,OAAO,WAAW;IAuCtB;QAtCiB,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,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,0BAAqB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAChE,MAAM,CAAC,OAAO,CAAC,EACf,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EACzC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CACtD,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,mBAAc,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACpG,eAAU,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAC7G,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;QAGA,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QACpD,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,MAAkB;QACxC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrF,IAAI;YACF,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;SAC9B;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,CAAC,KAAK,YAAY,iBAAiB,IAAI,KAAK,YAAY,eAAe,CAAC,EAAE;gBAC7E,MAAM,KAAK,CAAC;aACb;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,KAAK,YAAY,iBAAiB,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC,EAAE;gBACxG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aAC/C;SACF;QACD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACnC,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,aAAa,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAEM,OAAO,CAAC,UAAoB;QACjC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACjE,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,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,MAAM,OAAO,GAAG,iBAAiB,IAAI,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC;QAE9E,OAAO,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;IACpG,CAAC;IAEM,aAAa,CAAC,iBAA4C;QAC/D,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE;YAAE,OAAO;QACjF,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;IAEO,eAAe,CAAC,GAAW;QACjC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YAAE,OAAO;QAC3E,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE;YAAE,OAAO;QACzF,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAEO,cAAc,CAAC,QAAwB;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,CAAC;QACpD,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,IAAI,QAAQ,KAAK,aAAa;YAAE,OAAO;QACtE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAEO,mBAAmB,CAAC,OAAgB;QAC1C,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,CAAC;SACjD;aAAM;YACL,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;SAC1C;IACH,CAAC;;wGAnKU,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 { AuthConfig, OAuthErrorEvent, OAuthService, TokenResponse } from 'angular-oauth2-oidc';\nimport { deepmerge } from 'deepmerge-ts';\nimport {\n  BehaviorSubject,\n  combineLatest,\n  distinctUntilChanged,\n  filter,\n  fromEvent,\n  map,\n  merge,\n  Observable,\n  share,\n  shareReplay,\n  startWith,\n  switchMap,\n  tap,\n} 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 silentRefreshHandler$ = this.isInitialized$$.pipe(\n    filter(Boolean),\n    switchMap(() => this.windowRef.isOnline$),\n    tap((isOnline) => this.updateSilentRefresh(isOnline)),\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(), shareReplay({ refCount: true }));\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.authPluginManager.runPlugins(this).subscribe();\n    this.silentRefreshHandler$.subscribe();\n  }\n\n  public async initialize(config: AuthConfig): Promise<void> {\n    this.assertAudience(config.clientId);\n    this.oauthService.configure({ ...config, openUri: this.redirectToLogin.bind(this) });\n    try {\n      await this.oauthService.loadDiscoveryDocument(this.authConfig.discoveryUrl);\n      await this.oauthService.tryLogin();\n      await this.tryRefreshToken();\n    } catch (error) {\n      if (!(error instanceof HttpErrorResponse || error instanceof OAuthErrorEvent)) {\n        throw error;\n      }\n      if (error.type === 'token_refresh_error' || (error instanceof HttpErrorResponse && error.status === 401)) {\n        this.signOut(true);\n        this.signIn(this.windowRef.location.pathname);\n      }\n    }\n    this.isInitialized$$.next(true);\n    await this.tryLoadUserProfile();\n    await this.routeToRequestedUrl();\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(noRedirect?: boolean): void {\n    this.oauthService.logOut(noRedirect || !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 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    const handler = authorizedHandler ?? this.authConfig.defaultAuthorizedHandler;\n\n    return this.isAuthenticated() && (handler?.(this.getIdentityClaims(), this, this.router) ?? true);\n  }\n\n  public isAuthorized$(authorizedHandler?: AuthorizedHandler | null): Observable<boolean> {\n    return this.isAuthenticated$.pipe(map(() => this.isAuthorized(authorizedHandler)));\n  }\n\n  private async routeToRequestedUrl(): Promise<void> {\n    if (!this.oauthService.state || !this.oauthService.hasValidAccessToken()) 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  private async tryRefreshToken(): Promise<void> {\n    if (!this.authConfig.refreshTokenOnInit || !this.getRefreshToken()) return;\n    await this.oauthService.refreshToken();\n  }\n\n  private async tryLoadUserProfile(): Promise<void> {\n    if (!this.authConfig.loadUserProfile || !this.oauthService.hasValidAccessToken()) return;\n    await this.loadUserProfile().catch(() => null);\n  }\n\n  private assertAudience(clientId?: string | null): void {\n    const tokenClientId = this.getIdentityClaims()?.aud;\n    if (!clientId || !tokenClientId || clientId === tokenClientId) return;\n    this.signOut(true);\n  }\n\n  private updateSilentRefresh(enabled: boolean) {\n    if (enabled) {\n      this.oauthService.setupAutomaticSilentRefresh();\n    } else {\n      this.oauthService.stopAutomaticRefresh();\n    }\n  }\n}\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC50eXBpbmdzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXV0aC9zcmMvbGliL2F1dGgudHlwaW5ncy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZGVjbGFyZSBnbG9iYWwge1xuICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLW5hbWVzcGFjZVxuICBuYW1lc3BhY2UgT2R4QXV0aCB7XG4gICAgdHlwZSBSYXdJZGVudGl0eUNsYWltcyA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+O1xuXG4gICAgaW50ZXJmYWNlIEF1dGhQbHVnaW5SZXN1bHQge1xuICAgICAgb2R4QXV0aFBsdWdpblByb3BlcnRpZXM/OiBzdHJpbmdbXTtcbiAgICB9XG5cbiAgICBpbnRlcmZhY2UgSWRlbnRpeUNsYWltcyBleHRlbmRzIEF1dGhQbHVnaW5SZXN1bHQge1xuICAgICAgc3ViOiBzdHJpbmc7XG4gICAgICBva3RhaWQ6IHN0cmluZztcbiAgICAgIGlhdDogbnVtYmVyO1xuICAgICAgYXVkOiBzdHJpbmc7XG5cbiAgICAgIG5hbWU6IHN0cmluZztcbiAgICAgIGZpcnN0bmFtZTogc3RyaW5nO1xuICAgICAgbGFzdG5hbWU6IHN0cmluZztcbiAgICAgIGRpc3BsYXluYW1lOiBzdHJpbmc7XG4gICAgICBwcmVmZXJyZWRfdXNlcm5hbWU6IHN0cmluZztcbiAgICAgIGVtYWlsOiBzdHJpbmc7XG4gICAgICBpbml0aWFsczogc3RyaW5nO1xuXG4gICAgICBsb2NhbGU/
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC50eXBpbmdzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXV0aC9zcmMvbGliL2F1dGgudHlwaW5ncy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZGVjbGFyZSBnbG9iYWwge1xuICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLW5hbWVzcGFjZVxuICBuYW1lc3BhY2UgT2R4QXV0aCB7XG4gICAgdHlwZSBSYXdJZGVudGl0eUNsYWltcyA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+O1xuXG4gICAgaW50ZXJmYWNlIEF1dGhQbHVnaW5SZXN1bHQge1xuICAgICAgb2R4QXV0aFBsdWdpblByb3BlcnRpZXM/OiBzdHJpbmdbXTtcbiAgICB9XG5cbiAgICBpbnRlcmZhY2UgSWRlbnRpeUNsYWltcyBleHRlbmRzIEF1dGhQbHVnaW5SZXN1bHQge1xuICAgICAgc3ViOiBzdHJpbmc7XG4gICAgICBva3RhaWQ6IHN0cmluZztcbiAgICAgIGlhdDogbnVtYmVyO1xuICAgICAgYXVkOiBzdHJpbmc7XG5cbiAgICAgIG5hbWU6IHN0cmluZztcbiAgICAgIGZpcnN0bmFtZTogc3RyaW5nO1xuICAgICAgbGFzdG5hbWU6IHN0cmluZztcbiAgICAgIGRpc3BsYXluYW1lOiBzdHJpbmc7XG4gICAgICBwcmVmZXJyZWRfdXNlcm5hbWU6IHN0cmluZztcbiAgICAgIGVtYWlsOiBzdHJpbmc7XG4gICAgICBpbml0aWFsczogc3RyaW5nO1xuXG4gICAgICBsb2NhbGU/OiBzdHJpbmc7XG4gICAgICB6b25laW5mbz86IHN0cmluZztcbiAgICB9XG4gIH1cbn1cblxuZXhwb3J0IHt9O1xuIl19
|
|
@@ -7,7 +7,7 @@ import { ButtonComponent } from '@odx/angular/components/button';
|
|
|
7
7
|
import { CircularProgressComponent } from '@odx/angular/components/circular-progress';
|
|
8
8
|
import { IconComponent } from '@odx/angular/components/icon';
|
|
9
9
|
import { LogoDirective } from '@odx/angular/components/logo';
|
|
10
|
-
import { distinctUntilChanged, map
|
|
10
|
+
import { distinctUntilChanged, map } from 'rxjs';
|
|
11
11
|
import { injectAuthConfig } from '../../auth.config';
|
|
12
12
|
import { AuthService } from '../../auth.service';
|
|
13
13
|
import * as i0 from "@angular/core";
|
|
@@ -15,7 +15,7 @@ import * as i1 from "@angular/common";
|
|
|
15
15
|
export class AuthLoadingScreenComponent {
|
|
16
16
|
constructor() {
|
|
17
17
|
this.authConfig = injectAuthConfig();
|
|
18
|
-
this.icon$ = inject(AuthService).isRedirecting$.pipe(
|
|
18
|
+
this.icon$ = inject(AuthService).isRedirecting$.pipe(distinctUntilChanged(), map((isRedirecting) => (isRedirecting ? 'link-external' : 'user')));
|
|
19
19
|
}
|
|
20
20
|
static initialize(authService, dynamicViewService) {
|
|
21
21
|
authService.isLoading$.subscribe((isLoading) => {
|
|
@@ -38,4 +38,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
38
38
|
'[@hostAnimation]': 'true',
|
|
39
39
|
}, animations: [trigger('hostAnimation', [transition(':leave', useAnimation(fadeOut()))])], template: "<div class=\"odx-auth-loading-screen__content\" odxLayout=\"grid 12 horizontal-center vertical-center gap-small\">\n <odx-logo size=\"large\"></odx-logo>\n <odx-circular-progress class=\"odx-auth-loading-screen__spinner\" value=\"-1\" size=\"medium\" stroke=\"3\">\n <odx-icon [name]=\"icon$ | async\" iconSet=\"core\"></odx-icon>\n </odx-circular-progress>\n <p class=\"odx-auth-loading-screen__message\" *ngIf=\"authConfig.loadingScreenMessage as content\">\n <ng-template [odxDynamicView]=\"content\"></ng-template>\n </p>\n</div>\n", styles: ["@keyframes odx-auth-loading-screen-animation{0%{opacity:0;transform:translate(-50%,-50%) scale(.9)}to{opacity:1;transform:translate(-50%,-50%)}}.odx-auth-loading-screen{--odx-c-highlight: var(--odx-c-primary);background-color:var(--odx-c-background-content);position:fixed;z-index:var(--odx-v-layer-5);inset:0}.odx-auth-loading-screen__content{top:50%;left:50%;transform:translate(-50%,-50%);position:absolute;animation:odx-auth-loading-screen-animation .75s ease}.odx-auth-loading-screen__message{text-align:center}.odx-auth-loading-screen__spinner{position:relative}.odx-auth-loading-screen__spinner .odx-icon{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}\n"] }]
|
|
40
40
|
}] });
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1sb2FkaW5nLXNjcmVlbi5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hdXRoL3NyYy9saWIvY29tcG9uZW50cy9hdXRoLWxvYWRpbmctc2NyZWVuL2F1dGgtbG9hZGluZy1zY3JlZW4uY29tcG9uZW50LnRzIiwiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXV0aC9zcmMvbGliL2NvbXBvbmVudHMvYXV0aC1sb2FkaW5nLXNjcmVlbi9hdXRoLWxvYWRpbmctc2NyZWVuLmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUM5RixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUFFLG9CQUFvQixFQUFzQyxNQUFNLCtCQUErQixDQUFDO0FBQ3pHLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNqRSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUN0RixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDN0QsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzdELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDOzs7QUFnQmpELE1BQU0sT0FBTywwQkFBMEI7SUFkdkM7UUFpQnFCLGVBQVUsR0FBRyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ2hDLFVBQUssR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsY0FBYyxDQUFDLElBQUksQ0FDaEUsb0JBQW9CLEVBQUUsRUFDdEIsR0FBRyxDQUFDLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUNuRSxDQUFDO0tBWUg7SUFWUSxNQUFNLENBQUMsVUFBVSxDQUFDLFdBQXdCLEVBQUUsa0JBQXNDO1FBQ3ZGLFdBQVcsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUU7WUFDN0MsSUFBSSxTQUFTLEVBQUU7Z0JBQ2IsMEJBQTBCLENBQUMsUUFBUSxLQUFuQywwQkFBMEIsQ0FBQyxRQUFRLEdBQUssa0JBQWtCLENBQUMsVUFBVSxDQUFDLDBCQUEwQixDQUFDLEVBQUM7YUFDbkc7aUJBQU07Z0JBQ0wsMEJBQTBCLENBQUMsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDO2dCQUMvQywwQkFBMEIsQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDO2FBQzVDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOztBQWpCYyxtQ0FBUSxHQUE2RCxJQUFJLENBQUM7dUhBRDlFLDBCQUEwQjsyR0FBMUIsMEJBQTBCLDJJQzNCdkMsb2lCQVNBLGl1QkRRWSxZQUFZLHdMQUFtQixhQUFhLG9HQUFFLGFBQWEsa0ZBQUUseUJBQXlCLHVHQUFFLG9CQUFvQix5SUFRMUcsQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxZQUFZLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzsyRkFFNUUsMEJBQTBCO2tCQWR0QyxTQUFTO2lDQUNJLElBQUksWUFFTiw2QkFBNkIsV0FDOUIsQ0FBQyxZQUFZLEVBQUUsZUFBZSxFQUFFLGFBQWEsRUFBRSxhQUFhLEVBQUUseUJBQXlCLEVBQUUsb0JBQW9CLENBQUMsbUJBR3RHLHVCQUF1QixDQUFDLE1BQU0saUJBQ2hDLGlCQUFpQixDQUFDLElBQUksUUFDL0I7d0JBQ0osa0JBQWtCLEVBQUUsTUFBTTtxQkFDM0IsY0FDVyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLFlBQVksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdHJhbnNpdGlvbiwgdHJpZ2dlciwgdXNlQW5pbWF0aW9uIH0gZnJvbSAnQGFuZ3VsYXIvYW5pbWF0aW9ucyc7XG5pbXBvcnQgeyBDb21tb25Nb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgaW5qZWN0LCBWaWV3RW5jYXBzdWxhdGlvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgZmFkZU91dCB9IGZyb20gJ0BvZHgvYW5ndWxhci9hbmltYXRpb25zJztcbmltcG9ydCB7IER5bmFtaWNWaWV3RGlyZWN0aXZlLCBEeW5hbWljVmlld1JlZiwgRHluYW1pY1ZpZXdTZXJ2aWNlIH0gZnJvbSAnQG9keC9hbmd1bGFyL2Nkay9keW5hbWljLXZpZXcnO1xuaW1wb3J0IHsgQnV0dG9uQ29tcG9uZW50IH0gZnJvbSAnQG9keC9hbmd1bGFyL2NvbXBvbmVudHMvYnV0dG9uJztcbmltcG9ydCB7IENpcmN1bGFyUHJvZ3Jlc3NDb21wb25lbnQgfSBmcm9tICdAb2R4L2FuZ3VsYXIvY29tcG9uZW50cy9jaXJjdWxhci1wcm9ncmVzcyc7XG5pbXBvcnQgeyBJY29uQ29tcG9uZW50IH0gZnJvbSAnQG9keC9hbmd1bGFyL2NvbXBvbmVudHMvaWNvbic7XG5pbXBvcnQgeyBMb2dvRGlyZWN0aXZlIH0gZnJvbSAnQG9keC9hbmd1bGFyL2NvbXBvbmVudHMvbG9nbyc7XG5pbXBvcnQgeyBkaXN0aW5jdFVudGlsQ2hhbmdlZCwgbWFwIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBpbmplY3RBdXRoQ29uZmlnIH0gZnJvbSAnLi4vLi4vYXV0aC5jb25maWcnO1xuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuLi8uLi9hdXRoLnNlcnZpY2UnO1xuXG5AQ29tcG9uZW50KHtcbiAgc3RhbmRhbG9uZTogdHJ1ZSxcbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEBhbmd1bGFyLWVzbGludC9jb21wb25lbnQtc2VsZWN0b3JcbiAgc2VsZWN0b3I6ICdkaXYub2R4LWF1dGgtbG9hZGluZy1zY3JlZW4nLFxuICBpbXBvcnRzOiBbQ29tbW9uTW9kdWxlLCBCdXR0b25Db21wb25lbnQsIEljb25Db21wb25lbnQsIExvZ29EaXJlY3RpdmUsIENpcmN1bGFyUHJvZ3Jlc3NDb21wb25lbnQsIER5bmFtaWNWaWV3RGlyZWN0aXZlXSxcbiAgdGVtcGxhdGVVcmw6ICcuL2F1dGgtbG9hZGluZy1zY3JlZW4uY29tcG9uZW50Lmh0bWwnLFxuICBzdHlsZVVybHM6IFsnLi9hdXRoLWxvYWRpbmctc2NyZWVuLmNvbXBvbmVudC5zY3NzJ10sXG4gIGNoYW5nZURldGVjdGlvbjogQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3kuT25QdXNoLFxuICBlbmNhcHN1bGF0aW9uOiBWaWV3RW5jYXBzdWxhdGlvbi5Ob25lLFxuICBob3N0OiB7XG4gICAgJ1tAaG9zdEFuaW1hdGlvbl0nOiAndHJ1ZScsXG4gIH0sXG4gIGFuaW1hdGlvbnM6IFt0cmlnZ2VyKCdob3N0QW5pbWF0aW9uJywgW3RyYW5zaXRpb24oJzpsZWF2ZScsIHVzZUFuaW1hdGlvbihmYWRlT3V0KCkpKV0pXSxcbn0pXG5leHBvcnQgY2xhc3MgQXV0aExvYWRpbmdTY3JlZW5Db21wb25lbnQge1xuICBwcml2YXRlIHN0YXRpYyBpbnN0YW5jZTogRHluYW1pY1ZpZXdSZWY8dHlwZW9mIEF1dGhMb2FkaW5nU2NyZWVuQ29tcG9uZW50PiB8IG51bGwgPSBudWxsO1xuXG4gIHByb3RlY3RlZCByZWFkb25seSBhdXRoQ29uZmlnID0gaW5qZWN0QXV0aENvbmZpZygpO1xuICBwcm90ZWN0ZWQgcmVhZG9ubHkgaWNvbiQgPSBpbmplY3QoQXV0aFNlcnZpY2UpLmlzUmVkaXJlY3RpbmckLnBpcGUoXG4gICAgZGlzdGluY3RVbnRpbENoYW5nZWQoKSxcbiAgICBtYXAoKGlzUmVkaXJlY3RpbmcpID0+IChpc1JlZGlyZWN0aW5nID8gJ2xpbmstZXh0ZXJuYWwnIDogJ3VzZXInKSksXG4gICk7XG5cbiAgcHVibGljIHN0YXRpYyBpbml0aWFsaXplKGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZSwgZHluYW1pY1ZpZXdTZXJ2aWNlOiBEeW5hbWljVmlld1NlcnZpY2UpOiB2b2lkIHtcbiAgICBhdXRoU2VydmljZS5pc0xvYWRpbmckLnN1YnNjcmliZSgoaXNMb2FkaW5nKSA9PiB7XG4gICAgICBpZiAoaXNMb2FkaW5nKSB7XG4gICAgICAgIEF1dGhMb2FkaW5nU2NyZWVuQ29tcG9uZW50Lmluc3RhbmNlID8/PSBkeW5hbWljVmlld1NlcnZpY2UuY3JlYXRlVmlldyhBdXRoTG9hZGluZ1NjcmVlbkNvbXBvbmVudCk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBBdXRoTG9hZGluZ1NjcmVlbkNvbXBvbmVudC5pbnN0YW5jZT8uZGVzdHJveSgpO1xuICAgICAgICBBdXRoTG9hZGluZ1NjcmVlbkNvbXBvbmVudC5pbnN0YW5jZSA9IG51bGw7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cbn1cbiIsIjxkaXYgY2xhc3M9XCJvZHgtYXV0aC1sb2FkaW5nLXNjcmVlbl9fY29udGVudFwiIG9keExheW91dD1cImdyaWQgMTIgaG9yaXpvbnRhbC1jZW50ZXIgdmVydGljYWwtY2VudGVyIGdhcC1zbWFsbFwiPlxuICA8b2R4LWxvZ28gc2l6ZT1cImxhcmdlXCI+PC9vZHgtbG9nbz5cbiAgPG9keC1jaXJjdWxhci1wcm9ncmVzcyBjbGFzcz1cIm9keC1hdXRoLWxvYWRpbmctc2NyZWVuX19zcGlubmVyXCIgdmFsdWU9XCItMVwiIHNpemU9XCJtZWRpdW1cIiBzdHJva2U9XCIzXCI+XG4gICAgPG9keC1pY29uIFtuYW1lXT1cImljb24kIHwgYXN5bmNcIiBpY29uU2V0PVwiY29yZVwiPjwvb2R4LWljb24+XG4gIDwvb2R4LWNpcmN1bGFyLXByb2dyZXNzPlxuICA8cCBjbGFzcz1cIm9keC1hdXRoLWxvYWRpbmctc2NyZWVuX19tZXNzYWdlXCIgKm5nSWY9XCJhdXRoQ29uZmlnLmxvYWRpbmdTY3JlZW5NZXNzYWdlIGFzIGNvbnRlbnRcIj5cbiAgICA8bmctdGVtcGxhdGUgW29keER5bmFtaWNWaWV3XT1cImNvbnRlbnRcIj48L25nLXRlbXBsYXRlPlxuICA8L3A+XG48L2Rpdj5cbiJdfQ==
|
|
@@ -11,8 +11,8 @@ export class AuthActionDirective {
|
|
|
11
11
|
}
|
|
12
12
|
ngAfterViewInit() {
|
|
13
13
|
this.loadingSpinnerDirective.autoColor = true;
|
|
14
|
-
this.authService.isRedirecting$.pipe(this.takeUntilDestroyed()).subscribe(() => {
|
|
15
|
-
this.loadingSpinnerDirective.isLoading =
|
|
14
|
+
this.authService.isRedirecting$.pipe(this.takeUntilDestroyed()).subscribe((isRedirecting) => {
|
|
15
|
+
this.loadingSpinnerDirective.isLoading = isRedirecting;
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -21,4 +21,4 @@ AuthActionDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", ve
|
|
|
21
21
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AuthActionDirective, decorators: [{
|
|
22
22
|
type: Directive
|
|
23
23
|
}] });
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1hY3Rpb24uZGlyZWN0aXZlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXV0aC9zcmMvbGliL2RpcmVjdGl2ZXMvYXV0aC1hY3Rpb24uZGlyZWN0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBaUIsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNqRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUNsRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDOztBQUc5QyxNQUFNLE9BQWdCLG1CQUFtQjtJQUR6QztRQUVtQix1QkFBa0IsR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUN0Qyw0QkFBdUIsR0FBRyxNQUFNLENBQUMsdUJBQXVCLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN4RSxnQkFBVyxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztLQVV0RDtJQVJRLGVBQWU7UUFDcEIsSUFBSSxDQUFDLHVCQUF1QixDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUM7UUFDOUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsYUFBYSxFQUFFLEVBQUU7WUFDMUYsSUFBSSxDQUFDLHVCQUF1QixDQUFDLFNBQVMsR0FBRyxhQUFhLENBQUM7UUFDekQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOztnSEFWbUIsbUJBQW1CO29HQUFuQixtQkFBbUI7MkZBQW5CLG1CQUFtQjtrQkFEeEMsU0FBUyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFmdGVyVmlld0luaXQsIERpcmVjdGl2ZSwgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBMb2FkaW5nU3Bpbm5lckRpcmVjdGl2ZSB9IGZyb20gJ0BvZHgvYW5ndWxhci9jb21wb25lbnRzL2xvYWRpbmctc3Bpbm5lcic7XG5pbXBvcnQgeyB1bnRpbERlc3Ryb3llZCB9IGZyb20gJ0BvZHgvYW5ndWxhci91dGlscyc7XG5pbXBvcnQgeyBBdXRoU2VydmljZSB9IGZyb20gJy4uL2F1dGguc2VydmljZSc7XG5cbkBEaXJlY3RpdmUoKVxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEF1dGhBY3Rpb25EaXJlY3RpdmUgaW1wbGVtZW50cyBBZnRlclZpZXdJbml0IHtcbiAgcHJpdmF0ZSByZWFkb25seSB0YWtlVW50aWxEZXN0cm95ZWQgPSB1bnRpbERlc3Ryb3llZCgpO1xuICBwcml2YXRlIHJlYWRvbmx5IGxvYWRpbmdTcGlubmVyRGlyZWN0aXZlID0gaW5qZWN0KExvYWRpbmdTcGlubmVyRGlyZWN0aXZlLCB7IHNlbGY6IHRydWUgfSk7XG4gIHByb3RlY3RlZCByZWFkb25seSBhdXRoU2VydmljZSA9IGluamVjdChBdXRoU2VydmljZSk7XG5cbiAgcHVibGljIG5nQWZ0ZXJWaWV3SW5pdCgpOiB2b2lkIHtcbiAgICB0aGlzLmxvYWRpbmdTcGlubmVyRGlyZWN0aXZlLmF1dG9Db2xvciA9IHRydWU7XG4gICAgdGhpcy5hdXRoU2VydmljZS5pc1JlZGlyZWN0aW5nJC5waXBlKHRoaXMudGFrZVVudGlsRGVzdHJveWVkKCkpLnN1YnNjcmliZSgoaXNSZWRpcmVjdGluZykgPT4ge1xuICAgICAgdGhpcy5sb2FkaW5nU3Bpbm5lckRpcmVjdGl2ZS5pc0xvYWRpbmcgPSBpc1JlZGlyZWN0aW5nO1xuICAgIH0pO1xuICB9XG5cbiAgcHJvdGVjdGVkIGFic3RyYWN0IGhhbmRsZUNsaWNrKCk6IHZvaWQ7XG59XG4iXX0=
|
|
@@ -32,7 +32,7 @@ export class AuthHttpCache {
|
|
|
32
32
|
const cache = await this.cacheStorage.open(AuthHttpCache.CACHE_KEY);
|
|
33
33
|
const response = await fetch(request).catch(() => null);
|
|
34
34
|
if (response?.ok) {
|
|
35
|
-
await cache.put(request, response);
|
|
35
|
+
await cache.put(request, response).catch(() => null);
|
|
36
36
|
}
|
|
37
37
|
if (authorizationHeader && response?.status === 401) {
|
|
38
38
|
await cache.delete(request);
|
|
@@ -47,4 +47,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
47
47
|
type: Injectable,
|
|
48
48
|
args: [{ providedIn: 'root' }]
|
|
49
49
|
}], ctorParameters: function () { return []; } });
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1odHRwLWNhY2hlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXV0aC9zcmMvbGliL21vZGVscy9hdXRoLWh0dHAtY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsY0FBYyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25FLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDekMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFlBQVksQ0FBQzs7QUFFOUMsTUFBTSxDQUFDLE1BQU0sMkJBQTJCLEdBQUcsSUFBSSxjQUFjLENBQWUsaUNBQWlDLEVBQUU7SUFDN0csVUFBVSxFQUFFLE1BQU07SUFDbEIsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxZQUFZLENBQUMsTUFBTTtDQUNyRCxDQUFDLENBQUM7QUFHSCxNQUFNLE9BQU8sYUFBYTtJQUt4QjtRQUhpQixpQkFBWSxHQUFHLE1BQU0sQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1FBQ25ELGlCQUFZLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBR25ELElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNoRyxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVM7UUFDcEIsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDcEUsS0FBSyxNQUFNLEdBQUcsSUFBSSxNQUFNLEtBQUssQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNwQyxNQUFNLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDekI7SUFDSCxDQUFDO0lBRU0sS0FBSyxDQUFDLE1BQU0sQ0FBQyxPQUEwQjtRQUM1QyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUVwRSxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFPLENBQUksV0FBOEIsRUFBRSxjQUFjLEdBQUcsS0FBSztRQUM1RSxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6QyxNQUFNLG1CQUFtQixHQUFHLGNBQWMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7UUFDNUYsSUFBSSxtQkFBbUIsRUFBRTtZQUN2QixPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztTQUMzRDtRQUNELE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3BFLE1BQU0sUUFBUSxHQUFHLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4RCxJQUFJLFFBQVEsRUFBRSxFQUFFLEVBQUU7WUFDaEIsTUFBTSxLQUFLLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDdEQ7UUFDRCxJQUFJLG1CQUFtQixJQUFJLFFBQVEsRUFBRSxNQUFNLEtBQUssR0FBRyxFQUFFO1lBQ25ELE1BQU0sS0FBSyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUM3QjtRQUVELE9BQU8sS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsSUFBSSxJQUFJLENBQUMsQ0FBQztJQUNqRSxDQUFDOztBQXJDdUIsdUJBQVMsR0FBRyxzQkFBc0IsQ0FBQzswR0FEaEQsYUFBYTs4R0FBYixhQUFhLGNBREEsTUFBTTsyRkFDbkIsYUFBYTtrQkFEekIsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpbmplY3QsIEluamVjdGFibGUsIEluamVjdGlvblRva2VuIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBXaW5kb3dSZWYgfSBmcm9tICdAb2R4L2FuZ3VsYXInO1xuaW1wb3J0IHsgT0F1dGhTZXJ2aWNlIH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XG5pbXBvcnQgeyBoYW5kbGVPQXV0aEV2ZW50IH0gZnJvbSAnLi4vaGVscGVycyc7XG5cbmV4cG9ydCBjb25zdCBPRFhfQVVUSF9IVFRQX0NBQ0hFX1NUT1JBR0UgPSBuZXcgSW5qZWN0aW9uVG9rZW48Q2FjaGVTdG9yYWdlPignQG9keC9hdXRoOjpBdXRoSHR0cENhY2hlU3RvcmFnZScsIHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnLFxuICBmYWN0b3J5OiAoKSA9PiBpbmplY3QoV2luZG93UmVmKS5uYXRpdmVXaW5kb3cuY2FjaGVzLFxufSk7XG5cbkBJbmplY3RhYmxlKHsgcHJvdmlkZWRJbjogJ3Jvb3QnIH0pXG5leHBvcnQgY2xhc3MgQXV0aEh0dHBDYWNoZSB7XG4gIHByaXZhdGUgc3RhdGljIHJlYWRvbmx5IENBQ0hFX0tFWSA9ICdAb2R4L2F1dGgvaHR0cC1jYWNoZSc7XG4gIHByaXZhdGUgcmVhZG9ubHkgY2FjaGVTdG9yYWdlID0gaW5qZWN0KE9EWF9BVVRIX0hUVFBfQ0FDSEVfU1RPUkFHRSk7XG4gIHByaXZhdGUgcmVhZG9ubHkgb2F1dGhTZXJ2aWNlID0gaW5qZWN0KE9BdXRoU2VydmljZSk7XG5cbiAgY29uc3RydWN0b3IoKSB7XG4gICAgdGhpcy5vYXV0aFNlcnZpY2UuZXZlbnRzLnBpcGUoaGFuZGxlT0F1dGhFdmVudCgnbG9nb3V0JywgKCkgPT4gdGhpcy5kZWxldGVBbGwoKSkpLnN1YnNjcmliZSgpO1xuICB9XG5cbiAgcHVibGljIGFzeW5jIGRlbGV0ZUFsbCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICBjb25zdCBjYWNoZSA9IGF3YWl0IHRoaXMuY2FjaGVTdG9yYWdlLm9wZW4oQXV0aEh0dHBDYWNoZS5DQUNIRV9LRVkpO1xuICAgIGZvciAoY29uc3Qga2V5IG9mIGF3YWl0IGNhY2hlLmtleXMoKSkge1xuICAgICAgYXdhaXQgY2FjaGUuZGVsZXRlKGtleSk7XG4gICAgfVxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRlbGV0ZShyZXF1ZXN0OiBSZXF1ZXN0SW5mbyB8IFVSTCk6IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgIGNvbnN0IGNhY2hlID0gYXdhaXQgdGhpcy5jYWNoZVN0b3JhZ2Uub3BlbihBdXRoSHR0cENhY2hlLkNBQ0hFX0tFWSk7XG5cbiAgICByZXR1cm4gY2FjaGUuZGVsZXRlKHJlcXVlc3QpO1xuICB9XG5cbiAgcHVibGljIGFzeW5jIHJlcXVlc3Q8VD4ocmVxdWVzdEluZm86IFJlcXVlc3RJbmZvIHwgVVJMLCBhdXRoZW50aWNhdGlvbiA9IGZhbHNlKTogUHJvbWlzZTxUIHwgbnVsbD4ge1xuICAgIGNvbnN0IHJlcXVlc3QgPSBuZXcgUmVxdWVzdChyZXF1ZXN0SW5mbyk7XG4gICAgY29uc3QgYXV0aG9yaXphdGlvbkhlYWRlciA9IGF1dGhlbnRpY2F0aW9uID8gdGhpcy5vYXV0aFNlcnZpY2UuYXV0aG9yaXphdGlvbkhlYWRlcigpIDogbnVsbDtcbiAgICBpZiAoYXV0aG9yaXphdGlvbkhlYWRlcikge1xuICAgICAgcmVxdWVzdC5oZWFkZXJzLnNldCgnQXV0aG9yaXphdGlvbicsIGF1dGhvcml6YXRpb25IZWFkZXIpO1xuICAgIH1cbiAgICBjb25zdCBjYWNoZSA9IGF3YWl0IHRoaXMuY2FjaGVTdG9yYWdlLm9wZW4oQXV0aEh0dHBDYWNoZS5DQUNIRV9LRVkpO1xuICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZmV0Y2gocmVxdWVzdCkuY2F0Y2goKCkgPT4gbnVsbCk7XG4gICAgaWYgKHJlc3BvbnNlPy5vaykge1xuICAgICAgYXdhaXQgY2FjaGUucHV0KHJlcXVlc3QsIHJlc3BvbnNlKS5jYXRjaCgoKSA9PiBudWxsKTtcbiAgICB9XG4gICAgaWYgKGF1dGhvcml6YXRpb25IZWFkZXIgJiYgcmVzcG9uc2U/LnN0YXR1cyA9PT0gNDAxKSB7XG4gICAgICBhd2FpdCBjYWNoZS5kZWxldGUocmVxdWVzdCk7XG4gICAgfVxuXG4gICAgcmV0dXJuIGNhY2hlLm1hdGNoKHJlcXVlc3QpLnRoZW4oKHJlcykgPT4gcmVzPy5qc29uKCkgPz8gbnVsbCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -4,13 +4,13 @@ import { of } from 'rxjs';
|
|
|
4
4
|
import { injectAuthConfig } from '../auth.config';
|
|
5
5
|
import { AuthLoadingScreenComponent } from '../components';
|
|
6
6
|
export const loadingScreenPlugin = () => {
|
|
7
|
-
const { enableLoadingScreen
|
|
7
|
+
const { enableLoadingScreen } = injectAuthConfig();
|
|
8
8
|
const dynamicViewService = inject(DynamicViewService);
|
|
9
9
|
return (authService) => {
|
|
10
|
-
if (enableLoadingScreen
|
|
10
|
+
if (enableLoadingScreen) {
|
|
11
11
|
AuthLoadingScreenComponent.initialize(authService, dynamicViewService);
|
|
12
12
|
}
|
|
13
13
|
return of({});
|
|
14
14
|
};
|
|
15
15
|
};
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGluZy1zY3JlZW4tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXV0aC9zcmMvbGliL3BsdWdpbnMvbG9hZGluZy1zY3JlZW4tcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMxQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHM0QsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQXNCLEdBQUcsRUFBRTtJQUN6RCxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsR0FBRyxnQkFBZ0IsRUFBRSxDQUFDO0lBQ25ELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFFdEQsT0FBTyxDQUFDLFdBQVcsRUFBRSxFQUFFO1FBQ3JCLElBQUksbUJBQW1CLEVBQUU7WUFDdkIsMEJBQTBCLENBQUMsVUFBVSxDQUFDLFdBQVcsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1NBQ3hFO1FBRUQsT0FBTyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDaEIsQ0FBQyxDQUFDO0FBQ0osQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBEeW5hbWljVmlld1NlcnZpY2UgfSBmcm9tICdAb2R4L2FuZ3VsYXIvY2RrL2R5bmFtaWMtdmlldyc7XG5pbXBvcnQgeyBvZiB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgaW5qZWN0QXV0aENvbmZpZyB9IGZyb20gJy4uL2F1dGguY29uZmlnJztcbmltcG9ydCB7IEF1dGhMb2FkaW5nU2NyZWVuQ29tcG9uZW50IH0gZnJvbSAnLi4vY29tcG9uZW50cyc7XG5pbXBvcnQgeyBBdXRoUGx1Z2luRmFjdG9yeSB9IGZyb20gJy4uL21vZGVscyc7XG5cbmV4cG9ydCBjb25zdCBsb2FkaW5nU2NyZWVuUGx1Z2luOiBBdXRoUGx1Z2luRmFjdG9yeSA9ICgpID0+IHtcbiAgY29uc3QgeyBlbmFibGVMb2FkaW5nU2NyZWVuIH0gPSBpbmplY3RBdXRoQ29uZmlnKCk7XG4gIGNvbnN0IGR5bmFtaWNWaWV3U2VydmljZSA9IGluamVjdChEeW5hbWljVmlld1NlcnZpY2UpO1xuXG4gIHJldHVybiAoYXV0aFNlcnZpY2UpID0+IHtcbiAgICBpZiAoZW5hYmxlTG9hZGluZ1NjcmVlbikge1xuICAgICAgQXV0aExvYWRpbmdTY3JlZW5Db21wb25lbnQuaW5pdGlhbGl6ZShhdXRoU2VydmljZSwgZHluYW1pY1ZpZXdTZXJ2aWNlKTtcbiAgICB9XG5cbiAgICByZXR1cm4gb2Yoe30pO1xuICB9O1xufTtcbiJdfQ==
|