@cuby-ui/core 0.0.291 → 0.0.293

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.
Files changed (5) hide show
  1. package/esm2022/services/token.service.mjs +16 -7
  2. package/fesm2022/cuby-ui-core.mjs +15 -6
  3. package/fesm2022/cuby-ui-core.mjs.map +1 -1
  4. package/package.json +4 -4
  5. package/services/token.service.d.ts +5 -2
package/esm2022/services/token.service.mjs CHANGED
@@ -1,6 +1,6 @@
1
1
  import { inject, signal } from '@angular/core';
2
+ import { CuiExchangeContextApiService } from '@cuby-ui/api';
2
3
  import { OAuthErrorEvent, OAuthService, OAuthSuccessEvent } from 'angular-oauth2-oidc';
3
- import { CuiActivityTokenExchangeApiService } from '@cuby-ui/api';
4
4
  import { from, map, of, switchMap, tap } from 'rxjs';
5
5
  class CuiToken extends OAuthService {
6
6
  constructor() {
@@ -30,7 +30,8 @@ class CuiToken extends OAuthService {
30
30
  export class CuiTokenBase extends CuiToken {
31
31
  constructor() {
32
32
  super(...arguments);
33
- this.activityTokenExchangeApiService = inject(CuiActivityTokenExchangeApiService);
33
+ this.exchangeContextApiService = inject(CuiExchangeContextApiService);
34
+ this.EXCHANGE_TOKEN_VALUE = 'employee_session';
34
35
  }
35
36
  getAccessTokenData() {
36
37
  const token = this.getAccessToken();
@@ -49,8 +50,8 @@ export class CuiTokenBase extends CuiToken {
49
50
  return currentTime >= expiredTime;
50
51
  }
51
52
  exchangeToken(params) {
52
- return new Promise((resolve, reject) => this.activityTokenExchangeApiService
53
- .tokenExchange(params)
53
+ return new Promise((resolve, reject) => this.exchangeContextApiService
54
+ .exchange(params)
54
55
  .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
55
56
  .subscribe({
56
57
  next: (tokenResponse) => {
@@ -59,14 +60,22 @@ export class CuiTokenBase extends CuiToken {
59
60
  },
60
61
  error: (error) => {
61
62
  this.logger.error('Error exchanging token', error);
63
+ this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
62
64
  reject(error);
63
65
  }
64
66
  }));
65
67
  }
66
68
  // TODO: override refreshToken with custom refresh token request to the backend
67
69
  refreshToken() {
68
- return new Promise((resolve, reject) => this.activityTokenExchangeApiService
69
- .tokenRefresh()
70
+ const tokenData = this.getAccessTokenData();
71
+ if (this.EXCHANGE_TOKEN_VALUE in tokenData) {
72
+ return this.refreshExchangedToken();
73
+ }
74
+ return super.refreshToken();
75
+ }
76
+ refreshExchangedToken() {
77
+ return new Promise((resolve, reject) => this.exchangeContextApiService
78
+ .refresh(this.getRefreshToken())
70
79
  .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
71
80
  .subscribe({
72
81
  next: (tokenResponse) => {
@@ -94,4 +103,4 @@ export class CuiTokenBase extends CuiToken {
94
103
  return from(this.processIdToken(tokenResponse.id_token, tokenResponse.access_token, true)).pipe(tap((result) => this.storeIdToken(result)), map(() => tokenResponse));
95
104
  }
96
105
  }
97
- //# 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 { OAuthErrorEvent, OAuthService, OAuthSuccessEvent, TokenResponse } from 'angular-oauth2-oidc';\nimport { CuiActivityTokenExchangeApiService, CuiTokenExchangeRequestBody } from '@cuby-ui/api';\nimport { from, map, Observable, 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 activityTokenExchangeApiService = inject(CuiActivityTokenExchangeApiService);\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.activityTokenExchangeApiService\n                .tokenExchange(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\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        return new Promise((resolve, reject) =>\n            this.activityTokenExchangeApiService\n                .tokenRefresh()\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"]}
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"]}
package/fesm2022/cuby-ui-core.mjs CHANGED
@@ -9,7 +9,7 @@ import { cuiIsIcon, CUI_ICONS } from '@cuby-ui/icons';
9
9
  import { BehaviorSubject, takeUntil, Observable, merge, distinctUntilChanged, startWith, map, finalize, switchMap, of, from, tap, filter, timer, Subject, delay, repeat, takeWhile, fromEvent, debounce, skip, take, forkJoin, throttleTime, concatMap, toArray, catchError, throwError, 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
- import { CuiActivityTokenExchangeApiService, CuiTreeStructNavigatorApiService, CuiFrameApiService, CuiNodeChecklistApiService, CuiTreeStructApiService } from '@cuby-ui/api';
12
+ import { CuiExchangeContextApiService, CuiTreeStructNavigatorApiService, CuiFrameApiService, CuiNodeChecklistApiService, CuiTreeStructApiService } from '@cuby-ui/api';
13
13
  import { trigger, transition, query, animateChild, style, animate, stagger } from '@angular/animations';
14
14
  import * as i2 from '@taiga-ui/polymorpheus';
15
15
  import { PolymorpheusOutlet, PolymorpheusTemplate, PolymorpheusComponent, injectContext } from '@taiga-ui/polymorpheus';
@@ -889,7 +889,8 @@ class CuiToken extends OAuthService {
889
889
  class CuiTokenBase extends CuiToken {
890
890
  constructor() {
891
891
  super(...arguments);
892
- this.activityTokenExchangeApiService = inject(CuiActivityTokenExchangeApiService);
892
+ this.exchangeContextApiService = inject(CuiExchangeContextApiService);
893
+ this.EXCHANGE_TOKEN_VALUE = 'employee_session';
893
894
  }
894
895
  getAccessTokenData() {
895
896
  const token = this.getAccessToken();
@@ -908,8 +909,8 @@ class CuiTokenBase extends CuiToken {
908
909
  return currentTime >= expiredTime;
909
910
  }
910
911
  exchangeToken(params) {
911
- return new Promise((resolve, reject) => this.activityTokenExchangeApiService
912
- .tokenExchange(params)
912
+ return new Promise((resolve, reject) => this.exchangeContextApiService
913
+ .exchange(params)
913
914
  .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
914
915
  .subscribe({
915
916
  next: (tokenResponse) => {
@@ -918,14 +919,22 @@ class CuiTokenBase extends CuiToken {
918
919
  },
919
920
  error: (error) => {
920
921
  this.logger.error('Error exchanging token', error);
922
+ this.eventsSubject.next(new OAuthErrorEvent('token_refresh_error', error));
921
923
  reject(error);
922
924
  }
923
925
  }));
924
926
  }
925
927
  // TODO: override refreshToken with custom refresh token request to the backend
926
928
  refreshToken() {
927
- return new Promise((resolve, reject) => this.activityTokenExchangeApiService
928
- .tokenRefresh()
929
+ const tokenData = this.getAccessTokenData();
930
+ if (this.EXCHANGE_TOKEN_VALUE in tokenData) {
931
+ return this.refreshExchangedToken();
932
+ }
933
+ return super.refreshToken();
934
+ }
935
+ refreshExchangedToken() {
936
+ return new Promise((resolve, reject) => this.exchangeContextApiService
937
+ .refresh(this.getRefreshToken())
929
938
  .pipe(switchMap((tokenResponse) => this.setIdToken(tokenResponse)))
930
939
  .subscribe({
931
940
  next: (tokenResponse) => {