@cuby-ui/core 0.0.302 → 0.0.304
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/esm2022/providers/auth.options.mjs +1 -1
- package/esm2022/providers/auth.provider.mjs +2 -2
- package/esm2022/providers/index.mjs +1 -1
- package/esm2022/services/auth.service.mjs +1 -1
- package/esm2022/services/browser-auth.service.mjs +4 -3
- package/esm2022/services/mobile-auth.service.mjs +8 -1
- package/fesm2022/cuby-ui-core.mjs +10 -2
- package/fesm2022/cuby-ui-core.mjs.map +1 -1
- package/package.json +4 -4
- package/providers/auth.options.d.ts +8 -4
- package/providers/auth.provider.d.ts +2 -2
- package/providers/index.d.ts +1 -1
- package/services/auth.service.d.ts +3 -2
- package/services/browser-auth.service.d.ts +2 -2
- package/services/mobile-auth.service.d.ts +2 -2
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { InjectionToken } from '@angular/core';
|
|
2
2
|
export const CuiAuthService = new InjectionToken('CUI_AUTH_SERVICE');
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5vcHRpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS9wcm92aWRlcnMvYXV0aC5vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFtQi9DLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxJQUFJLGNBQWMsQ0FBK0Msa0JBQWtCLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGlvblRva2VuIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgdHlwZSB7IEF1dGhDb25maWcsIE9BdXRoTW9kdWxlQ29uZmlnIH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XG5cbmltcG9ydCB0eXBlIHsgQ3VpQnJvd3NlckF1dGhTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvYnJvd3Nlci1hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHR5cGUgeyBDdWlNb2JpbGVBdXRoU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL21vYmlsZS1hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQ3VpQXV0aEJhc2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UnO1xuXG5leHBvcnQgdHlwZSBDdWlBdXRoUGxhdGZvcm0gPSAnbW9iaWxlJyB8ICdicm93c2VyJztcblxuZXhwb3J0IGludGVyZmFjZSBDdWlBdXRoQ29uZmlnIGV4dGVuZHMgQXV0aENvbmZpZyB7XG4gICAgcmVhZG9ubHkgdG9rZW5FeHBpcmVkQ2FsbGJhY2s/OiAodGhpczogQ3VpQXV0aEJhc2UpID0+IHZvaWQ7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ3VpQXV0aFByb3ZpZGVyQ29uZmlnIHtcbiAgICByZWFkb25seSBhdXRoQ29uZmlnOiBDdWlBdXRoQ29uZmlnO1xuICAgIHJlYWRvbmx5IG1vZHVsZUNvbmZpZz86IE9BdXRoTW9kdWxlQ29uZmlnO1xuICAgIHJlYWRvbmx5IHBsYXRmb3JtPzogQ3VpQXV0aFBsYXRmb3JtO1xufVxuXG5leHBvcnQgY29uc3QgQ3VpQXV0aFNlcnZpY2UgPSBuZXcgSW5qZWN0aW9uVG9rZW48Q3VpTW9iaWxlQXV0aFNlcnZpY2UgfCBDdWlCcm93c2VyQXV0aFNlcnZpY2U+KCdDVUlfQVVUSF9TRVJWSUNFJyk7XG4iXX0=
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { APP_INITIALIZER, inject, makeEnvironmentProviders } from '@angular/core';
|
|
2
2
|
import { provideOAuthClient } from 'angular-oauth2-oidc';
|
|
3
|
-
import { CuiAuthService } from './auth.options';
|
|
4
3
|
import { CuiBrowserAuthService } from '../services/browser-auth.service';
|
|
5
4
|
import { CuiMobileAuthService } from '../services/mobile-auth.service';
|
|
5
|
+
import { CuiAuthService } from './auth.options';
|
|
6
6
|
export function provideCuiAuth({ authConfig, moduleConfig, platform = 'browser' }) {
|
|
7
7
|
return [
|
|
8
8
|
provideOAuthClient(moduleConfig),
|
|
@@ -28,4 +28,4 @@ async function initAuth(authConfig) {
|
|
|
28
28
|
const authService = inject(CuiAuthService);
|
|
29
29
|
return await authService.initAuth(authConfig);
|
|
30
30
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2NvcmUvcHJvdmlkZXJzL2F1dGgucHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbEYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFekQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDekUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFdkUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRWhELE1BQU0sVUFBVSxjQUFjLENBQUMsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFFBQVEsR0FBRyxTQUFTLEVBQXlCO0lBQ3BHLE9BQU87UUFDSCxrQkFBa0IsQ0FBQyxZQUFZLENBQUM7UUFDaEM7WUFDSSxPQUFPLEVBQUUsY0FBYztZQUN2QixVQUFVLEVBQUUsR0FBaUQsRUFBRTtnQkFDM0QsSUFBSSxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7b0JBQ3hCLE9BQU8sTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUM7Z0JBQ3hDLENBQUM7Z0JBRUQsT0FBTyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztZQUN6QyxDQUFDO1NBQ0o7UUFDRCx3QkFBd0IsQ0FBQztZQUNyQjtnQkFDSSxPQUFPLEVBQUUsZUFBZTtnQkFDeEIsUUFBUSxFQUFFLEdBQWtCLEVBQUUsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO2dCQUNuRCxLQUFLLEVBQUUsSUFBSTthQUNkO1NBQ0osQ0FBQztLQUNMLENBQUM7QUFDTixDQUFDO0FBRUQsS0FBSyxVQUFVLFFBQVEsQ0FBQyxVQUF5QjtJQUM3QyxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFM0MsT0FBTyxNQUFNLFdBQVcsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7QUFDbEQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUHJvdmlkZXIgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFQUF9JTklUSUFMSVpFUiwgaW5qZWN0LCBtYWtlRW52aXJvbm1lbnRQcm92aWRlcnMgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB0eXBlIHsgQXV0aENvbmZpZyB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgcHJvdmlkZU9BdXRoQ2xpZW50IH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XG5cbmltcG9ydCB7IEN1aUJyb3dzZXJBdXRoU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2Jyb3dzZXItYXV0aC5zZXJ2aWNlJztcbmltcG9ydCB7IEN1aU1vYmlsZUF1dGhTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvbW9iaWxlLWF1dGguc2VydmljZSc7XG5pbXBvcnQgdHlwZSB7IEN1aUF1dGhDb25maWcsIEN1aUF1dGhQcm92aWRlckNvbmZpZyB9IGZyb20gJy4vYXV0aC5vcHRpb25zJztcbmltcG9ydCB7IEN1aUF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9hdXRoLm9wdGlvbnMnO1xuXG5leHBvcnQgZnVuY3Rpb24gcHJvdmlkZUN1aUF1dGgoeyBhdXRoQ29uZmlnLCBtb2R1bGVDb25maWcsIHBsYXRmb3JtID0gJ2Jyb3dzZXInIH06IEN1aUF1dGhQcm92aWRlckNvbmZpZyk6IFByb3ZpZGVyIHtcbiAgICByZXR1cm4gW1xuICAgICAgICBwcm92aWRlT0F1dGhDbGllbnQobW9kdWxlQ29uZmlnKSxcbiAgICAgICAge1xuICAgICAgICAgICAgcHJvdmlkZTogQ3VpQXV0aFNlcnZpY2UsXG4gICAgICAgICAgICB1c2VGYWN0b3J5OiAoKTogQ3VpTW9iaWxlQXV0aFNlcnZpY2UgfCBDdWlCcm93c2VyQXV0aFNlcnZpY2UgPT4ge1xuICAgICAgICAgICAgICAgIGlmIChwbGF0Zm9ybSA9PT0gJ21vYmlsZScpIHtcbiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGluamVjdChDdWlNb2JpbGVBdXRoU2VydmljZSk7XG4gICAgICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICAgICAgcmV0dXJuIGluamVjdChDdWlCcm93c2VyQXV0aFNlcnZpY2UpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9LFxuICAgICAgICBtYWtlRW52aXJvbm1lbnRQcm92aWRlcnMoW1xuICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgIHByb3ZpZGU6IEFQUF9JTklUSUFMSVpFUixcbiAgICAgICAgICAgICAgICB1c2VWYWx1ZTogKCk6IFByb21pc2U8dm9pZD4gPT4gaW5pdEF1dGgoYXV0aENvbmZpZyksXG4gICAgICAgICAgICAgICAgbXVsdGk6IHRydWVcbiAgICAgICAgICAgIH1cbiAgICAgICAgXSlcbiAgICBdO1xufVxuXG5hc3luYyBmdW5jdGlvbiBpbml0QXV0aChhdXRoQ29uZmlnOiBDdWlBdXRoQ29uZmlnKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgY29uc3QgYXV0aFNlcnZpY2UgPSBpbmplY3QoQ3VpQXV0aFNlcnZpY2UpO1xuXG4gICAgcmV0dXJuIGF3YWl0IGF1dGhTZXJ2aWNlLmluaXRBdXRoKGF1dGhDb25maWcpO1xufVxuIl19
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { CuiAuthService } from './auth.options';
|
|
2
2
|
export { provideCuiAuth } from './auth.provider';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb3JlL3Byb3ZpZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWtDLGNBQWMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ2hGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7IEN1aUF1dGhDb25maWcsIEN1aUF1dGhQbGF0Zm9ybSwgQ3VpQXV0aFNlcnZpY2UgfSBmcm9tICcuL2F1dGgub3B0aW9ucyc7XG5leHBvcnQgeyBwcm92aWRlQ3VpQXV0aCB9IGZyb20gJy4vYXV0aC5wcm92aWRlcic7XG4iXX0=
|
|
@@ -28,4 +28,4 @@ export class CuiAuthBase extends CuiTokenBase {
|
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFOUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRS9DLE1BQU0sT0FBZ0IsV0FBWSxTQUFRLFlBQVk7SUFJbEMsY0FBYyxDQUFDLEtBQWMsRUFBRSxTQUFrQixFQUFFLGlCQUEwQixFQUFFLFFBQWtCLEVBQUUsTUFBZTtRQUM5SCxPQUFPLEtBQUssQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxpQkFBaUIsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDdkYsQ0FBQztJQUVNLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxhQUF5QjtRQUNwRCxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBQ3hELE1BQU0scUJBQXFCLEdBQUcsSUFBSSxDQUFDLDBCQUEwQixFQUFFLENBQUM7UUFFaEUsSUFBSSxxQkFBcUIsRUFBRSxDQUFDO1lBQ3hCLE9BQU8sYUFBYSxFQUFFLENBQUM7UUFDM0IsQ0FBQztRQUVELElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQ3hCLE9BQU87UUFDWCxDQUFDO1FBRUQsT0FBTyxNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRU0scUJBQXFCLENBQUMsYUFBeUI7UUFDbEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLFlBQVksY0FBYyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNyRixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssZUFBZSxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssY0FBYyxFQUFFLENBQUM7Z0JBQ2xFLE9BQU87WUFDWCxDQUFDO1lBRUQsSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxFQUFFLENBQUM7Z0JBQ3pELE9BQU8sYUFBYSxFQUFFLENBQUM7WUFDM0IsQ0FBQztZQUVELElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN4QixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgQXV0aENvbmZpZywgVG9rZW5SZXNwb25zZSB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgT0F1dGhJbmZvRXZlbnQgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcbmltcG9ydCB7IGZpbHRlciB9IGZyb20gJ3J4anMnO1xuXG5pbXBvcnQgeyBDdWlUb2tlbkJhc2UgfSBmcm9tICcuL3Rva2VuLnNlcnZpY2UnO1xuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQ3VpQXV0aEJhc2UgZXh0ZW5kcyBDdWlUb2tlbkJhc2Uge1xuXG4gICAgcHVibGljIGFic3RyYWN0IGluaXRBdXRoKGF1dGhDb25maWc6IEF1dGhDb25maWcpOiBQcm9taXNlPHZvaWQ+O1xuXG4gICAgcHVibGljIG92ZXJyaWRlIGNyZWF0ZUxvZ2luVXJsKHN0YXRlPzogc3RyaW5nLCBsb2dpbkhpbnQ/OiBzdHJpbmcsIGN1c3RvbVJlZGlyZWN0VXJpPzogc3RyaW5nLCBub1Byb21wdD86IGJvb2xlYW4sIHBhcmFtcz86IG9iamVjdCk6IFByb21pc2U8c3RyaW5nPiB7XG4gICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVMb2dpblVybChzdGF0ZSwgbG9naW5IaW50LCBjdXN0b21SZWRpcmVjdFVyaSwgbm9Qcm9tcHQsIHBhcmFtcyk7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHVzZUNoZWNrVG9rZW5GbG93KGxvZ2luQ2FsbGJhY2s6ICgpID0+IHZvaWQpOiBQcm9taXNlPFRva2VuUmVzcG9uc2UgfCB2b2lkPiB7XG4gICAgICAgIGNvbnN0IGlzQWNjZXNzVG9rZW5FeHBpcmVkID0gdGhpcy5jaGVja0lzVG9rZW5FeHBpcmVkKCk7XG4gICAgICAgIGNvbnN0IGlzUmVmcmVzaFRva2VuRXhwaXJlZCA9IHRoaXMuY2hlY2tJc1JlZnJlc2hUb2tlbkV4cGlyZWQoKTtcblxuICAgICAgICBpZiAoaXNSZWZyZXNoVG9rZW5FeHBpcmVkKSB7XG4gICAgICAgICAgICByZXR1cm4gbG9naW5DYWxsYmFjaygpO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKCFpc0FjY2Vzc1Rva2VuRXhwaXJlZCkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIGF3YWl0IHRoaXMucmVmcmVzaFRva2VuKCk7XG4gICAgfVxuXG4gICAgcHVibGljIGluaXRBdXRoUmVmcmVzaEV2ZW50cyhsb2dpbkNhbGxiYWNrOiAoKSA9PiB2b2lkKTogdm9pZCB7XG4gICAgICAgIHRoaXMuZXZlbnRzLnBpcGUoZmlsdGVyKChldmVudCkgPT4gZXZlbnQgaW5zdGFuY2VvZiBPQXV0aEluZm9FdmVudCkpLnN1YnNjcmliZSgoZXZlbnQpID0+IHtcbiAgICAgICAgICAgIGlmIChldmVudC50eXBlICE9PSAndG9rZW5fZXhwaXJlcycgfHwgZXZlbnQuaW5mbyAhPT0gJ2FjY2Vzc190b2tlbicpIHtcbiAgICAgICAgICAgICAgICByZXR1cm47XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIGlmICghdGhpcy5oYXNWYWxpZEFjY2Vzc1Rva2VuKCkgfHwgIXRoaXMuZ2V0UmVmcmVzaFRva2VuKCkpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gbG9naW5DYWxsYmFjaygpO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICB0aGlzLnJlZnJlc2hUb2tlbigpO1xuICAgICAgICB9KTtcbiAgICB9XG59XG4iXX0=
|
|
@@ -14,8 +14,9 @@ export class CuiBrowserAuthService extends CuiAuthBase {
|
|
|
14
14
|
this.configure(authConfig);
|
|
15
15
|
await this.loadDiscoveryDocument();
|
|
16
16
|
await this.tryLogin();
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
const tokenExpiredCallback = authConfig.tokenExpiredCallback?.bind(this) ?? this.initLoginFlow.bind(this);
|
|
18
|
+
this.initAuthRefreshEvents(tokenExpiredCallback);
|
|
19
|
+
await this.useCheckTokenFlow(tokenExpiredCallback);
|
|
19
20
|
this.router.navigateByUrl(this.location.path(false).split('?')[0]);
|
|
20
21
|
}
|
|
21
22
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
@@ -27,4 +28,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
27
28
|
providedIn: 'root'
|
|
28
29
|
}]
|
|
29
30
|
}] });
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci1hdXRoLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb3JlL3NlcnZpY2VzL2Jyb3dzZXItYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUs3QyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsV0FBVztJQUh0RDs7UUFJcUIsV0FBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4QixhQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0tBaUJoRDtJQWZVLEtBQUssQ0FBQyxRQUFRLENBQUMsVUFBeUI7UUFDM0MsSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUM5QixJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBRTNCLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7UUFDbkMsTUFBTSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFFdEIsTUFBTSxvQkFBb0IsR0FBRyxVQUFVLENBQUMsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRTFHLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBRWpELE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFbkQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsQ0FBQzsrR0FsQlEscUJBQXFCO21IQUFyQixxQkFBcUIsY0FGbEIsTUFBTTs7NEZBRVQscUJBQXFCO2tCQUhqQyxVQUFVO21CQUFDO29CQUNSLFVBQVUsRUFBRSxNQUFNO2lCQUNyQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IExvY2F0aW9uIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcbmltcG9ydCB7IGluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcblxuaW1wb3J0IHsgQ3VpQXV0aENvbmZpZyB9IGZyb20gJy4uL3Byb3ZpZGVycyc7XG5pbXBvcnQgeyBDdWlBdXRoQmFzZSB9IGZyb20gJy4vYXV0aC5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoe1xuICAgIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBDdWlCcm93c2VyQXV0aFNlcnZpY2UgZXh0ZW5kcyBDdWlBdXRoQmFzZSB7XG4gICAgcHJpdmF0ZSByZWFkb25seSByb3V0ZXIgPSBpbmplY3QoUm91dGVyKTtcbiAgICBwcml2YXRlIHJlYWRvbmx5IGxvY2F0aW9uID0gaW5qZWN0KExvY2F0aW9uKTtcblxuICAgIHB1YmxpYyBhc3luYyBpbml0QXV0aChhdXRoQ29uZmlnOiBDdWlBdXRoQ29uZmlnKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIHRoaXMuc2V0U3RvcmFnZShsb2NhbFN0b3JhZ2UpO1xuICAgICAgICB0aGlzLmNvbmZpZ3VyZShhdXRoQ29uZmlnKTtcblxuICAgICAgICBhd2FpdCB0aGlzLmxvYWREaXNjb3ZlcnlEb2N1bWVudCgpO1xuICAgICAgICBhd2FpdCB0aGlzLnRyeUxvZ2luKCk7XG5cbiAgICAgICAgY29uc3QgdG9rZW5FeHBpcmVkQ2FsbGJhY2sgPSBhdXRoQ29uZmlnLnRva2VuRXhwaXJlZENhbGxiYWNrPy5iaW5kKHRoaXMpID8/IHRoaXMuaW5pdExvZ2luRmxvdy5iaW5kKHRoaXMpO1xuXG4gICAgICAgIHRoaXMuaW5pdEF1dGhSZWZyZXNoRXZlbnRzKHRva2VuRXhwaXJlZENhbGxiYWNrKTtcblxuICAgICAgICBhd2FpdCB0aGlzLnVzZUNoZWNrVG9rZW5GbG93KHRva2VuRXhwaXJlZENhbGxiYWNrKTtcblxuICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHRoaXMubG9jYXRpb24ucGF0aChmYWxzZSkuc3BsaXQoJz8nKVswXSk7XG4gICAgfVxufVxuIl19
|
|
@@ -5,6 +5,13 @@ export class CuiMobileAuthService extends CuiAuthBase {
|
|
|
5
5
|
async initAuth(authConfig) {
|
|
6
6
|
this.setStorage(localStorage);
|
|
7
7
|
this.configure(authConfig);
|
|
8
|
+
if (!authConfig.tokenExpiredCallback) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
await this.loadDiscoveryDocument();
|
|
12
|
+
await this.tryLogin();
|
|
13
|
+
this.initAuthRefreshEvents(authConfig.tokenExpiredCallback.bind(this));
|
|
14
|
+
await this.useCheckTokenFlow(authConfig.tokenExpiredCallback.bind(this));
|
|
8
15
|
}
|
|
9
16
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiMobileAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
10
17
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiMobileAuthService, providedIn: 'root' }); }
|
|
@@ -15,4 +22,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
15
22
|
providedIn: 'root'
|
|
16
23
|
}]
|
|
17
24
|
}] });
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9iaWxlLWF1dGguc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2NvcmUvc2VydmljZXMvbW9iaWxlLWF1dGguc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7QUFLN0MsTUFBTSxPQUFPLG9CQUFxQixTQUFRLFdBQVc7SUFDMUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUF5QjtRQUMzQyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFM0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQ25DLE9BQU87UUFDWCxDQUFDO1FBRUQsTUFBTSxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNuQyxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUV0QixJQUFJLENBQUMscUJBQXFCLENBQUMsVUFBVSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRXZFLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM3RSxDQUFDOytHQWZRLG9CQUFvQjttSEFBcEIsb0JBQW9CLGNBRmpCLE1BQU07OzRGQUVULG9CQUFvQjtrQkFIaEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IEN1aUF1dGhDb25maWcgfSBmcm9tICcuLi9wcm92aWRlcnMnO1xuaW1wb3J0IHsgQ3VpQXV0aEJhc2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgQ3VpTW9iaWxlQXV0aFNlcnZpY2UgZXh0ZW5kcyBDdWlBdXRoQmFzZSB7XG4gICAgcHVibGljIGFzeW5jIGluaXRBdXRoKGF1dGhDb25maWc6IEN1aUF1dGhDb25maWcpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgdGhpcy5zZXRTdG9yYWdlKGxvY2FsU3RvcmFnZSk7XG4gICAgICAgIHRoaXMuY29uZmlndXJlKGF1dGhDb25maWcpO1xuXG4gICAgICAgIGlmICghYXV0aENvbmZpZy50b2tlbkV4cGlyZWRDYWxsYmFjaykge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgYXdhaXQgdGhpcy5sb2FkRGlzY292ZXJ5RG9jdW1lbnQoKTtcbiAgICAgICAgYXdhaXQgdGhpcy50cnlMb2dpbigpO1xuXG4gICAgICAgIHRoaXMuaW5pdEF1dGhSZWZyZXNoRXZlbnRzKGF1dGhDb25maWcudG9rZW5FeHBpcmVkQ2FsbGJhY2suYmluZCh0aGlzKSk7XG5cbiAgICAgICAgYXdhaXQgdGhpcy51c2VDaGVja1Rva2VuRmxvdyhhdXRoQ29uZmlnLnRva2VuRXhwaXJlZENhbGxiYWNrLmJpbmQodGhpcykpO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -7665,8 +7665,9 @@ class CuiBrowserAuthService extends CuiAuthBase {
|
|
|
7665
7665
|
this.configure(authConfig);
|
|
7666
7666
|
await this.loadDiscoveryDocument();
|
|
7667
7667
|
await this.tryLogin();
|
|
7668
|
-
|
|
7669
|
-
|
|
7668
|
+
const tokenExpiredCallback = authConfig.tokenExpiredCallback?.bind(this) ?? this.initLoginFlow.bind(this);
|
|
7669
|
+
this.initAuthRefreshEvents(tokenExpiredCallback);
|
|
7670
|
+
await this.useCheckTokenFlow(tokenExpiredCallback);
|
|
7670
7671
|
this.router.navigateByUrl(this.location.path(false).split('?')[0]);
|
|
7671
7672
|
}
|
|
7672
7673
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
@@ -7683,6 +7684,13 @@ class CuiMobileAuthService extends CuiAuthBase {
|
|
|
7683
7684
|
async initAuth(authConfig) {
|
|
7684
7685
|
this.setStorage(localStorage);
|
|
7685
7686
|
this.configure(authConfig);
|
|
7687
|
+
if (!authConfig.tokenExpiredCallback) {
|
|
7688
|
+
return;
|
|
7689
|
+
}
|
|
7690
|
+
await this.loadDiscoveryDocument();
|
|
7691
|
+
await this.tryLogin();
|
|
7692
|
+
this.initAuthRefreshEvents(authConfig.tokenExpiredCallback.bind(this));
|
|
7693
|
+
await this.useCheckTokenFlow(authConfig.tokenExpiredCallback.bind(this));
|
|
7686
7694
|
}
|
|
7687
7695
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiMobileAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
7688
7696
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiMobileAuthService, providedIn: 'root' }); }
|