@cuby-ui/core 0.0.296 → 0.0.298
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/services/auth.service.mjs +5 -5
- package/esm2022/services/token.service.mjs +46 -38
- package/esm2022/widgets/general-control-error-hint/general-control-error-hint.component.mjs +3 -3
- package/fesm2022/cuby-ui-core.mjs +51 -43
- package/fesm2022/cuby-ui-core.mjs.map +1 -1
- package/package.json +4 -4
- package/services/token.service.d.ts +8 -4
|
@@ -6,12 +6,12 @@ export class CuiAuthBase extends CuiTokenBase {
|
|
|
6
6
|
return super.createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params);
|
|
7
7
|
}
|
|
8
8
|
async useCheckTokenFlow(loginCallback) {
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
if (
|
|
9
|
+
const isAccessTokenExpired = this.checkIsTokenExpired();
|
|
10
|
+
const isRefreshTokenExpired = this.checkIsRefreshTokenExpired();
|
|
11
|
+
if (isRefreshTokenExpired) {
|
|
12
12
|
return loginCallback();
|
|
13
13
|
}
|
|
14
|
-
if (!
|
|
14
|
+
if (!isAccessTokenExpired) {
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
return await this.refreshToken();
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBaUIsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQzlCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUvQyxNQUFNLE9BQU8sV0FBWSxTQUFRLFlBQVk7SUFDekIsY0FBYyxDQUFDLEtBQWMsRUFBRSxTQUFrQixFQUFFLGlCQUEwQixFQUFFLFFBQWtCLEVBQUUsTUFBZTtRQUM5SCxPQUFPLEtBQUssQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxpQkFBaUIsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDdkYsQ0FBQztJQUVNLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxhQUF5QjtRQUNwRCxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBQ3hELE1BQU0scUJBQXFCLEdBQUcsSUFBSSxDQUFDLDBCQUEwQixFQUFFLENBQUM7UUFFaEUsSUFBSSxxQkFBcUIsRUFBRSxDQUFDO1lBQ3hCLE9BQU8sYUFBYSxFQUFFLENBQUM7UUFDM0IsQ0FBQztRQUVELElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQ3hCLE9BQU87UUFDWCxDQUFDO1FBRUQsT0FBTyxNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRU0scUJBQXFCLENBQUMsYUFBeUI7UUFDbEQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLFlBQVksY0FBYyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNyRixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssZUFBZSxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssY0FBYyxFQUFFLENBQUM7Z0JBQ2xFLE9BQU87WUFDWCxDQUFDO1lBRUQsSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxFQUFFLENBQUM7Z0JBQ3pELE9BQU8sYUFBYSxFQUFFLENBQUM7WUFDM0IsQ0FBQztZQUVELElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN4QixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9BdXRoSW5mb0V2ZW50LCBUb2tlblJlc3BvbnNlIH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XG5pbXBvcnQgeyBmaWx0ZXIgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IEN1aVRva2VuQmFzZSB9IGZyb20gJy4vdG9rZW4uc2VydmljZSc7XG5cbmV4cG9ydCBjbGFzcyBDdWlBdXRoQmFzZSBleHRlbmRzIEN1aVRva2VuQmFzZSB7XG4gICAgcHVibGljIG92ZXJyaWRlIGNyZWF0ZUxvZ2luVXJsKHN0YXRlPzogc3RyaW5nLCBsb2dpbkhpbnQ/OiBzdHJpbmcsIGN1c3RvbVJlZGlyZWN0VXJpPzogc3RyaW5nLCBub1Byb21wdD86IGJvb2xlYW4sIHBhcmFtcz86IG9iamVjdCk6IFByb21pc2U8c3RyaW5nPiB7XG4gICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVMb2dpblVybChzdGF0ZSwgbG9naW5IaW50LCBjdXN0b21SZWRpcmVjdFVyaSwgbm9Qcm9tcHQsIHBhcmFtcyk7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHVzZUNoZWNrVG9rZW5GbG93KGxvZ2luQ2FsbGJhY2s6ICgpID0+IHZvaWQpOiBQcm9taXNlPFRva2VuUmVzcG9uc2UgfCB2b2lkPiB7XG4gICAgICAgIGNvbnN0IGlzQWNjZXNzVG9rZW5FeHBpcmVkID0gdGhpcy5jaGVja0lzVG9rZW5FeHBpcmVkKCk7XG4gICAgICAgIGNvbnN0IGlzUmVmcmVzaFRva2VuRXhwaXJlZCA9IHRoaXMuY2hlY2tJc1JlZnJlc2hUb2tlbkV4cGlyZWQoKTtcblxuICAgICAgICBpZiAoaXNSZWZyZXNoVG9rZW5FeHBpcmVkKSB7XG4gICAgICAgICAgICByZXR1cm4gbG9naW5DYWxsYmFjaygpO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKCFpc0FjY2Vzc1Rva2VuRXhwaXJlZCkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIGF3YWl0IHRoaXMucmVmcmVzaFRva2VuKCk7XG4gICAgfVxuXG4gICAgcHVibGljIGluaXRBdXRoUmVmcmVzaEV2ZW50cyhsb2dpbkNhbGxiYWNrOiAoKSA9PiB2b2lkKTogdm9pZCB7XG4gICAgICAgIHRoaXMuZXZlbnRzLnBpcGUoZmlsdGVyKChldmVudCkgPT4gZXZlbnQgaW5zdGFuY2VvZiBPQXV0aEluZm9FdmVudCkpLnN1YnNjcmliZSgoZXZlbnQpID0+IHtcbiAgICAgICAgICAgIGlmIChldmVudC50eXBlICE9PSAndG9rZW5fZXhwaXJlcycgfHwgZXZlbnQuaW5mbyAhPT0gJ2FjY2Vzc190b2tlbicpIHtcbiAgICAgICAgICAgICAgICByZXR1cm47XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIGlmICghdGhpcy5oYXNWYWxpZEFjY2Vzc1Rva2VuKCkgfHwgIXRoaXMuZ2V0UmVmcmVzaFRva2VuKCkpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gbG9naW5DYWxsYmFjaygpO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICB0aGlzLnJlZnJlc2hUb2tlbigpO1xuICAgICAgICB9KTtcbiAgICB9XG59Il19
|
|
@@ -1,19 +1,43 @@
|
|
|
1
1
|
import { inject, signal } from '@angular/core';
|
|
2
2
|
import { CuiExchangeContextApiService } from '@cuby-ui/api';
|
|
3
3
|
import { OAuthErrorEvent, OAuthService, OAuthSuccessEvent } from 'angular-oauth2-oidc';
|
|
4
|
-
import { from, map, of, switchMap, tap } from 'rxjs';
|
|
4
|
+
import { catchError, from, map, of, switchMap, tap, throwError } from 'rxjs';
|
|
5
5
|
class CuiToken extends OAuthService {
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.tokenData = signal({});
|
|
9
9
|
}
|
|
10
|
+
getRefreshTokenExpiration() {
|
|
11
|
+
return this.getTokenDataFromStore(this.getRefreshToken()).expires_in;
|
|
12
|
+
}
|
|
13
|
+
getAccessTokenData() {
|
|
14
|
+
const token = this.getAccessToken();
|
|
15
|
+
if (!token) {
|
|
16
|
+
throw new Error('No access token found');
|
|
17
|
+
}
|
|
18
|
+
return this.getTokenDataFromStore(token);
|
|
19
|
+
}
|
|
20
|
+
checkIsTokenExpired() {
|
|
21
|
+
const token = this.getAccessToken();
|
|
22
|
+
if (!token) {
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
return this.checkTokenExpired(this.getAccessTokenExpiration());
|
|
26
|
+
}
|
|
27
|
+
checkIsRefreshTokenExpired() {
|
|
28
|
+
const token = this.getRefreshToken();
|
|
29
|
+
if (!token) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
return this.checkTokenExpired(this.getRefreshTokenExpiration());
|
|
33
|
+
}
|
|
10
34
|
getTokenDataFromStore(token) {
|
|
11
35
|
const tokenData = this.tokenData()[token];
|
|
12
36
|
if (tokenData) {
|
|
13
37
|
return tokenData;
|
|
14
38
|
}
|
|
15
39
|
const currentTokenData = this.parseToken(token);
|
|
16
|
-
this.tokenData.
|
|
40
|
+
this.tokenData.update((prev) => ({ ...prev, [token]: currentTokenData }));
|
|
17
41
|
return currentTokenData;
|
|
18
42
|
}
|
|
19
43
|
parseToken(token) {
|
|
@@ -26,6 +50,10 @@ class CuiToken extends OAuthService {
|
|
|
26
50
|
throw new Error('Invalid token');
|
|
27
51
|
}
|
|
28
52
|
}
|
|
53
|
+
checkTokenExpired(expiredTime) {
|
|
54
|
+
const currentTime = Date.now();
|
|
55
|
+
return currentTime >= expiredTime;
|
|
56
|
+
}
|
|
29
57
|
}
|
|
30
58
|
export class CuiTokenBase extends CuiToken {
|
|
31
59
|
constructor() {
|
|
@@ -33,43 +61,16 @@ export class CuiTokenBase extends CuiToken {
|
|
|
33
61
|
this.exchangeContextApiService = inject(CuiExchangeContextApiService);
|
|
34
62
|
this.EXCHANGE_TOKEN_VALUE = 'employee_session';
|
|
35
63
|
}
|
|
36
|
-
getAccessTokenData() {
|
|
37
|
-
const token = this.getAccessToken();
|
|
38
|
-
if (!token) {
|
|
39
|
-
throw new Error('No access token found');
|
|
40
|
-
}
|
|
41
|
-
return this.getTokenDataFromStore(token);
|
|
42
|
-
}
|
|
43
|
-
checkIsTokenExpired() {
|
|
44
|
-
const token = this.getAccessToken();
|
|
45
|
-
if (!token) {
|
|
46
|
-
return true;
|
|
47
|
-
}
|
|
48
|
-
const expiredTime = this.getAccessTokenExpiration();
|
|
49
|
-
const currentTime = Date.now();
|
|
50
|
-
return currentTime >= expiredTime;
|
|
51
|
-
}
|
|
52
|
-
exchangeToken(params) {
|
|
53
|
-
return new Promise((resolve, reject) => this.exchangeContextApiService
|
|
54
|
-
.exchange(params)
|
|
55
|
-
.pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
|
|
56
|
-
.subscribe({
|
|
57
|
-
next: (tokenResponse) => {
|
|
58
|
-
this.setTokenResponse(tokenResponse);
|
|
59
|
-
resolve(tokenResponse);
|
|
60
|
-
},
|
|
61
|
-
error: (error) => {
|
|
62
|
-
this.logger.error('Error exchanging token', error);
|
|
63
|
-
this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
|
|
64
|
-
reject(error);
|
|
65
|
-
}
|
|
66
|
-
}));
|
|
67
|
-
}
|
|
68
64
|
// TODO: override refreshToken with custom refresh token request to the backend
|
|
69
65
|
refreshToken() {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
66
|
+
try {
|
|
67
|
+
const tokenData = this.getAccessTokenData();
|
|
68
|
+
if (this.EXCHANGE_TOKEN_VALUE in tokenData) {
|
|
69
|
+
return this.refreshExchangedToken();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
this.logger.error('Error refreshing token', error);
|
|
73
74
|
}
|
|
74
75
|
return super.refreshToken();
|
|
75
76
|
}
|
|
@@ -89,6 +90,13 @@ export class CuiTokenBase extends CuiToken {
|
|
|
89
90
|
}
|
|
90
91
|
}));
|
|
91
92
|
}
|
|
93
|
+
exchangeToken(params) {
|
|
94
|
+
return this.exchangeContextApiService.exchange(params).pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)), tap((tokenResponse) => this.setTokenResponse(tokenResponse)), catchError((error) => {
|
|
95
|
+
this.logger.error('Error exchanging token', error);
|
|
96
|
+
this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
|
|
97
|
+
return throwError(() => error);
|
|
98
|
+
}));
|
|
99
|
+
}
|
|
92
100
|
setTokenResponse(tokenResponse) {
|
|
93
101
|
const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec;
|
|
94
102
|
this.debug('tokenResponse', tokenResponse);
|
|
@@ -103,4 +111,4 @@ export class CuiTokenBase extends CuiToken {
|
|
|
103
111
|
return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(tap((result) => this.storeIdToken(result)), map(() => tokenResponse));
|
|
104
112
|
}
|
|
105
113
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../../../projects/core/services/token.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, signal } from '@angular/core';\nimport { CuiExchangeContextApiService, CuiTokenExchangeRequestBody } from '@cuby-ui/api';\nimport type { TokenResponse } from 'angular-oauth2-oidc';\nimport { OAuthErrorEvent, OAuthService, OAuthSuccessEvent } from 'angular-oauth2-oidc';\nimport type { Observable } from 'rxjs';\nimport { from, map, of, switchMap, tap } from 'rxjs';\n\nabstract class CuiToken extends OAuthService {\n    private readonly tokenData = signal<{ [key: string]: TokenResponse }>({});\n\n    protected getTokenDataFromStore(token: string): TokenResponse {\n        const tokenData = this.tokenData()[token];\n\n        if (tokenData) {\n            return tokenData;\n        }\n\n        const currentTokenData = this.parseToken(token);\n\n        this.tokenData.set({ [token]: currentTokenData });\n\n        return currentTokenData;\n    }\n\n    private parseToken(token: string): TokenResponse {\n        try {\n            const base64Url = token.split('.')[1];\n            const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');\n\n            return JSON.parse(atob(base64));\n        } catch {\n            throw new Error('Invalid token');\n        }\n    }\n}\n\nexport class CuiTokenBase extends CuiToken {\n    private readonly exchangeContextApiService = inject(CuiExchangeContextApiService);\n\n    private readonly EXCHANGE_TOKEN_VALUE = 'employee_session';\n\n    public getAccessTokenData<T extends TokenResponse = TokenResponse>(): T {\n        const token = this.getAccessToken();\n\n        if (!token) {\n            throw new Error('No access token found');\n        }\n\n        return this.getTokenDataFromStore(token) as T;\n    }\n\n    public checkIsTokenExpired(): boolean {\n        const token = this.getAccessToken();\n\n        if (!token) {\n            return true;\n        }\n\n        const expiredTime = this.getAccessTokenExpiration();\n        const currentTime = Date.now();\n\n        return currentTime >= expiredTime;\n    }\n\n    public exchangeToken(params: CuiTokenExchangeRequestBody): Promise<TokenResponse> {\n        return new Promise((resolve, reject) =>\n            this.exchangeContextApiService\n                .exchange(params)\n                .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))\n                .subscribe({\n                    next: (tokenResponse) => {\n                        this.setTokenResponse(tokenResponse);\n\n                        resolve(tokenResponse);\n                    },\n                    error: (error) => {\n                        this.logger.error('Error exchanging token', error);\n                        this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));\n\n                        reject(error);\n                    }\n                })\n        );\n    }\n\n    // TODO: override refreshToken with custom refresh token request to the backend\n    public override refreshToken(): Promise<TokenResponse> {\n        const tokenData = this.getAccessTokenData();\n\n        if (this.EXCHANGE_TOKEN_VALUE in tokenData) {\n            return this.refreshExchangedToken();\n        }\n\n        return super.refreshToken();\n    }\n\n    public refreshExchangedToken(): Promise<TokenResponse> {\n        return new Promise((resolve, reject) =>\n            this.exchangeContextApiService\n                .refresh(this.getRefreshToken())\n                .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))\n                .subscribe({\n                    next: (tokenResponse) => {\n                        this.setTokenResponse(tokenResponse);\n\n                        resolve(tokenResponse);\n                    },\n                    error: (error) => {\n                        this.logger.error('Error refreshing token', error);\n                        this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));\n\n                        reject(error);\n                    }\n                })\n        );\n    }\n\n    private setTokenResponse(tokenResponse: TokenResponse): void {\n        const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec!;\n\n        this.debug('tokenResponse', tokenResponse);\n        this.storeAccessTokenResponse(\n            tokenResponse.access_token,\n            tokenResponse.refresh_token,\n            expiresIn,\n            tokenResponse.scope\n        );\n\n        this.eventsSubject.next(new OAuthSuccessEvent('token_received'));\n        this.eventsSubject.next(new OAuthSuccessEvent('token_refreshed'));\n    }\n\n    private setIdToken(tokenResponse: TokenResponse): Observable<TokenResponse> {\n        if (!this.oidc || !tokenResponse.id_token) {\n            return of(tokenResponse);\n        }\n\n        return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(\n            tap((result) => this.storeIdToken(result)),\n            map(() => tokenResponse)\n        );\n    }\n}\n"]}
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../../../projects/core/services/token.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, signal } from '@angular/core';\nimport type { CuiTokenExchangeRequestBody } from '@cuby-ui/api';\nimport { CuiExchangeContextApiService } from '@cuby-ui/api';\nimport type { TokenResponse } from 'angular-oauth2-oidc';\nimport { OAuthErrorEvent, OAuthService, OAuthSuccessEvent } from 'angular-oauth2-oidc';\nimport type { Observable } from 'rxjs';\nimport { catchError, from, map, of, switchMap, tap, throwError } from 'rxjs';\n\nabstract class CuiToken extends OAuthService {\n    private readonly tokenData = signal<{ [key: string]: TokenResponse }>({});\n\n    public getRefreshTokenExpiration(): number {\n        return this.getTokenDataFromStore(this.getRefreshToken()).expires_in;\n    }\n\n    public getAccessTokenData<T extends TokenResponse = TokenResponse>(): T {\n        const token = this.getAccessToken();\n\n        if (!token) {\n            throw new Error('No access token found');\n        }\n\n        return this.getTokenDataFromStore(token) as T;\n    }\n\n    public checkIsTokenExpired(): boolean {\n        const token = this.getAccessToken();\n\n        if (!token) {\n            return true;\n        }\n\n        return this.checkTokenExpired(this.getAccessTokenExpiration());\n    }\n\n    public checkIsRefreshTokenExpired(): boolean {\n        const token = this.getRefreshToken();\n\n        if (!token) {\n            return true;\n        }\n\n        return this.checkTokenExpired(this.getRefreshTokenExpiration());\n    }\n\n    protected getTokenDataFromStore(token: string): TokenResponse {\n        const tokenData = this.tokenData()[token];\n\n        if (tokenData) {\n            return tokenData;\n        }\n\n        const currentTokenData = this.parseToken(token);\n\n        this.tokenData.update((prev) => ({ ...prev, [token]: currentTokenData }));\n\n        return currentTokenData;\n    }\n\n    private parseToken(token: string): TokenResponse {\n        try {\n            const base64Url = token.split('.')[1];\n            const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');\n\n            return JSON.parse(atob(base64));\n        } catch {\n            throw new Error('Invalid token');\n        }\n    }\n\n    private checkTokenExpired(expiredTime: number): boolean {\n        const currentTime = Date.now();\n\n        return currentTime >= expiredTime;\n    }\n}\n\nexport class CuiTokenBase extends CuiToken {\n    private readonly exchangeContextApiService = inject(CuiExchangeContextApiService);\n    private readonly EXCHANGE_TOKEN_VALUE = 'employee_session';\n\n    // TODO: override refreshToken with custom refresh token request to the backend\n    public override refreshToken(): Promise<TokenResponse> {\n        try {\n            const tokenData = this.getAccessTokenData();\n\n            if (this.EXCHANGE_TOKEN_VALUE in tokenData) {\n                return this.refreshExchangedToken();\n            }\n        } catch (error) {\n            this.logger.error('Error refreshing token', error);\n        }\n\n        return super.refreshToken();\n    }\n\n    public refreshExchangedToken(): Promise<TokenResponse> {\n        return new Promise((resolve, reject) =>\n            this.exchangeContextApiService\n                .refresh(this.getRefreshToken())\n                .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))\n                .subscribe({\n                    next: (tokenResponse) => {\n                        this.setTokenResponse(tokenResponse);\n\n                        resolve(tokenResponse);\n                    },\n                    error: (error) => {\n                        this.logger.error('Error refreshing token', error);\n                        this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));\n\n                        reject(error);\n                    }\n                })\n        );\n    }\n\n    public exchangeToken(params: CuiTokenExchangeRequestBody): Observable<TokenResponse> {\n        return this.exchangeContextApiService.exchange(params).pipe(\n            switchMap((tokenResponse) => this.setIdToken(tokenResponse)),\n            tap((tokenResponse) => this.setTokenResponse(tokenResponse)),\n            catchError((error) => {\n                this.logger.error('Error exchanging token', error);\n                this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));\n\n                return throwError(() => error);\n            })\n        );\n    }\n\n    private setTokenResponse(tokenResponse: TokenResponse): void {\n        const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec!;\n\n        this.debug('tokenResponse', tokenResponse);\n        this.storeAccessTokenResponse(\n            tokenResponse.access_token,\n            tokenResponse.refresh_token,\n            expiresIn,\n            tokenResponse.scope\n        );\n\n        this.eventsSubject.next(new OAuthSuccessEvent('token_received'));\n        this.eventsSubject.next(new OAuthSuccessEvent('token_refreshed'));\n    }\n\n    private setIdToken(tokenResponse: TokenResponse): Observable<TokenResponse> {\n        if (!this.oidc || !tokenResponse.id_token) {\n            return of(tokenResponse);\n        }\n\n        return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(\n            tap((result) => this.storeIdToken(result)),\n            map(() => tokenResponse)\n        );\n    }\n}\n"]}
|
|
@@ -12,10 +12,10 @@ export class CuiGeneralControlErrorHintComponent {
|
|
|
12
12
|
return this.isVisible() ?? (this.control().invalid && this.control().dirty);
|
|
13
13
|
}
|
|
14
14
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiGeneralControlErrorHintComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
15
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: CuiGeneralControlErrorHintComponent, isStandalone: true, selector: "cui-general-control-error-hint", inputs: { control: { classPropertyName: "control", publicName: "control", isSignal: true, isRequired: true, transformFunction: null }, isVisible: { classPropertyName: "isVisible", publicName: "isVisible", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"], dependencies: [{ kind: "ngmodule", type: CuiHintModule }, { kind: "component", type: i1.CuiHintComponent, selector: "cui-hint", inputs: ["hintType"] }, { kind: "directive", type: TranslocoDirective, selector: "[transloco]", inputs: ["transloco", "translocoParams", "translocoScope", "translocoRead", "translocoPrefix", "translocoLang", "translocoLoadingTpl"] }], changeDetection: i0.ChangeDetectionStrategy.Default }); }
|
|
15
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: CuiGeneralControlErrorHintComponent, isStandalone: true, selector: "cui-general-control-error-hint", inputs: { control: { classPropertyName: "control", publicName: "control", isSignal: true, isRequired: true, transformFunction: null }, isVisible: { classPropertyName: "isVisible", publicName: "isVisible", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['minlength']) {\n {{ t('PLEASE_KEEP_FIELD_AT_LEAST_CHARACTERS', { value: errors['minlength'].requiredLength }) }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"], dependencies: [{ kind: "ngmodule", type: CuiHintModule }, { kind: "component", type: i1.CuiHintComponent, selector: "cui-hint", inputs: ["hintType"] }, { kind: "directive", type: TranslocoDirective, selector: "[transloco]", inputs: ["transloco", "translocoParams", "translocoScope", "translocoRead", "translocoPrefix", "translocoLang", "translocoLoadingTpl"] }], changeDetection: i0.ChangeDetectionStrategy.Default }); }
|
|
16
16
|
}
|
|
17
17
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiGeneralControlErrorHintComponent, decorators: [{
|
|
18
18
|
type: Component,
|
|
19
|
-
args: [{ selector: 'cui-general-control-error-hint', imports: [CuiHintModule, TranslocoDirective], standalone: true, changeDetection: ChangeDetectionStrategy.Default, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"] }]
|
|
19
|
+
args: [{ selector: 'cui-general-control-error-hint', imports: [CuiHintModule, TranslocoDirective], standalone: true, changeDetection: ChangeDetectionStrategy.Default, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['minlength']) {\n {{ t('PLEASE_KEEP_FIELD_AT_LEAST_CHARACTERS', { value: errors['minlength'].requiredLength }) }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"] }]
|
|
20
20
|
}] });
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhbC1jb250cm9sLWVycm9yLWhpbnQuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS93aWRnZXRzL2dlbmVyYWwtY29udHJvbC1lcnJvci1oaW50L2dlbmVyYWwtY29udHJvbC1lcnJvci1oaW50LmNvbXBvbmVudC50cyIsIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NvcmUvd2lkZ2V0cy9nZW5lcmFsLWNvbnRyb2wtZXJyb3ItaGludC9nZW5lcmFsLWNvbnRyb2wtZXJyb3ItaGludC5jb21wb25lbnQuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUxRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7OztBQVVqRCxNQUFNLE9BQU8sbUNBQW1DO0lBUmhEO1FBU29CLFlBQU8sR0FBRyxLQUFLLENBQUMsUUFBUSxFQUFtQixDQUFDO1FBQzVDLGNBQVMsR0FBRyxLQUFLLEVBQVcsQ0FBQztLQUtoRDtJQUhHLElBQWMsU0FBUztRQUNuQixPQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2hGLENBQUM7K0dBTlEsbUNBQW1DO21HQUFuQyxtQ0FBbUMsdVdDZGhELDJuQ0F1QkEsK0dEZmMsYUFBYSw2SEFBRSxrQkFBa0I7OzRGQU1sQyxtQ0FBbUM7a0JBUi9DLFNBQVM7K0JBQ0ksZ0NBQWdDLFdBQ2pDLENBQUMsYUFBYSxFQUFFLGtCQUFrQixDQUFDLGNBQ2hDLElBQUksbUJBR0MsdUJBQXVCLENBQUMsT0FBTyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENoYW5nZURldGVjdGlvblN0cmF0ZWd5LCBDb21wb25lbnQsIGlucHV0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgdHlwZSB7IEFic3RyYWN0Q29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IFRyYW5zbG9jb0RpcmVjdGl2ZSB9IGZyb20gJ0Bqc3ZlcnNlL3RyYW5zbG9jbyc7XG5cbmltcG9ydCB7IEN1aUhpbnRNb2R1bGUgfSBmcm9tICcuLi8uLi9jb21wb25lbnRzJztcblxuQENvbXBvbmVudCh7XG4gICAgc2VsZWN0b3I6ICdjdWktZ2VuZXJhbC1jb250cm9sLWVycm9yLWhpbnQnLFxuICAgIGltcG9ydHM6IFtDdWlIaW50TW9kdWxlLCBUcmFuc2xvY29EaXJlY3RpdmVdLFxuICAgIHN0YW5kYWxvbmU6IHRydWUsXG4gICAgdGVtcGxhdGVVcmw6ICcuL2dlbmVyYWwtY29udHJvbC1lcnJvci1oaW50LmNvbXBvbmVudC5odG1sJyxcbiAgICBzdHlsZVVybDogJy4vZ2VuZXJhbC1jb250cm9sLWVycm9yLWhpbnQuY29tcG9uZW50LnNjc3MnLFxuICAgIGNoYW5nZURldGVjdGlvbjogQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3kuRGVmYXVsdFxufSlcbmV4cG9ydCBjbGFzcyBDdWlHZW5lcmFsQ29udHJvbEVycm9ySGludENvbXBvbmVudCB7XG4gICAgcHVibGljIHJlYWRvbmx5IGNvbnRyb2wgPSBpbnB1dC5yZXF1aXJlZDxBYnN0cmFjdENvbnRyb2w+KCk7XG4gICAgcHVibGljIHJlYWRvbmx5IGlzVmlzaWJsZSA9IGlucHV0PGJvb2xlYW4+KCk7XG5cbiAgICBwcm90ZWN0ZWQgZ2V0IGlzSW52YWxpZCgpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuaXNWaXNpYmxlKCkgPz8gKHRoaXMuY29udHJvbCgpLmludmFsaWQgJiYgdGhpcy5jb250cm9sKCkuZGlydHkpO1xuICAgIH1cbn1cbiIsIjxuZy1jb250YWluZXIgKnRyYW5zbG9jbz1cImxldCB0XCI+XG4gICAgQGlmIChpc0ludmFsaWQpIHtcbiAgICAgICAgQGlmIChjb250cm9sKCkuZXJyb3JzOyBhcyBlcnJvcnMpIHtcbiAgICAgICAgICAgIDxjdWktaGludCBoaW50VHlwZT1cImVycm9yXCI+XG4gICAgICAgICAgICAgICAgQGlmIChlcnJvcnNbJ3JlcXVpcmVkJ10pIHtcbiAgICAgICAgICAgICAgICAgICAge3sgdCgnRklFTERfSVNfUkVRVUlSRUQnKSB9fVxuICAgICAgICAgICAgICAgIH0gQGVsc2UgaWYgKGVycm9yc1snbWlubGVuZ3RoJ10pIHtcbiAgICAgICAgICAgICAgICAgICAge3sgdCgnUExFQVNFX0tFRVBfRklFTERfQVRfTEVBU1RfQ0hBUkFDVEVSUycsIHsgdmFsdWU6IGVycm9yc1snbWlubGVuZ3RoJ10ucmVxdWlyZWRMZW5ndGggfSkgfX1cbiAgICAgICAgICAgICAgICB9IEBlbHNlIGlmIChlcnJvcnNbJ21heGxlbmd0aCddKSB7XG4gICAgICAgICAgICAgICAgICAgIHt7IHQoJ1BMRUFTRV9LRUVQX0ZJRUxEX1VOREVSX0NIQVJBQ1RFUlMnLCB7IHZhbHVlOiBlcnJvcnNbJ21heGxlbmd0aCddLnJlcXVpcmVkTGVuZ3RoIH0pIH19XG4gICAgICAgICAgICAgICAgfSBAZWxzZSBpZiAoZXJyb3JzWydleHRyYVNwYWNlcyddKSB7XG4gICAgICAgICAgICAgICAgICAgIHt7IHQoJ01VU1RfQkVfV0lUSE9VVF9FWFRSQV9TUEFDRVMnKSB9fVxuICAgICAgICAgICAgICAgIH0gQGVsc2UgaWYgKGVycm9yc1snbWluJ10pIHtcbiAgICAgICAgICAgICAgICAgICAge3sgdCgnTUlOX1ZBTFVFX01VU1RfQkVfTU9SRV9USEFOJywgeyB2YWx1ZTogZXJyb3JzWydtaW4nXS5taW4gfSkgfX1cbiAgICAgICAgICAgICAgICB9IEBlbHNlIGlmIChlcnJvcnNbJ21heCddKSB7XG4gICAgICAgICAgICAgICAgICAgIHt7IHQoJ01BWF9WQUxVRV9NVVNUX0JFX0xFU1NfVEhBTicsIHsgdmFsdWU6IGVycm9yc1snbWF4J10ubWF4IH0pIH19XG4gICAgICAgICAgICAgICAgfSBAZWxzZSBpZiAoZXJyb3JzWydlbWFpbCddKSB7XG4gICAgICAgICAgICAgICAgICAgIHt7IHQoJ0lOVkFMSURfRU1BSUxfQUREUkVTUycpIH19XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgPC9jdWktaGludD5cbiAgICAgICAgfVxuICAgIH1cbjwvbmctY29udGFpbmVyPlxuIl19
|
|
@@ -6,7 +6,7 @@ import * as i1$1 from '@cuby-ui/cdk';
|
|
|
6
6
|
import { CUI_WINDOW, cuiCreateToken, cuiCreateTokenFromFactory, CuiDestroyService, CuiFilterPipe, CuiLetDirective, CuiPopoverService, cuiProvide, CUI_ANIMATION_FRAME, cuiZonefree, EMPTY_CLIENT_RECT, cuiInjectElement, CUI_LOCAL_STORAGE, CUI_IS_WEBKIT, CuiItemDirective, CuiActiveZone, CuiFocusTrapDirective, cuiGetElementObscures, CUI_IS_MOBILE, CuiHoveredService, cuiPure, cuiPointToClientRect, cuiClamp, cuiPx, cuiIfMap, cuiIsPresent, cuiTypedFromEvent, cuiZonefreeScheduler, cuiZoneOptimized, cuiIsNativeFocused, CuiClickOutsideDirective, CuiTargetDirective, cuiGetClosestFocusable, CuiTime, CuiDimensionsObserverDirective, CuiAutoResizingDirective, CuiIdService, CuiElementDirective, CuiDragPointerDirective, CuiDragDropDirective, CuiDragListDirective, CuiHandleScrollDirective } from '@cuby-ui/cdk';
|
|
7
7
|
import { DomSanitizer } from '@angular/platform-browser';
|
|
8
8
|
import { cuiIsIcon, CUI_ICONS } from '@cuby-ui/icons';
|
|
9
|
-
import { BehaviorSubject, takeUntil, Observable, merge, distinctUntilChanged, startWith, map, finalize, switchMap, of, from,
|
|
9
|
+
import { BehaviorSubject, takeUntil, Observable, merge, distinctUntilChanged, startWith, map, finalize, switchMap, tap, catchError, throwError, of, from, filter, timer, Subject, delay, repeat, takeWhile, fromEvent, debounce, skip, take, forkJoin, throttleTime, concatMap, toArray, pairwise, debounceTime } from 'rxjs';
|
|
10
10
|
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
|
11
11
|
import { OAuthService, OAuthErrorEvent, OAuthSuccessEvent, OAuthInfoEvent, provideOAuthClient } from 'angular-oauth2-oidc';
|
|
12
12
|
import { CuiExchangeContextApiService, CuiTreeStructNavigatorApiService, CuiFrameApiService, CuiNodeChecklistApiService, CuiTreeStructApiService } from '@cuby-ui/api';
|
|
@@ -866,13 +866,37 @@ class CuiToken extends OAuthService {
|
|
|
866
866
|
super(...arguments);
|
|
867
867
|
this.tokenData = signal({});
|
|
868
868
|
}
|
|
869
|
+
getRefreshTokenExpiration() {
|
|
870
|
+
return this.getTokenDataFromStore(this.getRefreshToken()).expires_in;
|
|
871
|
+
}
|
|
872
|
+
getAccessTokenData() {
|
|
873
|
+
const token = this.getAccessToken();
|
|
874
|
+
if (!token) {
|
|
875
|
+
throw new Error('No access token found');
|
|
876
|
+
}
|
|
877
|
+
return this.getTokenDataFromStore(token);
|
|
878
|
+
}
|
|
879
|
+
checkIsTokenExpired() {
|
|
880
|
+
const token = this.getAccessToken();
|
|
881
|
+
if (!token) {
|
|
882
|
+
return true;
|
|
883
|
+
}
|
|
884
|
+
return this.checkTokenExpired(this.getAccessTokenExpiration());
|
|
885
|
+
}
|
|
886
|
+
checkIsRefreshTokenExpired() {
|
|
887
|
+
const token = this.getRefreshToken();
|
|
888
|
+
if (!token) {
|
|
889
|
+
return true;
|
|
890
|
+
}
|
|
891
|
+
return this.checkTokenExpired(this.getRefreshTokenExpiration());
|
|
892
|
+
}
|
|
869
893
|
getTokenDataFromStore(token) {
|
|
870
894
|
const tokenData = this.tokenData()[token];
|
|
871
895
|
if (tokenData) {
|
|
872
896
|
return tokenData;
|
|
873
897
|
}
|
|
874
898
|
const currentTokenData = this.parseToken(token);
|
|
875
|
-
this.tokenData.
|
|
899
|
+
this.tokenData.update((prev) => ({ ...prev, [token]: currentTokenData }));
|
|
876
900
|
return currentTokenData;
|
|
877
901
|
}
|
|
878
902
|
parseToken(token) {
|
|
@@ -885,6 +909,10 @@ class CuiToken extends OAuthService {
|
|
|
885
909
|
throw new Error('Invalid token');
|
|
886
910
|
}
|
|
887
911
|
}
|
|
912
|
+
checkTokenExpired(expiredTime) {
|
|
913
|
+
const currentTime = Date.now();
|
|
914
|
+
return currentTime >= expiredTime;
|
|
915
|
+
}
|
|
888
916
|
}
|
|
889
917
|
class CuiTokenBase extends CuiToken {
|
|
890
918
|
constructor() {
|
|
@@ -892,43 +920,16 @@ class CuiTokenBase extends CuiToken {
|
|
|
892
920
|
this.exchangeContextApiService = inject(CuiExchangeContextApiService);
|
|
893
921
|
this.EXCHANGE_TOKEN_VALUE = 'employee_session';
|
|
894
922
|
}
|
|
895
|
-
getAccessTokenData() {
|
|
896
|
-
const token = this.getAccessToken();
|
|
897
|
-
if (!token) {
|
|
898
|
-
throw new Error('No access token found');
|
|
899
|
-
}
|
|
900
|
-
return this.getTokenDataFromStore(token);
|
|
901
|
-
}
|
|
902
|
-
checkIsTokenExpired() {
|
|
903
|
-
const token = this.getAccessToken();
|
|
904
|
-
if (!token) {
|
|
905
|
-
return true;
|
|
906
|
-
}
|
|
907
|
-
const expiredTime = this.getAccessTokenExpiration();
|
|
908
|
-
const currentTime = Date.now();
|
|
909
|
-
return currentTime >= expiredTime;
|
|
910
|
-
}
|
|
911
|
-
exchangeToken(params) {
|
|
912
|
-
return new Promise((resolve, reject) => this.exchangeContextApiService
|
|
913
|
-
.exchange(params)
|
|
914
|
-
.pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
|
|
915
|
-
.subscribe({
|
|
916
|
-
next: (tokenResponse) => {
|
|
917
|
-
this.setTokenResponse(tokenResponse);
|
|
918
|
-
resolve(tokenResponse);
|
|
919
|
-
},
|
|
920
|
-
error: (error) => {
|
|
921
|
-
this.logger.error('Error exchanging token', error);
|
|
922
|
-
this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
|
|
923
|
-
reject(error);
|
|
924
|
-
}
|
|
925
|
-
}));
|
|
926
|
-
}
|
|
927
923
|
// TODO: override refreshToken with custom refresh token request to the backend
|
|
928
924
|
refreshToken() {
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
925
|
+
try {
|
|
926
|
+
const tokenData = this.getAccessTokenData();
|
|
927
|
+
if (this.EXCHANGE_TOKEN_VALUE in tokenData) {
|
|
928
|
+
return this.refreshExchangedToken();
|
|
929
|
+
}
|
|
930
|
+
}
|
|
931
|
+
catch (error) {
|
|
932
|
+
this.logger.error('Error refreshing token', error);
|
|
932
933
|
}
|
|
933
934
|
return super.refreshToken();
|
|
934
935
|
}
|
|
@@ -948,6 +949,13 @@ class CuiTokenBase extends CuiToken {
|
|
|
948
949
|
}
|
|
949
950
|
}));
|
|
950
951
|
}
|
|
952
|
+
exchangeToken(params) {
|
|
953
|
+
return this.exchangeContextApiService.exchange(params).pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)), tap((tokenResponse) => this.setTokenResponse(tokenResponse)), catchError((error) => {
|
|
954
|
+
this.logger.error('Error exchanging token', error);
|
|
955
|
+
this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
|
|
956
|
+
return throwError(() => error);
|
|
957
|
+
}));
|
|
958
|
+
}
|
|
951
959
|
setTokenResponse(tokenResponse) {
|
|
952
960
|
const expiresIn = tokenResponse.expires_in || this.fallbackAccessTokenExpirationTimeInSec;
|
|
953
961
|
this.debug('tokenResponse', tokenResponse);
|
|
@@ -968,12 +976,12 @@ class CuiAuthBase extends CuiTokenBase {
|
|
|
968
976
|
return super.createLoginUrl(state, loginHint, customRedirectUri, noPrompt, params);
|
|
969
977
|
}
|
|
970
978
|
async useCheckTokenFlow(loginCallback) {
|
|
971
|
-
const
|
|
972
|
-
const
|
|
973
|
-
if (
|
|
979
|
+
const isAccessTokenExpired = this.checkIsTokenExpired();
|
|
980
|
+
const isRefreshTokenExpired = this.checkIsRefreshTokenExpired();
|
|
981
|
+
if (isRefreshTokenExpired) {
|
|
974
982
|
return loginCallback();
|
|
975
983
|
}
|
|
976
|
-
if (!
|
|
984
|
+
if (!isAccessTokenExpired) {
|
|
977
985
|
return;
|
|
978
986
|
}
|
|
979
987
|
return await this.refreshToken();
|
|
@@ -7819,11 +7827,11 @@ class CuiGeneralControlErrorHintComponent {
|
|
|
7819
7827
|
return this.isVisible() ?? (this.control().invalid && this.control().dirty);
|
|
7820
7828
|
}
|
|
7821
7829
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiGeneralControlErrorHintComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
7822
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: CuiGeneralControlErrorHintComponent, isStandalone: true, selector: "cui-general-control-error-hint", inputs: { control: { classPropertyName: "control", publicName: "control", isSignal: true, isRequired: true, transformFunction: null }, isVisible: { classPropertyName: "isVisible", publicName: "isVisible", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"], dependencies: [{ kind: "ngmodule", type: CuiHintModule }, { kind: "component", type: CuiHintComponent, selector: "cui-hint", inputs: ["hintType"] }, { kind: "directive", type: TranslocoDirective, selector: "[transloco]", inputs: ["transloco", "translocoParams", "translocoScope", "translocoRead", "translocoPrefix", "translocoLang", "translocoLoadingTpl"] }], changeDetection: i0.ChangeDetectionStrategy.Default }); }
|
|
7830
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "18.2.13", type: CuiGeneralControlErrorHintComponent, isStandalone: true, selector: "cui-general-control-error-hint", inputs: { control: { classPropertyName: "control", publicName: "control", isSignal: true, isRequired: true, transformFunction: null }, isVisible: { classPropertyName: "isVisible", publicName: "isVisible", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['minlength']) {\n {{ t('PLEASE_KEEP_FIELD_AT_LEAST_CHARACTERS', { value: errors['minlength'].requiredLength }) }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"], dependencies: [{ kind: "ngmodule", type: CuiHintModule }, { kind: "component", type: CuiHintComponent, selector: "cui-hint", inputs: ["hintType"] }, { kind: "directive", type: TranslocoDirective, selector: "[transloco]", inputs: ["transloco", "translocoParams", "translocoScope", "translocoRead", "translocoPrefix", "translocoLang", "translocoLoadingTpl"] }], changeDetection: i0.ChangeDetectionStrategy.Default }); }
|
|
7823
7831
|
}
|
|
7824
7832
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: CuiGeneralControlErrorHintComponent, decorators: [{
|
|
7825
7833
|
type: Component,
|
|
7826
|
-
args: [{ selector: 'cui-general-control-error-hint', imports: [CuiHintModule, TranslocoDirective], standalone: true, changeDetection: ChangeDetectionStrategy.Default, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"] }]
|
|
7834
|
+
args: [{ selector: 'cui-general-control-error-hint', imports: [CuiHintModule, TranslocoDirective], standalone: true, changeDetection: ChangeDetectionStrategy.Default, template: "<ng-container *transloco=\"let t\">\n @if (isInvalid) {\n @if (control().errors; as errors) {\n <cui-hint hintType=\"error\">\n @if (errors['required']) {\n {{ t('FIELD_IS_REQUIRED') }}\n } @else if (errors['minlength']) {\n {{ t('PLEASE_KEEP_FIELD_AT_LEAST_CHARACTERS', { value: errors['minlength'].requiredLength }) }}\n } @else if (errors['maxlength']) {\n {{ t('PLEASE_KEEP_FIELD_UNDER_CHARACTERS', { value: errors['maxlength'].requiredLength }) }}\n } @else if (errors['extraSpaces']) {\n {{ t('MUST_BE_WITHOUT_EXTRA_SPACES') }}\n } @else if (errors['min']) {\n {{ t('MIN_VALUE_MUST_BE_MORE_THAN', { value: errors['min'].min }) }}\n } @else if (errors['max']) {\n {{ t('MAX_VALUE_MUST_BE_LESS_THAN', { value: errors['max'].max }) }}\n } @else if (errors['email']) {\n {{ t('INVALID_EMAIL_ADDRESS') }}\n }\n </cui-hint>\n }\n }\n</ng-container>\n", styles: [":host{display:inline-block}:host:empty{display:none}\n"] }]
|
|
7827
7835
|
}] });
|
|
7828
7836
|
|
|
7829
7837
|
class CuiCategoryFormComponent {
|