@indigina/kendo 1.0.145-beta → 1.0.164-beta
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/bundles/indigina-kendo.umd.js +47 -33
- package/bundles/indigina-kendo.umd.js.map +1 -1
- package/bundles/indigina-kendo.umd.min.js +1 -1
- package/bundles/indigina-kendo.umd.min.js.map +1 -1
- package/esm2015/lib/angular/services/http.service.js +15 -6
- package/esm2015/lib/components/azure-login-callback/azure-login-callback.component.js +11 -6
- package/fesm2015/indigina-kendo.js +44 -30
- package/fesm2015/indigina-kendo.js.map +1 -1
- package/indigina-kendo.metadata.json +1 -1
- package/lib/angular/services/http.service.d.ts +3 -3
- package/package.json +1 -1
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { HttpClient } from '@angular/common/http';
|
|
2
|
-
import { catchError, tap } from 'rxjs/operators';
|
|
3
|
-
import { of, throwError } from 'rxjs';
|
|
4
2
|
import { Injectable } from '@angular/core';
|
|
5
|
-
import { AppToastrService } from './toastr.service';
|
|
6
3
|
import { Router } from '@angular/router';
|
|
7
|
-
import { SettingsService } from './settings.service';
|
|
8
4
|
import { TranslateService } from '@ngx-translate/core';
|
|
5
|
+
import { of, throwError } from 'rxjs';
|
|
6
|
+
import { catchError, tap } from 'rxjs/operators';
|
|
9
7
|
import { AppSettings } from '../models/AppSettings';
|
|
10
8
|
import { HttpCodes } from '../models/HttpCodes';
|
|
9
|
+
import { SettingsService } from './settings.service';
|
|
10
|
+
import { AppToastrService } from './toastr.service';
|
|
11
11
|
import * as i0 from "@angular/core";
|
|
12
12
|
import * as i1 from "./toastr.service";
|
|
13
13
|
import * as i2 from "@angular/common/http";
|
|
@@ -15,6 +15,8 @@ import * as i3 from "../models/AppSettings";
|
|
|
15
15
|
import * as i4 from "@ngx-translate/core";
|
|
16
16
|
import * as i5 from "@angular/router";
|
|
17
17
|
import * as i6 from "./settings.service";
|
|
18
|
+
const absoluteUrlRegExp = /^http(s)?:\/\//;
|
|
19
|
+
const slash = '/';
|
|
18
20
|
export class HttpService {
|
|
19
21
|
constructor(appToastrService, httpClient, appSettings, translate, router, settingsService) {
|
|
20
22
|
this.appToastrService = appToastrService;
|
|
@@ -39,7 +41,14 @@ export class HttpService {
|
|
|
39
41
|
return this.httpClient.put(this.createUrl(path), data).pipe(tap(() => this.showSuccessMessage(successTranslateMessage !== null && successTranslateMessage !== void 0 ? successTranslateMessage : 'ToastrMessages.SavedSuccessfully')), catchError((err) => this.handleServerError(err)));
|
|
40
42
|
}
|
|
41
43
|
createUrl(path) {
|
|
42
|
-
|
|
44
|
+
if (absoluteUrlRegExp.test(path)) {
|
|
45
|
+
return path;
|
|
46
|
+
}
|
|
47
|
+
path = path.startsWith(slash) ? path.slice(1) : path;
|
|
48
|
+
const apiUrl = this.appSettings.apiUrl.endsWith(slash)
|
|
49
|
+
? this.appSettings.apiUrl
|
|
50
|
+
: this.appSettings.apiUrl + slash;
|
|
51
|
+
return apiUrl + path;
|
|
43
52
|
}
|
|
44
53
|
handleServerError(error) {
|
|
45
54
|
if (error.error instanceof ErrorEvent) {
|
|
@@ -90,4 +99,4 @@ HttpService.ctorParameters = () => [
|
|
|
90
99
|
{ type: Router },
|
|
91
100
|
{ type: SettingsService }
|
|
92
101
|
];
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http.service.js","sourceRoot":"","sources":["../../../../../../projects/kendo/src/lib/angular/services/http.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\nimport { catchError, tap } from 'rxjs/operators';\nimport { of, Observable, throwError } from 'rxjs';\nimport { Injectable } from '@angular/core';\nimport { AppToastrService } from './toastr.service';\nimport { Router } from '@angular/router';\nimport { SettingsService } from './settings.service';\nimport { CustomHttpErrorResponse } from '../models/CustomHttpErrorResponse';\nimport { TranslateService } from '@ngx-translate/core';\nimport { AppSettings } from '../models/AppSettings';\nimport { HttpCodes } from '../models/HttpCodes';\n\n@Injectable({ providedIn: 'root' })\nexport class HttpService {\n  constructor(\n    private appToastrService: AppToastrService,\n    private httpClient: HttpClient,\n    private appSettings: AppSettings,\n    private translate: TranslateService,\n    private router: Router,\n    private settingsService: SettingsService\n  ) {}\n\n  get<T>(path: string): Observable<T> {\n    return this.httpClient\n      .get<T>(this.createUrl(path))\n      .pipe(\n        catchError((err: CustomHttpErrorResponse) =>\n          this.handleServerError(err)\n        )\n      );\n  }\n\n  delete(path: string): Observable<object> {\n    return this.httpClient.delete(this.createUrl(path)).pipe(\n      tap(() => this.showSuccessMessage('ToastrMessages.RemovedSuccessfully')),\n      catchError((err: CustomHttpErrorResponse) => this.handleServerError(err))\n    );\n  }\n\n  post<T>(\n    path: string,\n    data: T,\n    successTranslateMessage: string = null\n  ): Observable<T> {\n    return this.httpClient.post<T>(this.createUrl(path), data).pipe(\n      tap(() =>\n        this.showSuccessMessage(\n          successTranslateMessage ?? 'ToastrMessages.SavedSuccessfully'\n        )\n      ),\n      catchError((err) => this.handleServerError(err))\n    );\n  }\n\n  put<T>(\n    path: string,\n    data: T,\n    successTranslateMessage: string = null\n  ): Observable<T> {\n    return this.httpClient.put<T>(this.createUrl(path), data).pipe(\n      tap(() =>\n        this.showSuccessMessage(\n          successTranslateMessage ?? 'ToastrMessages.SavedSuccessfully'\n        )\n      ),\n      catchError((err) => this.handleServerError(err))\n    );\n  }\n\n  private createUrl(path: string): string {\n    return this.appSettings.apiUrl + path;\n  }\n\n  private handleServerError(error: CustomHttpErrorResponse) {\n    if (error.error instanceof ErrorEvent) {\n      // A client-side or network error occurred. Handle it accordingly.\n      this.appToastrService.showError(\n        'An error occurred: ' + error.error.message\n      );\n\n      return of(null);\n    }\n\n    if (error.status === HttpCodes.Unauthorized) {\n      this.settingsService.putCurrentCallbackPath();\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.Unauthorized')\n      );\n\n      return of(null);\n    }\n\n    if (error.status === HttpCodes.Forbidden) {\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.Forbidden')\n      );\n      this.router.navigate(['forbidden']);\n\n      return of(null);\n    }\n\n    if (error.status === HttpCodes.NotFound) {\n      if (!!this.settingsService.getLoginAsUser()) {\n        this.settingsService.clearLoginAsUser();\n        this.appToastrService.showError(\n          this.translate.instant('ToastrMessages.CanNotLoginAsUser')\n        );\n        setTimeout(() => {\n          window.location.href = '/';\n        }, 1000);\n      }\n\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.NotFound')\n      );\n\n      return of(null);\n    }\n\n    if (error.status >= HttpCodes.InternalServerError) {\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.ServerError') + error.error.title\n      );\n\n      return of(null);\n    }\n\n    return throwError(error);\n  }\n\n  private showSuccessMessage(message: string) {\n    this.appToastrService.showSuccess(this.translate.instant(message));\n  }\n}\n"]}
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http.service.js","sourceRoot":"","sources":["../../../../../../projects/kendo/src/lib/angular/services/http.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { Observable, of, throwError } from 'rxjs';\nimport { catchError, tap } from 'rxjs/operators';\nimport { AppSettings } from '../models/AppSettings';\nimport { CustomHttpErrorResponse } from '../models/CustomHttpErrorResponse';\nimport { HttpCodes } from '../models/HttpCodes';\nimport { SettingsService } from './settings.service';\nimport { AppToastrService } from './toastr.service';\n\nconst absoluteUrlRegExp = /^http(s)?:\\/\\//;\nconst slash = '/';\n\n@Injectable({ providedIn: 'root' })\nexport class HttpService {\n  constructor(\n    private appToastrService: AppToastrService,\n    private httpClient: HttpClient,\n    private appSettings: AppSettings,\n    private translate: TranslateService,\n    private router: Router,\n    private settingsService: SettingsService\n  ) {}\n\n  get<T>(path: string): Observable<T> {\n    return this.httpClient\n      .get<T>(this.createUrl(path))\n      .pipe(\n        catchError((err: CustomHttpErrorResponse) =>\n          this.handleServerError(err)\n        )\n      );\n  }\n\n  delete(path: string): Observable<object> {\n    return this.httpClient.delete(this.createUrl(path)).pipe(\n      tap(() => this.showSuccessMessage('ToastrMessages.RemovedSuccessfully')),\n      catchError((err: CustomHttpErrorResponse) => this.handleServerError(err))\n    );\n  }\n\n  post<T>(\n    path: string,\n    data: T,\n    successTranslateMessage: string = null\n  ): Observable<T> {\n    return this.httpClient.post<T>(this.createUrl(path), data).pipe(\n      tap(() =>\n        this.showSuccessMessage(\n          successTranslateMessage ?? 'ToastrMessages.SavedSuccessfully'\n        )\n      ),\n      catchError((err) => this.handleServerError(err))\n    );\n  }\n\n  put<T>(\n    path: string,\n    data: T,\n    successTranslateMessage: string = null\n  ): Observable<T> {\n    return this.httpClient.put<T>(this.createUrl(path), data).pipe(\n      tap(() =>\n        this.showSuccessMessage(\n          successTranslateMessage ?? 'ToastrMessages.SavedSuccessfully'\n        )\n      ),\n      catchError((err) => this.handleServerError(err))\n    );\n  }\n\n  private createUrl(path: string): string {\n    if (absoluteUrlRegExp.test(path)) {\n      return path;\n    }\n\n    path = path.startsWith(slash) ? path.slice(1) : path;\n    const apiUrl = this.appSettings.apiUrl.endsWith(slash)\n      ? this.appSettings.apiUrl\n      : this.appSettings.apiUrl + slash;\n\n    return apiUrl + path;\n  }\n\n  private handleServerError(error: CustomHttpErrorResponse) {\n    if (error.error instanceof ErrorEvent) {\n      // A client-side or network error occurred. Handle it accordingly.\n      this.appToastrService.showError(\n        'An error occurred: ' + error.error.message\n      );\n\n      return of(null);\n    }\n\n    if (error.status === HttpCodes.Unauthorized) {\n      this.settingsService.putCurrentCallbackPath();\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.Unauthorized')\n      );\n\n      return of(null);\n    }\n\n    if (error.status === HttpCodes.Forbidden) {\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.Forbidden')\n      );\n      this.router.navigate(['forbidden']);\n\n      return of(null);\n    }\n\n    if (error.status === HttpCodes.NotFound) {\n      if (!!this.settingsService.getLoginAsUser()) {\n        this.settingsService.clearLoginAsUser();\n        this.appToastrService.showError(\n          this.translate.instant('ToastrMessages.CanNotLoginAsUser')\n        );\n        setTimeout(() => {\n          window.location.href = '/';\n        }, 1000);\n      }\n\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.NotFound')\n      );\n\n      return of(null);\n    }\n\n    if (error.status >= HttpCodes.InternalServerError) {\n      this.appToastrService.showError(\n        this.translate.instant('ToastrMessages.ServerError') + error.error.title\n      );\n\n      return of(null);\n    }\n\n    return throwError(error);\n  }\n\n  private showSuccessMessage(message: string) {\n    this.appToastrService.showSuccess(this.translate.instant(message));\n  }\n}\n"]}
|
|
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
|
|
|
2
2
|
import { Router } from '@angular/router';
|
|
3
3
|
import { MsalService } from '@azure/msal-angular';
|
|
4
4
|
import { SettingsService } from '../../angular/services/settings.service';
|
|
5
|
+
const resetPasswordCanceledErrorCode = 'AADB2C90091';
|
|
5
6
|
export class AzureLoginCallbackComponent {
|
|
6
7
|
constructor(authService, settingsService, router) {
|
|
7
8
|
this.authService = authService;
|
|
@@ -9,12 +10,16 @@ export class AzureLoginCallbackComponent {
|
|
|
9
10
|
this.router = router;
|
|
10
11
|
}
|
|
11
12
|
ngOnInit() {
|
|
12
|
-
this.authService
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
this.authService.handleRedirectObservable().subscribe((result) => {
|
|
14
|
+
if (result) {
|
|
15
|
+
this.settingsService.setToken(result.idToken);
|
|
16
|
+
this.authService.instance.setActiveAccount(result.account);
|
|
17
|
+
}
|
|
17
18
|
this.router.navigate(['home']);
|
|
19
|
+
}, (error) => {
|
|
20
|
+
if (error.errorMessage.includes(resetPasswordCanceledErrorCode)) {
|
|
21
|
+
this.router.navigate(['home']);
|
|
22
|
+
}
|
|
18
23
|
});
|
|
19
24
|
}
|
|
20
25
|
logout() {
|
|
@@ -32,4 +37,4 @@ AzureLoginCallbackComponent.ctorParameters = () => [
|
|
|
32
37
|
{ type: SettingsService },
|
|
33
38
|
{ type: Router }
|
|
34
39
|
];
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp1cmUtbG9naW4tY2FsbGJhY2suY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMva2VuZG8vc3JjL2xpYi9jb21wb25lbnRzL2F6dXJlLWxvZ2luLWNhbGxiYWNrL2F6dXJlLWxvZ2luLWNhbGxiYWNrLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBRTFFLE1BQU0sOEJBQThCLEdBQUcsYUFBYSxDQUFDO0FBTXJELE1BQU0sT0FBTywyQkFBMkI7SUFDdEMsWUFDVSxXQUF3QixFQUN4QixlQUFnQyxFQUNoQyxNQUFjO1FBRmQsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFDeEIsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQ2hDLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDckIsQ0FBQztJQUVKLFFBQVE7UUFDTixJQUFJLENBQUMsV0FBVyxDQUFDLHdCQUF3QixFQUFFLENBQUMsU0FBUyxDQUNuRCxDQUFDLE1BQTRCLEVBQUUsRUFBRTtZQUMvQixJQUFJLE1BQU0sRUFBRTtnQkFDVixJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQzlDLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUM1RDtZQUVELElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNqQyxDQUFDLEVBQ0QsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNSLElBQUksS0FBSyxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsOEJBQThCLENBQUMsRUFBRTtnQkFDL0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO2FBQ2hDO1FBQ0gsQ0FBQyxDQUNGLENBQUM7SUFDSixDQUFDO0lBRU0sTUFBTTtRQUNYLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDNUIsQ0FBQzs7O1lBL0JGLFNBQVMsU0FBQztnQkFDVCxRQUFRLEVBQUUsaUJBQWlCO2dCQUMzQixRQUFRLEVBQUUsRUFBRTthQUNiOzs7WUFUUSxXQUFXO1lBRVgsZUFBZTtZQUhmLE1BQU0iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21wb25lbnQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBNc2FsU2VydmljZSB9IGZyb20gJ0BhenVyZS9tc2FsLWFuZ3VsYXInO1xuaW1wb3J0IHsgQXV0aGVudGljYXRpb25SZXN1bHQgfSBmcm9tICdAYXp1cmUvbXNhbC1icm93c2VyJztcbmltcG9ydCB7IFNldHRpbmdzU2VydmljZSB9IGZyb20gJy4uLy4uL2FuZ3VsYXIvc2VydmljZXMvc2V0dGluZ3Muc2VydmljZSc7XG5cbmNvbnN0IHJlc2V0UGFzc3dvcmRDYW5jZWxlZEVycm9yQ29kZSA9ICdBQURCMkM5MDA5MSc7XG5cbkBDb21wb25lbnQoe1xuICBzZWxlY3RvcjogJ2xpYi1henVyZS1sb2dpbicsXG4gIHRlbXBsYXRlOiAnJyxcbn0pXG5leHBvcnQgY2xhc3MgQXp1cmVMb2dpbkNhbGxiYWNrQ29tcG9uZW50IHtcbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBhdXRoU2VydmljZTogTXNhbFNlcnZpY2UsXG4gICAgcHJpdmF0ZSBzZXR0aW5nc1NlcnZpY2U6IFNldHRpbmdzU2VydmljZSxcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyXG4gICkge31cblxuICBuZ09uSW5pdCgpIHtcbiAgICB0aGlzLmF1dGhTZXJ2aWNlLmhhbmRsZVJlZGlyZWN0T2JzZXJ2YWJsZSgpLnN1YnNjcmliZShcbiAgICAgIChyZXN1bHQ6IEF1dGhlbnRpY2F0aW9uUmVzdWx0KSA9PiB7XG4gICAgICAgIGlmIChyZXN1bHQpIHtcbiAgICAgICAgICB0aGlzLnNldHRpbmdzU2VydmljZS5zZXRUb2tlbihyZXN1bHQuaWRUb2tlbik7XG4gICAgICAgICAgdGhpcy5hdXRoU2VydmljZS5pbnN0YW5jZS5zZXRBY3RpdmVBY2NvdW50KHJlc3VsdC5hY2NvdW50KTtcbiAgICAgICAgfVxuXG4gICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFsnaG9tZSddKTtcbiAgICAgIH0sXG4gICAgICAoZXJyb3IpID0+IHtcbiAgICAgICAgaWYgKGVycm9yLmVycm9yTWVzc2FnZS5pbmNsdWRlcyhyZXNldFBhc3N3b3JkQ2FuY2VsZWRFcnJvckNvZGUpKSB7XG4gICAgICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUoWydob21lJ10pO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgKTtcbiAgfVxuXG4gIHB1YmxpYyBsb2dvdXQoKSB7XG4gICAgdGhpcy5hdXRoU2VydmljZS5sb2dvdXQoKTtcbiAgfVxufVxuIl19
|
|
@@ -1110,30 +1110,6 @@ const HttpMethods = [
|
|
|
1110
1110
|
{ name: 'DELETE', id: 'DELETE' },
|
|
1111
1111
|
];
|
|
1112
1112
|
|
|
1113
|
-
class AppToastrService {
|
|
1114
|
-
constructor(toastr, appSettings) {
|
|
1115
|
-
this.toastr = toastr;
|
|
1116
|
-
this.appSettings = appSettings;
|
|
1117
|
-
this.timeout = this.appSettings.toastrTimeOut;
|
|
1118
|
-
}
|
|
1119
|
-
showError(message, title = 'Error') {
|
|
1120
|
-
this.toastr.error(message, title, { timeOut: this.timeout });
|
|
1121
|
-
}
|
|
1122
|
-
showSuccess(message, title = '') {
|
|
1123
|
-
this.toastr.success(message, title, { timeOut: this.timeout });
|
|
1124
|
-
}
|
|
1125
|
-
}
|
|
1126
|
-
AppToastrService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AppToastrService_Factory() { return new AppToastrService(i0.ɵɵinject(i1$1.ToastrService), i0.ɵɵinject(AppSettings)); }, token: AppToastrService, providedIn: "root" });
|
|
1127
|
-
AppToastrService.decorators = [
|
|
1128
|
-
{ type: Injectable, args: [{
|
|
1129
|
-
providedIn: 'root',
|
|
1130
|
-
},] }
|
|
1131
|
-
];
|
|
1132
|
-
AppToastrService.ctorParameters = () => [
|
|
1133
|
-
{ type: ToastrService },
|
|
1134
|
-
{ type: AppSettings }
|
|
1135
|
-
];
|
|
1136
|
-
|
|
1137
1113
|
const callbackPathKey = 'callbackPath';
|
|
1138
1114
|
const homePath$1 = '/home';
|
|
1139
1115
|
const loginAsKey = 'X-User-Id';
|
|
@@ -1174,6 +1150,32 @@ SettingsService.decorators = [
|
|
|
1174
1150
|
{ type: Injectable, args: [{ providedIn: 'root' },] }
|
|
1175
1151
|
];
|
|
1176
1152
|
|
|
1153
|
+
class AppToastrService {
|
|
1154
|
+
constructor(toastr, appSettings) {
|
|
1155
|
+
this.toastr = toastr;
|
|
1156
|
+
this.appSettings = appSettings;
|
|
1157
|
+
this.timeout = this.appSettings.toastrTimeOut;
|
|
1158
|
+
}
|
|
1159
|
+
showError(message, title = 'Error') {
|
|
1160
|
+
this.toastr.error(message, title, { timeOut: this.timeout });
|
|
1161
|
+
}
|
|
1162
|
+
showSuccess(message, title = '') {
|
|
1163
|
+
this.toastr.success(message, title, { timeOut: this.timeout });
|
|
1164
|
+
}
|
|
1165
|
+
}
|
|
1166
|
+
AppToastrService.ɵprov = i0.ɵɵdefineInjectable({ factory: function AppToastrService_Factory() { return new AppToastrService(i0.ɵɵinject(i1$1.ToastrService), i0.ɵɵinject(AppSettings)); }, token: AppToastrService, providedIn: "root" });
|
|
1167
|
+
AppToastrService.decorators = [
|
|
1168
|
+
{ type: Injectable, args: [{
|
|
1169
|
+
providedIn: 'root',
|
|
1170
|
+
},] }
|
|
1171
|
+
];
|
|
1172
|
+
AppToastrService.ctorParameters = () => [
|
|
1173
|
+
{ type: ToastrService },
|
|
1174
|
+
{ type: AppSettings }
|
|
1175
|
+
];
|
|
1176
|
+
|
|
1177
|
+
const absoluteUrlRegExp = /^http(s)?:\/\//;
|
|
1178
|
+
const slash = '/';
|
|
1177
1179
|
class HttpService {
|
|
1178
1180
|
constructor(appToastrService, httpClient, appSettings, translate, router, settingsService) {
|
|
1179
1181
|
this.appToastrService = appToastrService;
|
|
@@ -1198,7 +1200,14 @@ class HttpService {
|
|
|
1198
1200
|
return this.httpClient.put(this.createUrl(path), data).pipe(tap(() => this.showSuccessMessage(successTranslateMessage !== null && successTranslateMessage !== void 0 ? successTranslateMessage : 'ToastrMessages.SavedSuccessfully')), catchError((err) => this.handleServerError(err)));
|
|
1199
1201
|
}
|
|
1200
1202
|
createUrl(path) {
|
|
1201
|
-
|
|
1203
|
+
if (absoluteUrlRegExp.test(path)) {
|
|
1204
|
+
return path;
|
|
1205
|
+
}
|
|
1206
|
+
path = path.startsWith(slash) ? path.slice(1) : path;
|
|
1207
|
+
const apiUrl = this.appSettings.apiUrl.endsWith(slash)
|
|
1208
|
+
? this.appSettings.apiUrl
|
|
1209
|
+
: this.appSettings.apiUrl + slash;
|
|
1210
|
+
return apiUrl + path;
|
|
1202
1211
|
}
|
|
1203
1212
|
handleServerError(error) {
|
|
1204
1213
|
if (error.error instanceof ErrorEvent) {
|
|
@@ -1527,6 +1536,7 @@ AccountMenuComponent.propDecorators = {
|
|
|
1527
1536
|
clickedOutside: [{ type: HostListener, args: ['document:click', ['$event'],] }]
|
|
1528
1537
|
};
|
|
1529
1538
|
|
|
1539
|
+
const resetPasswordCanceledErrorCode = 'AADB2C90091';
|
|
1530
1540
|
class AzureLoginCallbackComponent {
|
|
1531
1541
|
constructor(authService, settingsService, router) {
|
|
1532
1542
|
this.authService = authService;
|
|
@@ -1534,12 +1544,16 @@ class AzureLoginCallbackComponent {
|
|
|
1534
1544
|
this.router = router;
|
|
1535
1545
|
}
|
|
1536
1546
|
ngOnInit() {
|
|
1537
|
-
this.authService
|
|
1538
|
-
|
|
1539
|
-
|
|
1540
|
-
|
|
1541
|
-
|
|
1547
|
+
this.authService.handleRedirectObservable().subscribe((result) => {
|
|
1548
|
+
if (result) {
|
|
1549
|
+
this.settingsService.setToken(result.idToken);
|
|
1550
|
+
this.authService.instance.setActiveAccount(result.account);
|
|
1551
|
+
}
|
|
1542
1552
|
this.router.navigate(['home']);
|
|
1553
|
+
}, (error) => {
|
|
1554
|
+
if (error.errorMessage.includes(resetPasswordCanceledErrorCode)) {
|
|
1555
|
+
this.router.navigate(['home']);
|
|
1556
|
+
}
|
|
1543
1557
|
});
|
|
1544
1558
|
}
|
|
1545
1559
|
logout() {
|