@unipin/angular-applet 17.2.1 → 17.2.2
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.
|
@@ -2,29 +2,17 @@ import { Injectable } from '@angular/core';
|
|
|
2
2
|
import { catchError, switchMap, throwError } from 'rxjs';
|
|
3
3
|
import { AuthService } from '../../services';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
|
-
import * as i1 from "@
|
|
5
|
+
import * as i1 from "@angular/router";
|
|
6
6
|
import * as i2 from "../../services";
|
|
7
7
|
export class RefreshTokenInterceptor {
|
|
8
|
-
constructor(
|
|
9
|
-
this.
|
|
8
|
+
constructor(router, authService) {
|
|
9
|
+
this.router = router;
|
|
10
10
|
this.authService = authService;
|
|
11
|
-
this.isRefresh = false;
|
|
12
11
|
}
|
|
13
12
|
intercept(request, next) {
|
|
14
13
|
return next.handle(request).pipe(catchError(({ error: { errors } }) => {
|
|
15
|
-
if (errors[0].extensions.code === 'UNAUTHORIZED'
|
|
16
|
-
this.isRefresh = false;
|
|
17
|
-
localStorage.clear();
|
|
18
|
-
AuthService.authToken = '';
|
|
19
|
-
AuthService.refreshToken = '';
|
|
20
|
-
this.authService.user = undefined;
|
|
21
|
-
this.navCtrl.navigateRoot('auth');
|
|
22
|
-
return throwError(() => errors[0]);
|
|
23
|
-
}
|
|
24
|
-
else if (errors[0].extensions.code === 'UNAUTHORIZED' && errors[0].message.includes('Token') && !this.isRefresh) {
|
|
25
|
-
this.isRefresh = true;
|
|
14
|
+
if (errors[0].extensions.code === 'UNAUTHORIZED') {
|
|
26
15
|
return this.authService.refreshToken({ refreshToken: AuthService.refreshToken }).pipe(switchMap(({ data }) => {
|
|
27
|
-
this.isRefresh = false;
|
|
28
16
|
const { accessToken, refreshToken } = data.authMsRefreshAccessToken;
|
|
29
17
|
AuthService.authToken = accessToken;
|
|
30
18
|
AuthService.refreshToken = refreshToken;
|
|
@@ -32,19 +20,25 @@ export class RefreshTokenInterceptor {
|
|
|
32
20
|
localStorage.setItem('refreshToken', refreshToken);
|
|
33
21
|
return next.handle(request.clone({
|
|
34
22
|
setHeaders: {
|
|
35
|
-
authorization: accessToken
|
|
36
|
-
project: 'unipin'
|
|
23
|
+
authorization: accessToken
|
|
37
24
|
}
|
|
38
25
|
}));
|
|
26
|
+
}), catchError(() => {
|
|
27
|
+
localStorage.clear();
|
|
28
|
+
AuthService.authToken = '';
|
|
29
|
+
AuthService.refreshToken = '';
|
|
30
|
+
this.authService.user = undefined;
|
|
31
|
+
this.router.navigateByUrl('auth');
|
|
32
|
+
return throwError(() => errors[0]);
|
|
39
33
|
}));
|
|
40
34
|
}
|
|
41
35
|
return throwError(() => errors[0]);
|
|
42
36
|
}));
|
|
43
37
|
}
|
|
44
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor, deps: [{ token: i1.
|
|
38
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor, deps: [{ token: i1.Router }, { token: i2.AuthService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
45
39
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor }); }
|
|
46
40
|
}
|
|
47
41
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor, decorators: [{
|
|
48
42
|
type: Injectable
|
|
49
|
-
}], ctorParameters: () => [{ type: i1.
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
}], ctorParameters: () => [{ type: i1.Router }, { type: i2.AuthService }] });
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVmcmVzaC10b2tlbi5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3VuaXBpbi1hbmd1bGFyL3NyYy9saWIvaW50ZXJjZXB0b3JzL3JlZnJlc2gtdG9rZW4vcmVmcmVzaC10b2tlbi5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRzNDLE9BQU8sRUFBRSxVQUFVLEVBQWMsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNyRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7QUFHN0MsTUFBTSxPQUFPLHVCQUF1QjtJQUVsQyxZQUNxQixNQUFjLEVBQ2QsV0FBd0I7UUFEeEIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUNkLGdCQUFXLEdBQVgsV0FBVyxDQUFhO0lBQ3pDLENBQUM7SUFFRSxTQUFTLENBQUMsT0FBeUIsRUFBRSxJQUFpQjtRQUMzRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUM5QixVQUFVLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRTtZQUNuQyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxLQUFLLGNBQWMsRUFBRSxDQUFDO2dCQUNqRCxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLEVBQUUsWUFBWSxFQUFFLFdBQVcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDbkYsU0FBUyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFO29CQUNyQixNQUFNLEVBQUUsV0FBVyxFQUFFLFlBQVksRUFBRSxHQUFHLElBQUssQ0FBQyx3QkFBd0IsQ0FBQztvQkFFckUsV0FBVyxDQUFDLFNBQVMsR0FBRyxXQUFZLENBQUM7b0JBQ3JDLFdBQVcsQ0FBQyxZQUFZLEdBQUcsWUFBYSxDQUFDO29CQUV6QyxZQUFZLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxXQUFZLENBQUMsQ0FBQztvQkFDaEQsWUFBWSxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsWUFBYSxDQUFDLENBQUM7b0JBRXBELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO3dCQUMvQixVQUFVLEVBQUU7NEJBQ1YsYUFBYSxFQUFFLFdBQVk7eUJBQzVCO3FCQUNGLENBQUMsQ0FBQyxDQUFDO2dCQUNOLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxHQUFHLEVBQUU7b0JBQ2QsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO29CQUNyQixXQUFXLENBQUMsU0FBUyxHQUFHLEVBQUUsQ0FBQztvQkFDM0IsV0FBVyxDQUFDLFlBQVksR0FBRyxFQUFFLENBQUM7b0JBQzlCLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxHQUFHLFNBQVMsQ0FBQztvQkFFbEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQ2xDLE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNyQyxDQUFDLENBQUMsQ0FDSCxDQUFDO1lBQ0osQ0FBQztZQUVELE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3JDLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOzhHQTFDVSx1QkFBdUI7a0hBQXZCLHVCQUF1Qjs7MkZBQXZCLHVCQUF1QjtrQkFEbkMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3QgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgT2JzZXJ2YWJsZSwgc3dpdGNoTWFwLCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBBdXRoU2VydmljZSB9IGZyb20gJy4uLy4uL3NlcnZpY2VzJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFJlZnJlc2hUb2tlbkludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcm90ZWN0ZWQgcmVhZG9ubHkgcm91dGVyOiBSb3V0ZXIsXG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZVxuICApIHsgfVxuXG4gIHB1YmxpYyBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PntcbiAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCkucGlwZShcbiAgICAgIGNhdGNoRXJyb3IoKHsgZXJyb3I6IHsgZXJyb3JzIH0gfSkgPT4ge1xuICAgICAgICBpZiAoZXJyb3JzWzBdLmV4dGVuc2lvbnMuY29kZSA9PT0gJ1VOQVVUSE9SSVpFRCcpIHtcbiAgICAgICAgICByZXR1cm4gdGhpcy5hdXRoU2VydmljZS5yZWZyZXNoVG9rZW4oeyByZWZyZXNoVG9rZW46IEF1dGhTZXJ2aWNlLnJlZnJlc2hUb2tlbiB9KS5waXBlKFxuICAgICAgICAgICAgc3dpdGNoTWFwKCh7IGRhdGEgfSkgPT4ge1xuICAgICAgICAgICAgICBjb25zdCB7IGFjY2Vzc1Rva2VuLCByZWZyZXNoVG9rZW4gfSA9IGRhdGEhLmF1dGhNc1JlZnJlc2hBY2Nlc3NUb2tlbjtcblxuICAgICAgICAgICAgICBBdXRoU2VydmljZS5hdXRoVG9rZW4gPSBhY2Nlc3NUb2tlbiE7XG4gICAgICAgICAgICAgIEF1dGhTZXJ2aWNlLnJlZnJlc2hUb2tlbiA9IHJlZnJlc2hUb2tlbiE7XG5cbiAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oJ2F1dGhUb2tlbicsIGFjY2Vzc1Rva2VuISk7XG4gICAgICAgICAgICAgIGxvY2FsU3RvcmFnZS5zZXRJdGVtKCdyZWZyZXNoVG9rZW4nLCByZWZyZXNoVG9rZW4hKTtcblxuICAgICAgICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdC5jbG9uZSh7XG4gICAgICAgICAgICAgICAgc2V0SGVhZGVyczoge1xuICAgICAgICAgICAgICAgICAgYXV0aG9yaXphdGlvbjogYWNjZXNzVG9rZW4hXG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICB9KSk7XG4gICAgICAgICAgICB9KSxcbiAgICAgICAgICAgIGNhdGNoRXJyb3IoKCkgPT4ge1xuICAgICAgICAgICAgICBsb2NhbFN0b3JhZ2UuY2xlYXIoKTtcbiAgICAgICAgICAgICAgQXV0aFNlcnZpY2UuYXV0aFRva2VuID0gJyc7XG4gICAgICAgICAgICAgIEF1dGhTZXJ2aWNlLnJlZnJlc2hUb2tlbiA9ICcnO1xuICAgICAgICAgICAgICB0aGlzLmF1dGhTZXJ2aWNlLnVzZXIgPSB1bmRlZmluZWQ7XG5cbiAgICAgICAgICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGVCeVVybCgnYXV0aCcpO1xuICAgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigoKSA9PiBlcnJvcnNbMF0pO1xuICAgICAgICAgICAgfSlcbiAgICAgICAgICApO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoKCkgPT4gZXJyb3JzWzBdKTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxufVxuIl19
|
|
@@ -2936,26 +2936,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.1", ngImpor
|
|
|
2936
2936
|
}] });
|
|
2937
2937
|
|
|
2938
2938
|
class RefreshTokenInterceptor {
|
|
2939
|
-
constructor(
|
|
2940
|
-
this.
|
|
2939
|
+
constructor(router, authService) {
|
|
2940
|
+
this.router = router;
|
|
2941
2941
|
this.authService = authService;
|
|
2942
|
-
this.isRefresh = false;
|
|
2943
2942
|
}
|
|
2944
2943
|
intercept(request, next) {
|
|
2945
2944
|
return next.handle(request).pipe(catchError(({ error: { errors } }) => {
|
|
2946
|
-
if (errors[0].extensions.code === 'UNAUTHORIZED'
|
|
2947
|
-
this.isRefresh = false;
|
|
2948
|
-
localStorage.clear();
|
|
2949
|
-
AuthService.authToken = '';
|
|
2950
|
-
AuthService.refreshToken = '';
|
|
2951
|
-
this.authService.user = undefined;
|
|
2952
|
-
this.navCtrl.navigateRoot('auth');
|
|
2953
|
-
return throwError(() => errors[0]);
|
|
2954
|
-
}
|
|
2955
|
-
else if (errors[0].extensions.code === 'UNAUTHORIZED' && errors[0].message.includes('Token') && !this.isRefresh) {
|
|
2956
|
-
this.isRefresh = true;
|
|
2945
|
+
if (errors[0].extensions.code === 'UNAUTHORIZED') {
|
|
2957
2946
|
return this.authService.refreshToken({ refreshToken: AuthService.refreshToken }).pipe(switchMap(({ data }) => {
|
|
2958
|
-
this.isRefresh = false;
|
|
2959
2947
|
const { accessToken, refreshToken } = data.authMsRefreshAccessToken;
|
|
2960
2948
|
AuthService.authToken = accessToken;
|
|
2961
2949
|
AuthService.refreshToken = refreshToken;
|
|
@@ -2963,21 +2951,27 @@ class RefreshTokenInterceptor {
|
|
|
2963
2951
|
localStorage.setItem('refreshToken', refreshToken);
|
|
2964
2952
|
return next.handle(request.clone({
|
|
2965
2953
|
setHeaders: {
|
|
2966
|
-
authorization: accessToken
|
|
2967
|
-
project: 'unipin'
|
|
2954
|
+
authorization: accessToken
|
|
2968
2955
|
}
|
|
2969
2956
|
}));
|
|
2957
|
+
}), catchError(() => {
|
|
2958
|
+
localStorage.clear();
|
|
2959
|
+
AuthService.authToken = '';
|
|
2960
|
+
AuthService.refreshToken = '';
|
|
2961
|
+
this.authService.user = undefined;
|
|
2962
|
+
this.router.navigateByUrl('auth');
|
|
2963
|
+
return throwError(() => errors[0]);
|
|
2970
2964
|
}));
|
|
2971
2965
|
}
|
|
2972
2966
|
return throwError(() => errors[0]);
|
|
2973
2967
|
}));
|
|
2974
2968
|
}
|
|
2975
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor, deps: [{ token: i1.
|
|
2969
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor, deps: [{ token: i1$2.Router }, { token: AuthService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
2976
2970
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor }); }
|
|
2977
2971
|
}
|
|
2978
2972
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.1", ngImport: i0, type: RefreshTokenInterceptor, decorators: [{
|
|
2979
2973
|
type: Injectable
|
|
2980
|
-
}], ctorParameters: () => [{ type: i1.
|
|
2974
|
+
}], ctorParameters: () => [{ type: i1$2.Router }, { type: AuthService }] });
|
|
2981
2975
|
|
|
2982
2976
|
export { AppletContainerComponent, ApprovalDetailComponent, ApprovalListComponent, AuditDetailComponent, AuditListComponent, AuthGuard, AuthResolver, AuthService, ButtonGroupComponent, ButtonLoadingComponent, ColumnContainerComponent, ColumnHeaderContainerComponent, CountryService, CurrencyService, FilterComponent, FormDateComponent, FormImagePickerComponent, FormInputComponent, FormPasswordComponent, FormSearchableSelectComponent, FormSelectComponent, FormTextareaComponent, GridPaginationComponent, GridService, GridSnapshotComponent, HeaderInterceptor, ListPaginationContainerComponent, ListSnapshotContainerComponent, LoadingPage, ModalContainerComponent, PermissionDirective, PermissionGuard, PermissionModule, PermissionService, ProfileService, RefreshTokenInterceptor, TabContentComponent, TabGroupComponent, TabsComponentModule, UnauthorizedPage, bootstrap, getFormErrorMessage };
|
|
2983
2977
|
//# sourceMappingURL=unipin-angular-applet.mjs.map
|