@smartbit4all/ng-client 3.3.216 → 3.3.217
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/esm2020/lib/session/smart-error-catching.interceptor.mjs +11 -2
- package/esm2020/lib/session/smart-session.service.mjs +31 -26
- package/fesm2015/smartbit4all-ng-client.mjs +40 -27
- package/fesm2015/smartbit4all-ng-client.mjs.map +1 -1
- package/fesm2020/smartbit4all-ng-client.mjs +40 -27
- package/fesm2020/smartbit4all-ng-client.mjs.map +1 -1
- package/lib/session/smart-session.service.d.ts +2 -0
- package/package.json +1 -1
- package/smartbit4all-ng-client-3.3.217.tgz +0 -0
- package/smartbit4all-ng-client-3.3.216.tgz +0 -0
|
@@ -48,10 +48,19 @@ export class SmartErrorCatchingInterceptor {
|
|
|
48
48
|
const sessionError = this.getSessionError(error);
|
|
49
49
|
if (sessionError) {
|
|
50
50
|
return this.resolveError(sessionError).pipe(switchMap((resolved) => {
|
|
51
|
-
if (resolved && sessionError.behaviour
|
|
51
|
+
if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {
|
|
52
52
|
return next.handle(this.updateRequestHeaders(request));
|
|
53
53
|
}
|
|
54
54
|
return throwError(() => error);
|
|
55
|
+
}), catchError((resolveError) => {
|
|
56
|
+
// when the resolveError throws a restart error (in the refreshSession), rethrow the original error
|
|
57
|
+
if (this.isSessionError(resolveError)) {
|
|
58
|
+
const resolveSessionError = this.getSessionError(resolveError);
|
|
59
|
+
if (resolveSessionError?.behaviour === SessionErrorBehaviour.RESTART) {
|
|
60
|
+
return throwError(() => error);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return throwError(() => resolveError);
|
|
55
64
|
}));
|
|
56
65
|
}
|
|
57
66
|
}
|
|
@@ -83,4 +92,4 @@ SmartErrorCatchingInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion:
|
|
|
83
92
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartErrorCatchingInterceptor, decorators: [{
|
|
84
93
|
type: Injectable
|
|
85
94
|
}], ctorParameters: function () { return [{ type: i1.SmartSessionService }]; } });
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-error-catching.interceptor.js","sourceRoot":"","sources":["../../../../../projects/smart-ng-client/src/lib/session/smart-error-catching.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n  HttpErrorResponse,\r\n  HttpEvent,\r\n  HttpHandler,\r\n  HttpInterceptor,\r\n  HttpRequest,\r\n} from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { from, Observable, throwError } from 'rxjs';\r\nimport { catchError, switchMap } from 'rxjs/operators';\r\nimport {\r\n  ApiError,\r\n  HeaderParam,\r\n  SessionError,\r\n  SessionErrorBehaviour,\r\n  SmartSessionService,\r\n} from './projects';\r\n\r\n@Injectable()\r\nexport class SmartErrorCatchingInterceptor implements HttpInterceptor {\r\n  sessionErrorCodes: SessionError[] = [\r\n    {\r\n      code: 'session.expired',\r\n      behaviour: SessionErrorBehaviour.REFRESH,\r\n    },\r\n    {\r\n      code: 'session.refreshtoken.invalid',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.badrequest.missingtoken',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.security.nocontext',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.invalidsessionuri',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.notinitialized',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n    {\r\n      code: 'session.viewcontext.missing',\r\n      behaviour: SessionErrorBehaviour.RESTART,\r\n    },\r\n  ];\r\n\r\n  constructor(private session: SmartSessionService) {}\r\n\r\n  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {\r\n    return next\r\n      .handle(request)\r\n      .pipe(catchError((error: HttpErrorResponse) => this.handleError(error, request, next)));\r\n  }\r\n\r\n  private handleError(\r\n    error: HttpErrorResponse,\r\n    request: HttpRequest<unknown>,\r\n    next: HttpHandler\r\n  ): Observable<HttpEvent<unknown>> {\r\n    if (this.isSessionError(error)) {\r\n      const sessionError = this.getSessionError(error);\r\n      if (sessionError) {\r\n        return this.resolveError(sessionError).pipe(\r\n          switchMap((resolved) => {\r\n            if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {\r\n              return next.handle(this.updateRequestHeaders(request));\r\n            }\r\n            return throwError(() => error);\r\n          }),\r\n          catchError((resolveError) => {\r\n            // when the resolveError throws a restart error (in the refreshSession), rethrow the original error\r\n            if (this.isSessionError(resolveError)) {\r\n              const resolveSessionError = this.getSessionError(resolveError);\r\n              if (resolveSessionError?.behaviour === SessionErrorBehaviour.RESTART) {\r\n                return throwError(() => error);\r\n              }\r\n            }\r\n            return throwError(() => resolveError);\r\n          })\r\n        );\r\n      }\r\n    }\r\n    return throwError(() => error);\r\n  }\r\n\r\n  private isSessionError(error: HttpErrorResponse): boolean {\r\n    return error.status === 400 && (error.error as ApiError).code != null;\r\n  }\r\n\r\n  private getSessionError(error: HttpErrorResponse): SessionError | undefined {\r\n    return this.sessionErrorCodes.find(\r\n      (sessionError: SessionError) => sessionError.code === (error.error as ApiError).code\r\n    );\r\n  }\r\n\r\n  private resolveError(sessionError: SessionError): Observable<any> {\r\n    if (sessionError.behaviour === SessionErrorBehaviour.RESTART) {\r\n      return from(this.session.handleSessionError(sessionError));\r\n    }\r\n    return from(this.session.refreshSession());\r\n  }\r\n\r\n  private updateRequestHeaders(request: HttpRequest<unknown>): HttpRequest<unknown> {\r\n    this.session.headerParams.forEach((headerParam: HeaderParam) => {\r\n      request = request.clone({\r\n        headers: request.headers.set(headerParam.headerName, headerParam.value),\r\n      });\r\n    });\r\n    return request;\r\n  }\r\n}\r\n"]}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { HttpErrorResponse } from '@angular/common/http';
|
|
1
2
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import { Subject } from 'rxjs';
|
|
3
|
+
import { Subject, lastValueFrom } from 'rxjs';
|
|
3
4
|
import { SmartSubject } from '../smart-subject/projects';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "./api";
|
|
@@ -37,7 +38,7 @@ export class SmartSessionService {
|
|
|
37
38
|
}
|
|
38
39
|
async handleSessionError(sessionError) {
|
|
39
40
|
if (this.sessionHandlerService) {
|
|
40
|
-
await this.sessionHandlerService.handleSessionError(sessionError);
|
|
41
|
+
return await this.sessionHandlerService.handleSessionError(sessionError);
|
|
41
42
|
}
|
|
42
43
|
throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);
|
|
43
44
|
}
|
|
@@ -132,11 +133,7 @@ export class SmartSessionService {
|
|
|
132
133
|
async startSession() {
|
|
133
134
|
let sessionInfo = await this.apiService.startSession().toPromise();
|
|
134
135
|
if (sessionInfo) {
|
|
135
|
-
this.
|
|
136
|
-
this.token = sessionInfo.sid;
|
|
137
|
-
this.saveTokenToLocalStorage();
|
|
138
|
-
this.setAuthenticationStatus();
|
|
139
|
-
this.setUpTokenForSessionService();
|
|
136
|
+
this.updateSessionInfo(sessionInfo);
|
|
140
137
|
}
|
|
141
138
|
return this.sessionInfoData;
|
|
142
139
|
}
|
|
@@ -155,26 +152,34 @@ export class SmartSessionService {
|
|
|
155
152
|
if (!refreshToken) {
|
|
156
153
|
return await this.startSession();
|
|
157
154
|
}
|
|
158
|
-
|
|
159
|
-
.refreshSession({
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
.catch(async (error) => {
|
|
164
|
-
if (error.error &&
|
|
165
|
-
error.error.code &&
|
|
166
|
-
error.error.code === 'session.refreshtoken.invalid') {
|
|
167
|
-
await this.startSession();
|
|
155
|
+
try {
|
|
156
|
+
const sessionInfo = await lastValueFrom(this.apiService.refreshSession({ refreshToken }));
|
|
157
|
+
if (sessionInfo) {
|
|
158
|
+
this.updateSessionInfo(sessionInfo);
|
|
159
|
+
return sessionInfo;
|
|
168
160
|
}
|
|
169
|
-
});
|
|
170
|
-
if (sessionInfo) {
|
|
171
|
-
this.sessionInfoData = sessionInfo;
|
|
172
|
-
this.token = sessionInfo.sid;
|
|
173
|
-
this.saveTokenToLocalStorage();
|
|
174
|
-
this.setAuthenticationStatus();
|
|
175
|
-
this.setUpTokenForSessionService();
|
|
176
161
|
}
|
|
177
|
-
|
|
162
|
+
catch (error) {
|
|
163
|
+
if (this.isInvalidRefreshTokenError(error)) {
|
|
164
|
+
this.clearAndStartNewSession();
|
|
165
|
+
// still throw the error, so the error can be handled in the caller
|
|
166
|
+
}
|
|
167
|
+
throw error;
|
|
168
|
+
}
|
|
169
|
+
// no sessionInfo returned
|
|
170
|
+
throw new Error('Unable to refresh session');
|
|
171
|
+
}
|
|
172
|
+
updateSessionInfo(sessionInfo) {
|
|
173
|
+
this.sessionInfoData = sessionInfo;
|
|
174
|
+
this.token = sessionInfo.sid;
|
|
175
|
+
this.saveTokenToLocalStorage();
|
|
176
|
+
this.setAuthenticationStatus();
|
|
177
|
+
this.setUpTokenForSessionService();
|
|
178
|
+
}
|
|
179
|
+
isInvalidRefreshTokenError(error) {
|
|
180
|
+
return (error instanceof HttpErrorResponse &&
|
|
181
|
+
error.error &&
|
|
182
|
+
error.error.code === 'session.refreshtoken.invalid');
|
|
178
183
|
}
|
|
179
184
|
async getAuthenticationProviders() {
|
|
180
185
|
let providers = await this.apiService
|
|
@@ -222,4 +227,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
|
|
|
222
227
|
providedIn: 'root',
|
|
223
228
|
}]
|
|
224
229
|
}], ctorParameters: function () { return [{ type: i1.SessionService }, { type: i2.SmartCookieService }]; } });
|
|
225
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-session.service.js","sourceRoot":"","sources":["../../../../../projects/smart-ng-client/src/lib/session/smart-session.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\r\nimport { Injectable, OnDestroy } from '@angular/core';\r\nimport { Subject } from 'rxjs';\r\nimport {\r\n  ApiError,\r\n  AuthenticationProviderData,\r\n  GetAuthenticationProvidersResponse,\r\n  SessionInfoData,\r\n  SessionService,\r\n} from './api';\r\nimport { SmartCookieService } from './cookie-service/smart-cookie.service';\r\nimport { SessionError, SmartSessionHandlerService } from './smart-session-handler.service';\r\nimport { SmartSubject } from '../smart-subject/projects';\r\n\r\nexport interface HeaderParam {\r\n  headerName: string;\r\n  value: string;\r\n}\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class SmartSessionService implements OnDestroy {\r\n  private basePath?: string;\r\n  private token?: string;\r\n  private _sessionInfoData?: SessionInfoData;\r\n  private _destroy$: Subject<void> = new Subject();\r\n\r\n  public get sessionInfoData(): SessionInfoData | undefined {\r\n    return this._sessionInfoData;\r\n  }\r\n  private set sessionInfoData(sessionInfoData: SessionInfoData | undefined) {\r\n    let expiracyChanged = this.sessionInfoData?.expiration !== sessionInfoData?.expiration;\r\n\r\n    this._sessionInfoData = sessionInfoData;\r\n\r\n    if (expiracyChanged) {\r\n      this.sessionExpiracyChanged.next();\r\n    }\r\n  }\r\n\r\n  private providers?: Array<AuthenticationProviderData>;\r\n  private cookieName?: string;\r\n  public isAuthenticated: boolean = false;\r\n\r\n  public authenticationStateChanged: Subject<boolean> = new SmartSubject(this._destroy$);\r\n\r\n  public headerParams: Array<HeaderParam> = new Array();\r\n  public headersUpdated: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  // Locale\r\n  private localStorageLocaleName: string = 'locale';\r\n  public localeChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n  private initializeRunning: Subject<void> | undefined;\r\n\r\n  public sessionExpiracyChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  private sessionHandlerService?: SmartSessionHandlerService;\r\n\r\n  constructor(private apiService: SessionService, private cookieService: SmartCookieService) {}\r\n\r\n  ngOnDestroy(): void {\r\n    this._destroy$.next();\r\n    this._destroy$.complete();\r\n  }\r\n\r\n  public setSessionHandlerService(smartSessionHandlerService: SmartSessionHandlerService): void {\r\n    this.sessionHandlerService = smartSessionHandlerService;\r\n  }\r\n\r\n  public async handleSessionError(sessionError: SessionError): Promise<void> {\r\n    if (this.sessionHandlerService) {\r\n      await this.sessionHandlerService.handleSessionError(sessionError);\r\n    }\r\n    throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);\r\n  }\r\n\r\n  public addHeaderParam(headerParam: HeaderParam): void {\r\n    if (this.headerParams.find((h: HeaderParam) => h.headerName === headerParam.headerName)) {\r\n      let index = this.headerParams.findIndex(\r\n        (h: HeaderParam) => h.headerName === headerParam.headerName\r\n      );\r\n      this.headerParams[index!].value = headerParam.value;\r\n    } else {\r\n      this.headerParams.push(headerParam);\r\n    }\r\n    this.headersUpdated.next();\r\n  }\r\n\r\n  private setUpTokenForSessionService(): void {\r\n    this.addHeaderParam({\r\n      headerName: 'Authorization',\r\n      value: `Bearer ${this.token!}`,\r\n    });\r\n  }\r\n\r\n  public setUrl(url: string): void {\r\n    this.basePath = url;\r\n  }\r\n  public getBasePath(): string {\r\n    if (!this.basePath) {\r\n      throw new Error('BasePath has not been set in SmartSessionService!');\r\n    }\r\n    return this.basePath;\r\n  }\r\n\r\n  public setCookieName(name: string): void {\r\n    this.cookieName = name;\r\n  }\r\n\r\n  private saveTokenToLocalStorage(): void {\r\n    if (this.sessionInfoData && this.cookieName) {\r\n      localStorage.setItem('token', this.sessionInfoData.sid);\r\n      if (\r\n        this.sessionInfoData.refreshToken &&\r\n        this.sessionInfoData.refreshToken !== localStorage.getItem('refreshToken')\r\n      ) {\r\n        localStorage.setItem('refreshToken', this.sessionInfoData.refreshToken);\r\n      }\r\n      this.cookieService.set(this.cookieName, this.token!);\r\n    }\r\n  }\r\n\r\n  private setAuthenticationStatus(): void {\r\n    if (this.sessionInfoData && this.sessionInfoData.authentications) {\r\n      this.isAuthenticated = this.sessionInfoData.authentications.length > 0;\r\n    }\r\n    this.authenticationStateChanged.next(this.isAuthenticated);\r\n  }\r\n\r\n  private checkStatements(): void {\r\n    if (!this.basePath) {\r\n      throw new Error('The url of the backend api has not been set!');\r\n    } else if (!this.cookieName) {\r\n      throw new Error('The name of the cookie required by the backend has not been set!');\r\n    }\r\n  }\r\n\r\n  public async initialize(): Promise<void> {\r\n    if (this.initializeRunning) {\r\n      return this.initializeRunning.toPromise();\r\n    } else {\r\n      this.initializeRunning = new SmartSubject(this._destroy$);\r\n      try {\r\n        this.checkStatements();\r\n\r\n        let tokenFromLocalStorage = localStorage.getItem('token');\r\n        let tokenFromCookies = this.cookieService.get(this.cookieName!);\r\n\r\n        if (\r\n          tokenFromLocalStorage &&\r\n          tokenFromCookies &&\r\n          tokenFromLocalStorage === tokenFromCookies\r\n        ) {\r\n          this.token = tokenFromLocalStorage;\r\n          this.setUpTokenForSessionService();\r\n          try {\r\n            await this.getSession();\r\n          } catch (err) {\r\n            await this.startSession();\r\n          }\r\n        } else {\r\n          await this.clearAndStartNewSession();\r\n        }\r\n        if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n          localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n          this.localeChanged.next();\r\n        }\r\n      } finally {\r\n        this.initializeRunning.complete();\r\n        this.initializeRunning = undefined;\r\n      }\r\n    }\r\n  }\r\n\r\n  private async startSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.startSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n      this.setUpTokenForSessionService();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async getSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.getSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async refreshSession(): Promise<SessionInfoData> {\r\n    let refreshToken = localStorage.getItem('refreshToken');\r\n    if (!refreshToken) {\r\n      return await this.startSession();\r\n    }\r\n\r\n    let sessionInfo = await this.apiService\r\n      .refreshSession({\r\n        refreshToken,\r\n      })\r\n      .toPromise()\r\n      .catch(async (error: HttpErrorResponse) => {\r\n        if (\r\n          error.error &&\r\n          (error.error as ApiError).code &&\r\n          (error.error as ApiError).code === 'session.refreshtoken.invalid'\r\n        ) {\r\n          await this.startSession();\r\n        }\r\n      });\r\n\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n      this.setUpTokenForSessionService();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async getAuthenticationProviders(): Promise<Array<AuthenticationProviderData>> {\r\n    let providers: GetAuthenticationProvidersResponse | undefined = await this.apiService\r\n      .getAuthenticationProviders()\r\n      .toPromise();\r\n\r\n    this.providers = providers?.authenticationProviders;\r\n\r\n    return this.providers!;\r\n  }\r\n\r\n  public async getIsAuthenticated(): Promise<boolean> {\r\n    if (this.sessionInfoData) {\r\n      return this.isAuthenticated;\r\n    }\r\n    await this.getSession();\r\n    return this.isAuthenticated;\r\n  }\r\n\r\n  public async clearAndStartNewSession(): Promise<void> {\r\n    sessionStorage.clear();\r\n    localStorage.clear();\r\n    this.headerParams = [];\r\n    this.cookieService.delete(this.cookieName!);\r\n\r\n    await this.startSession();\r\n  }\r\n\r\n  public getLocale(): string {\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      if (localStorage.getItem(this.localStorageLocaleName) !== this.sessionInfoData.locale) {\r\n        localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      }\r\n      return this.sessionInfoData.locale;\r\n    }\r\n    throw new Error('There is no SessionInfoData or locale is undefined.');\r\n  }\r\n\r\n  public async changeLocale(locale: string): Promise<void> {\r\n    this.sessionInfoData = await this.apiService.setLocale(locale).toPromise();\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      this.localeChanged.next();\r\n    }\r\n  }\r\n}\r\n"]}
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-session.service.js","sourceRoot":"","sources":["../../../../../projects/smart-ng-client/src/lib/session/smart-session.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\r\nimport { Injectable, OnDestroy } from '@angular/core';\r\nimport { Subject, lastValueFrom } from 'rxjs';\r\nimport {\r\n  ApiError,\r\n  AuthenticationProviderData,\r\n  GetAuthenticationProvidersResponse,\r\n  SessionInfoData,\r\n  SessionService,\r\n} from './api';\r\nimport { SmartCookieService } from './cookie-service/smart-cookie.service';\r\nimport { SessionError, SmartSessionHandlerService } from './smart-session-handler.service';\r\nimport { SmartSubject } from '../smart-subject/projects';\r\n\r\nexport interface HeaderParam {\r\n  headerName: string;\r\n  value: string;\r\n}\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class SmartSessionService implements OnDestroy {\r\n  private basePath?: string;\r\n  private token?: string;\r\n  private _sessionInfoData?: SessionInfoData;\r\n  private _destroy$: Subject<void> = new Subject();\r\n\r\n  public get sessionInfoData(): SessionInfoData | undefined {\r\n    return this._sessionInfoData;\r\n  }\r\n  private set sessionInfoData(sessionInfoData: SessionInfoData | undefined) {\r\n    let expiracyChanged = this.sessionInfoData?.expiration !== sessionInfoData?.expiration;\r\n\r\n    this._sessionInfoData = sessionInfoData;\r\n\r\n    if (expiracyChanged) {\r\n      this.sessionExpiracyChanged.next();\r\n    }\r\n  }\r\n\r\n  private providers?: Array<AuthenticationProviderData>;\r\n  private cookieName?: string;\r\n  public isAuthenticated: boolean = false;\r\n\r\n  public authenticationStateChanged: Subject<boolean> = new SmartSubject(this._destroy$);\r\n\r\n  public headerParams: Array<HeaderParam> = new Array();\r\n  public headersUpdated: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  // Locale\r\n  private localStorageLocaleName: string = 'locale';\r\n  public localeChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n  private initializeRunning: Subject<void> | undefined;\r\n\r\n  public sessionExpiracyChanged: Subject<void> = new SmartSubject(this._destroy$);\r\n\r\n  private sessionHandlerService?: SmartSessionHandlerService;\r\n\r\n  constructor(private apiService: SessionService, private cookieService: SmartCookieService) {}\r\n\r\n  ngOnDestroy(): void {\r\n    this._destroy$.next();\r\n    this._destroy$.complete();\r\n  }\r\n\r\n  public setSessionHandlerService(smartSessionHandlerService: SmartSessionHandlerService): void {\r\n    this.sessionHandlerService = smartSessionHandlerService;\r\n  }\r\n\r\n  public async handleSessionError(sessionError: SessionError): Promise<void> {\r\n    if (this.sessionHandlerService) {\r\n      return await this.sessionHandlerService.handleSessionError(sessionError);\r\n    }\r\n    throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);\r\n  }\r\n\r\n  public addHeaderParam(headerParam: HeaderParam): void {\r\n    if (this.headerParams.find((h: HeaderParam) => h.headerName === headerParam.headerName)) {\r\n      let index = this.headerParams.findIndex(\r\n        (h: HeaderParam) => h.headerName === headerParam.headerName\r\n      );\r\n      this.headerParams[index!].value = headerParam.value;\r\n    } else {\r\n      this.headerParams.push(headerParam);\r\n    }\r\n    this.headersUpdated.next();\r\n  }\r\n\r\n  private setUpTokenForSessionService(): void {\r\n    this.addHeaderParam({\r\n      headerName: 'Authorization',\r\n      value: `Bearer ${this.token!}`,\r\n    });\r\n  }\r\n\r\n  public setUrl(url: string): void {\r\n    this.basePath = url;\r\n  }\r\n  public getBasePath(): string {\r\n    if (!this.basePath) {\r\n      throw new Error('BasePath has not been set in SmartSessionService!');\r\n    }\r\n    return this.basePath;\r\n  }\r\n\r\n  public setCookieName(name: string): void {\r\n    this.cookieName = name;\r\n  }\r\n\r\n  private saveTokenToLocalStorage(): void {\r\n    if (this.sessionInfoData && this.cookieName) {\r\n      localStorage.setItem('token', this.sessionInfoData.sid);\r\n      if (\r\n        this.sessionInfoData.refreshToken &&\r\n        this.sessionInfoData.refreshToken !== localStorage.getItem('refreshToken')\r\n      ) {\r\n        localStorage.setItem('refreshToken', this.sessionInfoData.refreshToken);\r\n      }\r\n      this.cookieService.set(this.cookieName, this.token!);\r\n    }\r\n  }\r\n\r\n  private setAuthenticationStatus(): void {\r\n    if (this.sessionInfoData && this.sessionInfoData.authentications) {\r\n      this.isAuthenticated = this.sessionInfoData.authentications.length > 0;\r\n    }\r\n    this.authenticationStateChanged.next(this.isAuthenticated);\r\n  }\r\n\r\n  private checkStatements(): void {\r\n    if (!this.basePath) {\r\n      throw new Error('The url of the backend api has not been set!');\r\n    } else if (!this.cookieName) {\r\n      throw new Error('The name of the cookie required by the backend has not been set!');\r\n    }\r\n  }\r\n\r\n  public async initialize(): Promise<void> {\r\n    if (this.initializeRunning) {\r\n      return this.initializeRunning.toPromise();\r\n    } else {\r\n      this.initializeRunning = new SmartSubject(this._destroy$);\r\n      try {\r\n        this.checkStatements();\r\n\r\n        let tokenFromLocalStorage = localStorage.getItem('token');\r\n        let tokenFromCookies = this.cookieService.get(this.cookieName!);\r\n\r\n        if (\r\n          tokenFromLocalStorage &&\r\n          tokenFromCookies &&\r\n          tokenFromLocalStorage === tokenFromCookies\r\n        ) {\r\n          this.token = tokenFromLocalStorage;\r\n          this.setUpTokenForSessionService();\r\n          try {\r\n            await this.getSession();\r\n          } catch (err) {\r\n            await this.startSession();\r\n          }\r\n        } else {\r\n          await this.clearAndStartNewSession();\r\n        }\r\n        if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n          localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n          this.localeChanged.next();\r\n        }\r\n      } finally {\r\n        this.initializeRunning.complete();\r\n        this.initializeRunning = undefined;\r\n      }\r\n    }\r\n  }\r\n\r\n  private async startSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.startSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.updateSessionInfo(sessionInfo);\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async getSession(): Promise<SessionInfoData> {\r\n    let sessionInfo = await this.apiService.getSession().toPromise();\r\n    if (sessionInfo) {\r\n      this.sessionInfoData = sessionInfo;\r\n      this.token = sessionInfo.sid;\r\n      this.saveTokenToLocalStorage();\r\n      this.setAuthenticationStatus();\r\n    }\r\n\r\n    return this.sessionInfoData!;\r\n  }\r\n\r\n  public async refreshSession(): Promise<SessionInfoData> {\r\n    let refreshToken = localStorage.getItem('refreshToken');\r\n    if (!refreshToken) {\r\n      return await this.startSession();\r\n    }\r\n\r\n    try {\r\n      const sessionInfo = await lastValueFrom(this.apiService.refreshSession({ refreshToken }));\r\n      if (sessionInfo) {\r\n        this.updateSessionInfo(sessionInfo);\r\n        return sessionInfo;\r\n      }\r\n    } catch (error) {\r\n      if (this.isInvalidRefreshTokenError(error)) {\r\n        this.clearAndStartNewSession();\r\n        // still throw the error, so the error can be handled in the caller\r\n      }\r\n      throw error;\r\n    }\r\n    // no sessionInfo returned\r\n    throw new Error('Unable to refresh session');\r\n  }\r\n\r\n  private updateSessionInfo(sessionInfo: SessionInfoData): void {\r\n    this.sessionInfoData = sessionInfo;\r\n    this.token = sessionInfo.sid;\r\n    this.saveTokenToLocalStorage();\r\n    this.setAuthenticationStatus();\r\n    this.setUpTokenForSessionService();\r\n  }\r\n\r\n  private isInvalidRefreshTokenError(error: any): boolean {\r\n    return (\r\n      error instanceof HttpErrorResponse &&\r\n      error.error &&\r\n      (error.error as ApiError).code === 'session.refreshtoken.invalid'\r\n    );\r\n  }\r\n\r\n  public async getAuthenticationProviders(): Promise<Array<AuthenticationProviderData>> {\r\n    let providers: GetAuthenticationProvidersResponse | undefined = await this.apiService\r\n      .getAuthenticationProviders()\r\n      .toPromise();\r\n\r\n    this.providers = providers?.authenticationProviders;\r\n\r\n    return this.providers!;\r\n  }\r\n\r\n  public async getIsAuthenticated(): Promise<boolean> {\r\n    if (this.sessionInfoData) {\r\n      return this.isAuthenticated;\r\n    }\r\n    await this.getSession();\r\n    return this.isAuthenticated;\r\n  }\r\n\r\n  public async clearAndStartNewSession(): Promise<void> {\r\n    sessionStorage.clear();\r\n    localStorage.clear();\r\n    this.headerParams = [];\r\n    this.cookieService.delete(this.cookieName!);\r\n\r\n    await this.startSession();\r\n  }\r\n\r\n  public getLocale(): string {\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      if (localStorage.getItem(this.localStorageLocaleName) !== this.sessionInfoData.locale) {\r\n        localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      }\r\n      return this.sessionInfoData.locale;\r\n    }\r\n    throw new Error('There is no SessionInfoData or locale is undefined.');\r\n  }\r\n\r\n  public async changeLocale(locale: string): Promise<void> {\r\n    this.sessionInfoData = await this.apiService.setLocale(locale).toPromise();\r\n    if (this.sessionInfoData && this.sessionInfoData.locale) {\r\n      localStorage.setItem(this.localStorageLocaleName, this.sessionInfoData.locale);\r\n      this.localeChanged.next();\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { InjectionToken, Injectable, Optional, Inject, PLATFORM_ID, NgModule, SkipSelf, Component, RendererStyleFlags2, Input, Directive, HostBinding, HostListener, ViewChild, forwardRef, EventEmitter, Output, Pipe, ViewContainerRef, ViewEncapsulation, ChangeDetectionStrategy, ViewChildren, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, ChangeDetectorRef } from '@angular/core';
|
|
3
3
|
import { __awaiter } from 'tslib';
|
|
4
|
-
import { Subject, takeUntil, startWith, map, distinctUntilChanged, catchError, throwError, from, lastValueFrom } from 'rxjs';
|
|
5
4
|
import * as i1 from '@angular/common/http';
|
|
6
|
-
import { HttpHeaders, HttpContext, HttpParams, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
5
|
+
import { HttpHeaders, HttpContext, HttpErrorResponse, HttpParams, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
6
|
+
import { Subject, lastValueFrom, takeUntil, startWith, map, distinctUntilChanged, catchError, throwError, from } from 'rxjs';
|
|
7
7
|
import * as i3 from '@angular/common';
|
|
8
8
|
import { isPlatformBrowser, DOCUMENT, DatePipe, CommonModule } from '@angular/common';
|
|
9
9
|
import * as i2 from '@angular/material/button';
|
|
@@ -776,7 +776,7 @@ class SmartSessionService {
|
|
|
776
776
|
handleSessionError(sessionError) {
|
|
777
777
|
return __awaiter(this, void 0, void 0, function* () {
|
|
778
778
|
if (this.sessionHandlerService) {
|
|
779
|
-
yield this.sessionHandlerService.handleSessionError(sessionError);
|
|
779
|
+
return yield this.sessionHandlerService.handleSessionError(sessionError);
|
|
780
780
|
}
|
|
781
781
|
throw new Error(`sessionHandlerService was not initialized. Error: ${sessionError.code}`);
|
|
782
782
|
});
|
|
@@ -875,11 +875,7 @@ class SmartSessionService {
|
|
|
875
875
|
return __awaiter(this, void 0, void 0, function* () {
|
|
876
876
|
let sessionInfo = yield this.apiService.startSession().toPromise();
|
|
877
877
|
if (sessionInfo) {
|
|
878
|
-
this.
|
|
879
|
-
this.token = sessionInfo.sid;
|
|
880
|
-
this.saveTokenToLocalStorage();
|
|
881
|
-
this.setAuthenticationStatus();
|
|
882
|
-
this.setUpTokenForSessionService();
|
|
878
|
+
this.updateSessionInfo(sessionInfo);
|
|
883
879
|
}
|
|
884
880
|
return this.sessionInfoData;
|
|
885
881
|
});
|
|
@@ -902,28 +898,36 @@ class SmartSessionService {
|
|
|
902
898
|
if (!refreshToken) {
|
|
903
899
|
return yield this.startSession();
|
|
904
900
|
}
|
|
905
|
-
|
|
906
|
-
.refreshSession({
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
.catch((error) => __awaiter(this, void 0, void 0, function* () {
|
|
911
|
-
if (error.error &&
|
|
912
|
-
error.error.code &&
|
|
913
|
-
error.error.code === 'session.refreshtoken.invalid') {
|
|
914
|
-
yield this.startSession();
|
|
901
|
+
try {
|
|
902
|
+
const sessionInfo = yield lastValueFrom(this.apiService.refreshSession({ refreshToken }));
|
|
903
|
+
if (sessionInfo) {
|
|
904
|
+
this.updateSessionInfo(sessionInfo);
|
|
905
|
+
return sessionInfo;
|
|
915
906
|
}
|
|
916
|
-
}));
|
|
917
|
-
if (sessionInfo) {
|
|
918
|
-
this.sessionInfoData = sessionInfo;
|
|
919
|
-
this.token = sessionInfo.sid;
|
|
920
|
-
this.saveTokenToLocalStorage();
|
|
921
|
-
this.setAuthenticationStatus();
|
|
922
|
-
this.setUpTokenForSessionService();
|
|
923
907
|
}
|
|
924
|
-
|
|
908
|
+
catch (error) {
|
|
909
|
+
if (this.isInvalidRefreshTokenError(error)) {
|
|
910
|
+
this.clearAndStartNewSession();
|
|
911
|
+
// still throw the error, so the error can be handled in the caller
|
|
912
|
+
}
|
|
913
|
+
throw error;
|
|
914
|
+
}
|
|
915
|
+
// no sessionInfo returned
|
|
916
|
+
throw new Error('Unable to refresh session');
|
|
925
917
|
});
|
|
926
918
|
}
|
|
919
|
+
updateSessionInfo(sessionInfo) {
|
|
920
|
+
this.sessionInfoData = sessionInfo;
|
|
921
|
+
this.token = sessionInfo.sid;
|
|
922
|
+
this.saveTokenToLocalStorage();
|
|
923
|
+
this.setAuthenticationStatus();
|
|
924
|
+
this.setUpTokenForSessionService();
|
|
925
|
+
}
|
|
926
|
+
isInvalidRefreshTokenError(error) {
|
|
927
|
+
return (error instanceof HttpErrorResponse &&
|
|
928
|
+
error.error &&
|
|
929
|
+
error.error.code === 'session.refreshtoken.invalid');
|
|
930
|
+
}
|
|
927
931
|
getAuthenticationProviders() {
|
|
928
932
|
return __awaiter(this, void 0, void 0, function* () {
|
|
929
933
|
let providers = yield this.apiService
|
|
@@ -9095,10 +9099,19 @@ class SmartErrorCatchingInterceptor {
|
|
|
9095
9099
|
const sessionError = this.getSessionError(error);
|
|
9096
9100
|
if (sessionError) {
|
|
9097
9101
|
return this.resolveError(sessionError).pipe(switchMap((resolved) => {
|
|
9098
|
-
if (resolved && sessionError.behaviour
|
|
9102
|
+
if (resolved && sessionError.behaviour === SessionErrorBehaviour.REFRESH) {
|
|
9099
9103
|
return next.handle(this.updateRequestHeaders(request));
|
|
9100
9104
|
}
|
|
9101
9105
|
return throwError(() => error);
|
|
9106
|
+
}), catchError$1((resolveError) => {
|
|
9107
|
+
// when the resolveError throws a restart error (in the refreshSession), rethrow the original error
|
|
9108
|
+
if (this.isSessionError(resolveError)) {
|
|
9109
|
+
const resolveSessionError = this.getSessionError(resolveError);
|
|
9110
|
+
if ((resolveSessionError === null || resolveSessionError === void 0 ? void 0 : resolveSessionError.behaviour) === SessionErrorBehaviour.RESTART) {
|
|
9111
|
+
return throwError(() => error);
|
|
9112
|
+
}
|
|
9113
|
+
}
|
|
9114
|
+
return throwError(() => resolveError);
|
|
9102
9115
|
}));
|
|
9103
9116
|
}
|
|
9104
9117
|
}
|