new-front-common-library 16.1.15-REF-3 → 16.1.15-REF-4
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Router
|
|
1
|
+
import { Router } from '@angular/router';
|
|
2
2
|
import { WEB_CONFIG } from '../../config';
|
|
3
3
|
import { CookieService } from 'ngx-cookie-service';
|
|
4
4
|
import { CommonApiService } from '../api/common-api.service';
|
|
@@ -6,13 +6,12 @@ import { catchError, map } from 'rxjs/operators';
|
|
|
6
6
|
import { inject } from '@angular/core';
|
|
7
7
|
import { AuthService } from '../auth/auth.service';
|
|
8
8
|
import { of } from "rxjs";
|
|
9
|
-
export const authGuard = () => {
|
|
9
|
+
export const authGuard = (route, state) => {
|
|
10
10
|
const cookieService = inject(CookieService);
|
|
11
11
|
const commonApiService = inject(CommonApiService);
|
|
12
12
|
const webConfig = inject(WEB_CONFIG);
|
|
13
13
|
const router = inject(Router);
|
|
14
14
|
const authService = inject(AuthService);
|
|
15
|
-
const state = inject(RouterStateSnapshot);
|
|
16
15
|
if (state.url.includes('/login/invalid')) {
|
|
17
16
|
return true;
|
|
18
17
|
}
|
|
@@ -26,9 +25,9 @@ export const authGuard = () => {
|
|
|
26
25
|
user.secondary ? commonApiService.setSecondaryToken(data.token) : commonApiService.setToken(data.token);
|
|
27
26
|
authService.setAuthenticated(true);
|
|
28
27
|
return true;
|
|
29
|
-
}), catchError(
|
|
28
|
+
}), catchError(() => {
|
|
30
29
|
authService.setAuthenticated(false);
|
|
31
30
|
return of(router.parseUrl(webConfig.api_url + '/login/invalid'));
|
|
32
31
|
}));
|
|
33
32
|
};
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25ldy1mcm9udC1jb21tb24tbGlicmFyeS9zcmMvbGliL3V0aWwvc2VydmljZXMvZ3VhcmQvYXV0aC5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXdDLE1BQU0sRUFBdUIsTUFBTSxpQkFBaUIsQ0FBQztBQUNwRyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRWpELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFMUIsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFrQixDQUN0QyxLQUE2QixFQUM3QixLQUEwQixFQUMxQixFQUFFO0lBQ0YsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzVDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDbEQsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3JDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM5QixNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFFeEMsSUFBSSxLQUFLLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1FBQ3hDLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFFRCxJQUFJLGdCQUFnQixDQUFDLFlBQVksRUFBRSxFQUFFO1FBQ25DLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxPQUFPLElBQUksQ0FBQztLQUNiO0lBRUQsTUFBTSxJQUFJLEdBQWtCLGdCQUFnQixDQUFDLG9CQUFvQixFQUFFLENBQUM7SUFDcEUsTUFBTSxLQUFLLEdBQVcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUVuRixPQUFPLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQzFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ1gsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3hHLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxHQUFHLEVBQUU7UUFDZCxXQUFXLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDcEMsT0FBTyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsT0FBTyxHQUFHLGdCQUFnQixDQUFDLENBQUMsQ0FBQztJQUNuRSxDQUFDLENBQUMsQ0FDSCxDQUFDO0FBQ0osQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBDYW5BY3RpdmF0ZUZuLCBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgV0VCX0NPTkZJRyB9IGZyb20gJy4uLy4uL2NvbmZpZyc7XG5pbXBvcnQgeyBDb29raWVTZXJ2aWNlIH0gZnJvbSAnbmd4LWNvb2tpZS1zZXJ2aWNlJztcbmltcG9ydCB7IENvbW1vbkFwaVNlcnZpY2UgfSBmcm9tICcuLi9hcGkvY29tbW9uLWFwaS5zZXJ2aWNlJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEF1dGhVc2VyTW9kZWwgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBdXRoU2VydmljZSB9IGZyb20gJy4uL2F1dGgvYXV0aC5zZXJ2aWNlJztcbmltcG9ydCB7IG9mIH0gZnJvbSBcInJ4anNcIjtcblxuZXhwb3J0IGNvbnN0IGF1dGhHdWFyZDogQ2FuQWN0aXZhdGVGbiA9IChcbiAgcm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXG4gIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90XG4pID0+IHtcbiAgY29uc3QgY29va2llU2VydmljZSA9IGluamVjdChDb29raWVTZXJ2aWNlKTtcbiAgY29uc3QgY29tbW9uQXBpU2VydmljZSA9IGluamVjdChDb21tb25BcGlTZXJ2aWNlKTtcbiAgY29uc3Qgd2ViQ29uZmlnID0gaW5qZWN0KFdFQl9DT05GSUcpO1xuICBjb25zdCByb3V0ZXIgPSBpbmplY3QoUm91dGVyKTtcbiAgY29uc3QgYXV0aFNlcnZpY2UgPSBpbmplY3QoQXV0aFNlcnZpY2UpO1xuXG4gIGlmIChzdGF0ZS51cmwuaW5jbHVkZXMoJy9sb2dpbi9pbnZhbGlkJykpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGlmIChjb21tb25BcGlTZXJ2aWNlLmlzVG9rZW5WYWxpZCgpKSB7XG4gICAgYXV0aFNlcnZpY2Uuc2V0QXV0aGVudGljYXRlZCh0cnVlKTtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGNvbnN0IHVzZXI6IEF1dGhVc2VyTW9kZWwgPSBjb21tb25BcGlTZXJ2aWNlLmdldFVzZXJEYXRhRnJvbVRva2VuKCk7XG4gIGNvbnN0IGVtYWlsOiBzdHJpbmcgPSB1c2VyLnNlY29uZGFyeSA/IHVzZXIuZW1haWwgOiBjb29raWVTZXJ2aWNlLmdldCgnYXV0aC1tYWlsJyk7XG5cbiAgcmV0dXJuIGNvbW1vbkFwaVNlcnZpY2Uuc3NvTG9naW4oZW1haWwpLnBpcGUoXG4gICAgbWFwKChkYXRhKSA9PiB7XG4gICAgICB1c2VyLnNlY29uZGFyeSA/IGNvbW1vbkFwaVNlcnZpY2Uuc2V0U2Vjb25kYXJ5VG9rZW4oZGF0YS50b2tlbikgOiBjb21tb25BcGlTZXJ2aWNlLnNldFRva2VuKGRhdGEudG9rZW4pO1xuICAgICAgYXV0aFNlcnZpY2Uuc2V0QXV0aGVudGljYXRlZCh0cnVlKTtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH0pLFxuICAgIGNhdGNoRXJyb3IoKCkgPT4ge1xuICAgICAgYXV0aFNlcnZpY2Uuc2V0QXV0aGVudGljYXRlZChmYWxzZSk7XG4gICAgICByZXR1cm4gb2Yocm91dGVyLnBhcnNlVXJsKHdlYkNvbmZpZy5hcGlfdXJsICsgJy9sb2dpbi9pbnZhbGlkJykpO1xuICAgIH0pXG4gICk7XG59O1xuIl19
|
|
@@ -19,7 +19,7 @@ import { NgxPermissionsModule } from 'ngx-permissions';
|
|
|
19
19
|
import * as i6 from '@angular/material/progress-spinner';
|
|
20
20
|
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
|
21
21
|
import * as i1$3 from '@angular/router';
|
|
22
|
-
import { RouterModule, Router
|
|
22
|
+
import { RouterModule, Router } from '@angular/router';
|
|
23
23
|
import * as i7$1 from '@angular/forms';
|
|
24
24
|
import { FormControl, Validators, ReactiveFormsModule, FormsModule } from '@angular/forms';
|
|
25
25
|
import * as i9 from '@angular/cdk/overlay';
|
|
@@ -5294,13 +5294,12 @@ class SectionModel {
|
|
|
5294
5294
|
}
|
|
5295
5295
|
}
|
|
5296
5296
|
|
|
5297
|
-
const authGuard = () => {
|
|
5297
|
+
const authGuard = (route, state) => {
|
|
5298
5298
|
const cookieService = inject(CookieService);
|
|
5299
5299
|
const commonApiService = inject(CommonApiService);
|
|
5300
5300
|
const webConfig = inject(WEB_CONFIG);
|
|
5301
5301
|
const router = inject(Router);
|
|
5302
5302
|
const authService = inject(AuthService);
|
|
5303
|
-
const state = inject(RouterStateSnapshot);
|
|
5304
5303
|
if (state.url.includes('/login/invalid')) {
|
|
5305
5304
|
return true;
|
|
5306
5305
|
}
|
|
@@ -5314,7 +5313,7 @@ const authGuard = () => {
|
|
|
5314
5313
|
user.secondary ? commonApiService.setSecondaryToken(data.token) : commonApiService.setToken(data.token);
|
|
5315
5314
|
authService.setAuthenticated(true);
|
|
5316
5315
|
return true;
|
|
5317
|
-
}), catchError(
|
|
5316
|
+
}), catchError(() => {
|
|
5318
5317
|
authService.setAuthenticated(false);
|
|
5319
5318
|
return of(router.parseUrl(webConfig.api_url + '/login/invalid'));
|
|
5320
5319
|
}));
|