@cuby-ui/core 0.0.280 → 0.0.282
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.provider.mjs +3 -3
- package/esm2022/services/auth.service.mjs +4 -3
- package/esm2022/services/browser-auth.service.mjs +7 -7
- package/esm2022/services/mobile-auth.service.mjs +2 -2
- package/fesm2022/cuby-ui-core.mjs +12 -11
- package/fesm2022/cuby-ui-core.mjs.map +1 -1
- package/package.json +4 -4
- package/services/browser-auth.service.d.ts +1 -1
- package/services/mobile-auth.service.d.ts +1 -1
|
@@ -24,8 +24,8 @@ export function provideCuiAuth({ authConfig, moduleConfig, platform = 'browser'
|
|
|
24
24
|
])
|
|
25
25
|
];
|
|
26
26
|
}
|
|
27
|
-
function initAuth(authConfig) {
|
|
27
|
+
async function initAuth(authConfig) {
|
|
28
28
|
const authService = inject(CuiAuthService);
|
|
29
|
-
return authService.initAuth(authConfig);
|
|
29
|
+
return await authService.initAuth(authConfig);
|
|
30
30
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2NvcmUvcHJvdmlkZXJzL2F1dGgucHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbEYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHekQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXZFLE1BQU0sVUFBVSxjQUFjLENBQUMsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFFBQVEsR0FBRyxTQUFTLEVBQWlCO0lBQzVGLE9BQU87UUFDSCxrQkFBa0IsQ0FBQyxZQUFZLENBQUM7UUFDaEM7WUFDSSxPQUFPLEVBQUUsY0FBYztZQUN2QixVQUFVLEVBQUUsR0FBaUQsRUFBRTtnQkFDM0QsSUFBSSxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7b0JBQ3hCLE9BQU8sTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUM7Z0JBQ3hDLENBQUM7Z0JBRUQsT0FBTyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztZQUN6QyxDQUFDO1NBQ0o7UUFDRCx3QkFBd0IsQ0FBQztZQUNyQjtnQkFDSSxPQUFPLEVBQUUsZUFBZTtnQkFDeEIsUUFBUSxFQUFFLEdBQWtCLEVBQUUsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO2dCQUNuRCxLQUFLLEVBQUUsSUFBSTthQUNkO1NBQ0osQ0FBQztLQUNMLENBQUM7QUFDTixDQUFDO0FBRUQsS0FBSyxVQUFVLFFBQVEsQ0FBQyxVQUFzQjtJQUMxQyxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFM0MsT0FBTyxNQUFNLFdBQVcsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7QUFDbEQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUHJvdmlkZXIgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFQUF9JTklUSUFMSVpFUiwgaW5qZWN0LCBtYWtlRW52aXJvbm1lbnRQcm92aWRlcnMgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB0eXBlIHsgQXV0aENvbmZpZyB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgcHJvdmlkZU9BdXRoQ2xpZW50IH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XG5cbmltcG9ydCB0eXBlIHsgQ3VpQXV0aENvbmZpZyB9IGZyb20gJy4vYXV0aC5vcHRpb25zJztcbmltcG9ydCB7IEN1aUF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9hdXRoLm9wdGlvbnMnO1xuaW1wb3J0IHsgQ3VpQnJvd3NlckF1dGhTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvYnJvd3Nlci1hdXRoLnNlcnZpY2UnO1xuaW1wb3J0IHsgQ3VpTW9iaWxlQXV0aFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9tb2JpbGUtYXV0aC5zZXJ2aWNlJztcblxuZXhwb3J0IGZ1bmN0aW9uIHByb3ZpZGVDdWlBdXRoKHsgYXV0aENvbmZpZywgbW9kdWxlQ29uZmlnLCBwbGF0Zm9ybSA9ICdicm93c2VyJyB9OiBDdWlBdXRoQ29uZmlnKTogUHJvdmlkZXIge1xuICAgIHJldHVybiBbXG4gICAgICAgIHByb3ZpZGVPQXV0aENsaWVudChtb2R1bGVDb25maWcpLFxuICAgICAgICB7XG4gICAgICAgICAgICBwcm92aWRlOiBDdWlBdXRoU2VydmljZSxcbiAgICAgICAgICAgIHVzZUZhY3Rvcnk6ICgpOiBDdWlNb2JpbGVBdXRoU2VydmljZSB8IEN1aUJyb3dzZXJBdXRoU2VydmljZSA9PiB7XG4gICAgICAgICAgICAgICAgaWYgKHBsYXRmb3JtID09PSAnbW9iaWxlJykge1xuICAgICAgICAgICAgICAgICAgICByZXR1cm4gaW5qZWN0KEN1aU1vYmlsZUF1dGhTZXJ2aWNlKTtcbiAgICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgICByZXR1cm4gaW5qZWN0KEN1aUJyb3dzZXJBdXRoU2VydmljZSk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH0sXG4gICAgICAgIG1ha2VFbnZpcm9ubWVudFByb3ZpZGVycyhbXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgICAgcHJvdmlkZTogQVBQX0lOSVRJQUxJWkVSLFxuICAgICAgICAgICAgICAgIHVzZVZhbHVlOiAoKTogUHJvbWlzZTx2b2lkPiA9PiBpbml0QXV0aChhdXRoQ29uZmlnKSxcbiAgICAgICAgICAgICAgICBtdWx0aTogdHJ1ZVxuICAgICAgICAgICAgfVxuICAgICAgICBdKVxuICAgIF07XG59XG5cbmFzeW5jIGZ1bmN0aW9uIGluaXRBdXRoKGF1dGhDb25maWc6IEF1dGhDb25maWcpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICBjb25zdCBhdXRoU2VydmljZSA9IGluamVjdChDdWlBdXRoU2VydmljZSk7XG5cbiAgICByZXR1cm4gYXdhaXQgYXV0aFNlcnZpY2UuaW5pdEF1dGgoYXV0aENvbmZpZyk7XG59XG4iXX0=
|
|
@@ -6,7 +6,8 @@ export class CuiAuthBase extends OAuthService {
|
|
|
6
6
|
}
|
|
7
7
|
useCheckTokenFlow(loginCallback) {
|
|
8
8
|
const isTokenExist = this.hasValidAccessToken();
|
|
9
|
-
|
|
9
|
+
const isRefreshTokenExist = this.getRefreshToken();
|
|
10
|
+
if (isTokenExist && isRefreshTokenExist) {
|
|
10
11
|
return this.refreshTokenWithExpiredChecking();
|
|
11
12
|
}
|
|
12
13
|
return loginCallback();
|
|
@@ -28,11 +29,11 @@ export class CuiAuthBase extends OAuthService {
|
|
|
28
29
|
if (event.type !== 'token_expires' || event.info !== 'access_token') {
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
|
-
if (!this.hasValidAccessToken()) {
|
|
32
|
+
if (!this.hasValidAccessToken() || !this.getRefreshToken()) {
|
|
32
33
|
return loginCallback();
|
|
33
34
|
}
|
|
34
35
|
this.refreshToken();
|
|
35
36
|
});
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTlCLE1BQU0sT0FBTyxXQUFZLFNBQVEsWUFBWTtJQUN6QixjQUFjLENBQUMsS0FBYyxFQUFFLFNBQWtCLEVBQUUsaUJBQTBCLEVBQUUsUUFBa0IsRUFBRSxNQUFlO1FBQzlILE9BQU8sS0FBSyxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRU0saUJBQWlCLENBQUMsYUFBeUI7UUFDOUMsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDaEQsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7UUFFbkQsSUFBSSxZQUFZLElBQUksbUJBQW1CLEVBQUUsQ0FBQztZQUN0QyxPQUFPLElBQUksQ0FBQywrQkFBK0IsRUFBRSxDQUFDO1FBQ2xELENBQUM7UUFFRCxPQUFPLGFBQWEsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFTSxtQkFBbUI7UUFDdEIsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLHdCQUF3QixFQUFFLENBQUM7UUFDcEQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBRS9CLE9BQU8sV0FBVyxJQUFJLFdBQVcsQ0FBQztJQUN0QyxDQUFDO0lBRU0sK0JBQStCO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBRTdDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNiLE9BQU87UUFDWCxDQUFDO1FBRUQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3hCLENBQUM7SUFFTSxxQkFBcUIsQ0FBQyxhQUF5QjtRQUNsRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssWUFBWSxjQUFjLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3JGLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxlQUFlLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxjQUFjLEVBQUUsQ0FBQztnQkFDbEUsT0FBTztZQUNYLENBQUM7WUFFRCxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUUsQ0FBQztnQkFDekQsT0FBTyxhQUFhLEVBQUUsQ0FBQztZQUMzQixDQUFDO1lBRUQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3hCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT0F1dGhJbmZvRXZlbnQsIE9BdXRoU2VydmljZSB9IGZyb20gJ2FuZ3VsYXItb2F1dGgyLW9pZGMnO1xuaW1wb3J0IHsgZmlsdGVyIH0gZnJvbSAncnhqcyc7XG5cbmV4cG9ydCBjbGFzcyBDdWlBdXRoQmFzZSBleHRlbmRzIE9BdXRoU2VydmljZSB7XG4gICAgcHVibGljIG92ZXJyaWRlIGNyZWF0ZUxvZ2luVXJsKHN0YXRlPzogc3RyaW5nLCBsb2dpbkhpbnQ/OiBzdHJpbmcsIGN1c3RvbVJlZGlyZWN0VXJpPzogc3RyaW5nLCBub1Byb21wdD86IGJvb2xlYW4sIHBhcmFtcz86IG9iamVjdCk6IFByb21pc2U8c3RyaW5nPiB7XG4gICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVMb2dpblVybChzdGF0ZSwgbG9naW5IaW50LCBjdXN0b21SZWRpcmVjdFVyaSwgbm9Qcm9tcHQsIHBhcmFtcyk7XG4gICAgfVxuXG4gICAgcHVibGljIHVzZUNoZWNrVG9rZW5GbG93KGxvZ2luQ2FsbGJhY2s6ICgpID0+IHZvaWQpOiB2b2lkIHtcbiAgICAgICAgY29uc3QgaXNUb2tlbkV4aXN0ID0gdGhpcy5oYXNWYWxpZEFjY2Vzc1Rva2VuKCk7XG4gICAgICAgIGNvbnN0IGlzUmVmcmVzaFRva2VuRXhpc3QgPSB0aGlzLmdldFJlZnJlc2hUb2tlbigpO1xuXG4gICAgICAgIGlmIChpc1Rva2VuRXhpc3QgJiYgaXNSZWZyZXNoVG9rZW5FeGlzdCkge1xuICAgICAgICAgICAgcmV0dXJuIHRoaXMucmVmcmVzaFRva2VuV2l0aEV4cGlyZWRDaGVja2luZygpO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIGxvZ2luQ2FsbGJhY2soKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgY2hlY2tJc1Rva2VuRXhwaXJlZCgpOiBib29sZWFuIHtcbiAgICAgICAgY29uc3QgZXhwaXJlZFRpbWUgPSB0aGlzLmdldEFjY2Vzc1Rva2VuRXhwaXJhdGlvbigpO1xuICAgICAgICBjb25zdCBjdXJyZW50VGltZSA9IERhdGUubm93KCk7XG5cbiAgICAgICAgcmV0dXJuIGN1cnJlbnRUaW1lID49IGV4cGlyZWRUaW1lO1xuICAgIH1cblxuICAgIHB1YmxpYyByZWZyZXNoVG9rZW5XaXRoRXhwaXJlZENoZWNraW5nKCk6IHZvaWQge1xuICAgICAgICBjb25zdCBpc0V4cGlyZWQgPSB0aGlzLmNoZWNrSXNUb2tlbkV4cGlyZWQoKTtcblxuICAgICAgICBpZiAoIWlzRXhwaXJlZCkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgdGhpcy5yZWZyZXNoVG9rZW4oKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgaW5pdEF1dGhSZWZyZXNoRXZlbnRzKGxvZ2luQ2FsbGJhY2s6ICgpID0+IHZvaWQpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5ldmVudHMucGlwZShmaWx0ZXIoKGV2ZW50KSA9PiBldmVudCBpbnN0YW5jZW9mIE9BdXRoSW5mb0V2ZW50KSkuc3Vic2NyaWJlKChldmVudCkgPT4ge1xuICAgICAgICAgICAgaWYgKGV2ZW50LnR5cGUgIT09ICd0b2tlbl9leHBpcmVzJyB8fCBldmVudC5pbmZvICE9PSAnYWNjZXNzX3Rva2VuJykge1xuICAgICAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgaWYgKCF0aGlzLmhhc1ZhbGlkQWNjZXNzVG9rZW4oKSB8fCAhdGhpcy5nZXRSZWZyZXNoVG9rZW4oKSkge1xuICAgICAgICAgICAgICAgIHJldHVybiBsb2dpbkNhbGxiYWNrKCk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIHRoaXMucmVmcmVzaFRva2VuKCk7XG4gICAgICAgIH0pO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -9,14 +9,14 @@ export class CuiBrowserAuthService extends CuiAuthBase {
|
|
|
9
9
|
this.router = inject(Router);
|
|
10
10
|
this.location = inject(Location);
|
|
11
11
|
}
|
|
12
|
-
initAuth(authConfig) {
|
|
12
|
+
async initAuth(authConfig) {
|
|
13
13
|
this.setStorage(localStorage);
|
|
14
14
|
this.configure(authConfig);
|
|
15
|
-
this.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
await this.loadDiscoveryDocument();
|
|
16
|
+
await this.tryLogin();
|
|
17
|
+
this.initAuthRefreshEvents(this.initLoginFlow.bind(this));
|
|
18
|
+
this.useCheckTokenFlow(this.initLoginFlow.bind(this));
|
|
19
|
+
this.router.navigateByUrl(this.location.path(false).split('?')[0]);
|
|
20
20
|
}
|
|
21
21
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
22
22
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, providedIn: 'root' }); }
|
|
@@ -27,4 +27,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
27
27
|
providedIn: 'root'
|
|
28
28
|
}]
|
|
29
29
|
}] });
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci1hdXRoLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb3JlL3NlcnZpY2VzL2Jyb3dzZXItYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUs3QyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsV0FBVztJQUh0RDs7UUFJcUIsV0FBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4QixhQUFRLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0tBY2hEO0lBWlUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUFzQjtRQUN4QyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFM0IsTUFBTSxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNuQyxNQUFNLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUV0QixJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUMxRCxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUV0RCxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2RSxDQUFDOytHQWZRLHFCQUFxQjttSEFBckIscUJBQXFCLGNBRmxCLE1BQU07OzRGQUVULHFCQUFxQjtrQkFIakMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBMb2NhdGlvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XG5pbXBvcnQgeyBpbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgdHlwZSB7IEF1dGhDb25maWcgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcblxuaW1wb3J0IHsgQ3VpQXV0aEJhc2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgQ3VpQnJvd3NlckF1dGhTZXJ2aWNlIGV4dGVuZHMgQ3VpQXV0aEJhc2Uge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgcm91dGVyID0gaW5qZWN0KFJvdXRlcik7XG4gICAgcHJpdmF0ZSByZWFkb25seSBsb2NhdGlvbiA9IGluamVjdChMb2NhdGlvbik7XG5cbiAgICBwdWJsaWMgYXN5bmMgaW5pdEF1dGgoYXV0aENvbmZpZzogQXV0aENvbmZpZyk6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICB0aGlzLnNldFN0b3JhZ2UobG9jYWxTdG9yYWdlKTtcbiAgICAgICAgdGhpcy5jb25maWd1cmUoYXV0aENvbmZpZyk7XG5cbiAgICAgICAgYXdhaXQgdGhpcy5sb2FkRGlzY292ZXJ5RG9jdW1lbnQoKTtcbiAgICAgICAgYXdhaXQgdGhpcy50cnlMb2dpbigpO1xuXG4gICAgICAgIHRoaXMuaW5pdEF1dGhSZWZyZXNoRXZlbnRzKHRoaXMuaW5pdExvZ2luRmxvdy5iaW5kKHRoaXMpKTtcbiAgICAgICAgdGhpcy51c2VDaGVja1Rva2VuRmxvdyh0aGlzLmluaXRMb2dpbkZsb3cuYmluZCh0aGlzKSk7XG5cbiAgICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGVCeVVybCh0aGlzLmxvY2F0aW9uLnBhdGgoZmFsc2UpLnNwbGl0KCc/JylbMF0pO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
|
|
2
2
|
import { CuiAuthBase } from './auth.service';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
export class CuiMobileAuthService extends CuiAuthBase {
|
|
5
|
-
initAuth(authConfig) {
|
|
5
|
+
async initAuth(authConfig) {
|
|
6
6
|
this.setStorage(localStorage);
|
|
7
7
|
this.configure(authConfig);
|
|
8
8
|
}
|
|
@@ -15,4 +15,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
15
15
|
providedIn: 'root'
|
|
16
16
|
}]
|
|
17
17
|
}] });
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9iaWxlLWF1dGguc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2NvcmUvc2VydmljZXMvbW9iaWxlLWF1dGguc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7QUFLN0MsTUFBTSxPQUFPLG9CQUFxQixTQUFRLFdBQVc7SUFDMUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxVQUFzQjtRQUN4QyxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDL0IsQ0FBQzsrR0FKUSxvQkFBb0I7bUhBQXBCLG9CQUFvQixjQUZqQixNQUFNOzs0RkFFVCxvQkFBb0I7a0JBSGhDLFVBQVU7bUJBQUM7b0JBQ1IsVUFBVSxFQUFFLE1BQU07aUJBQ3JCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHR5cGUgeyBBdXRoQ29uZmlnIH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XG5cbmltcG9ydCB7IEN1aUF1dGhCYXNlIH0gZnJvbSAnLi9hdXRoLnNlcnZpY2UnO1xuXG5ASW5qZWN0YWJsZSh7XG4gICAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIEN1aU1vYmlsZUF1dGhTZXJ2aWNlIGV4dGVuZHMgQ3VpQXV0aEJhc2Uge1xuICAgIHB1YmxpYyBhc3luYyBpbml0QXV0aChhdXRoQ29uZmlnOiBBdXRoQ29uZmlnKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIHRoaXMuc2V0U3RvcmFnZShsb2NhbFN0b3JhZ2UpO1xuICAgICAgICB0aGlzLmNvbmZpZ3VyZShhdXRoQ29uZmlnKTtcbiAgICB9XG59XG4iXX0=
|
|
@@ -866,7 +866,8 @@ class CuiAuthBase extends OAuthService {
|
|
|
866
866
|
}
|
|
867
867
|
useCheckTokenFlow(loginCallback) {
|
|
868
868
|
const isTokenExist = this.hasValidAccessToken();
|
|
869
|
-
|
|
869
|
+
const isRefreshTokenExist = this.getRefreshToken();
|
|
870
|
+
if (isTokenExist && isRefreshTokenExist) {
|
|
870
871
|
return this.refreshTokenWithExpiredChecking();
|
|
871
872
|
}
|
|
872
873
|
return loginCallback();
|
|
@@ -888,7 +889,7 @@ class CuiAuthBase extends OAuthService {
|
|
|
888
889
|
if (event.type !== 'token_expires' || event.info !== 'access_token') {
|
|
889
890
|
return;
|
|
890
891
|
}
|
|
891
|
-
if (!this.hasValidAccessToken()) {
|
|
892
|
+
if (!this.hasValidAccessToken() || !this.getRefreshToken()) {
|
|
892
893
|
return loginCallback();
|
|
893
894
|
}
|
|
894
895
|
this.refreshToken();
|
|
@@ -7529,14 +7530,14 @@ class CuiBrowserAuthService extends CuiAuthBase {
|
|
|
7529
7530
|
this.router = inject(Router);
|
|
7530
7531
|
this.location = inject(Location);
|
|
7531
7532
|
}
|
|
7532
|
-
initAuth(authConfig) {
|
|
7533
|
+
async initAuth(authConfig) {
|
|
7533
7534
|
this.setStorage(localStorage);
|
|
7534
7535
|
this.configure(authConfig);
|
|
7535
|
-
this.
|
|
7536
|
-
|
|
7537
|
-
|
|
7538
|
-
|
|
7539
|
-
|
|
7536
|
+
await this.loadDiscoveryDocument();
|
|
7537
|
+
await this.tryLogin();
|
|
7538
|
+
this.initAuthRefreshEvents(this.initLoginFlow.bind(this));
|
|
7539
|
+
this.useCheckTokenFlow(this.initLoginFlow.bind(this));
|
|
7540
|
+
this.router.navigateByUrl(this.location.path(false).split('?')[0]);
|
|
7540
7541
|
}
|
|
7541
7542
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
7542
7543
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiBrowserAuthService, providedIn: 'root' }); }
|
|
@@ -7549,7 +7550,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
7549
7550
|
}] });
|
|
7550
7551
|
|
|
7551
7552
|
class CuiMobileAuthService extends CuiAuthBase {
|
|
7552
|
-
initAuth(authConfig) {
|
|
7553
|
+
async initAuth(authConfig) {
|
|
7553
7554
|
this.setStorage(localStorage);
|
|
7554
7555
|
this.configure(authConfig);
|
|
7555
7556
|
}
|
|
@@ -7584,9 +7585,9 @@ function provideCuiAuth({ authConfig, moduleConfig, platform = 'browser' }) {
|
|
|
7584
7585
|
])
|
|
7585
7586
|
];
|
|
7586
7587
|
}
|
|
7587
|
-
function initAuth(authConfig) {
|
|
7588
|
+
async function initAuth(authConfig) {
|
|
7588
7589
|
const authService = inject(CuiAuthService);
|
|
7589
|
-
return authService.initAuth(authConfig);
|
|
7590
|
+
return await authService.initAuth(authConfig);
|
|
7590
7591
|
}
|
|
7591
7592
|
|
|
7592
7593
|
const cuiAuthInterceptor = (request, next) => {
|