new-front-common-library 16.1.15-REF-2 → 16.1.15-REF-3
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 } from '@angular/router';
|
|
1
|
+
import { Router, RouterStateSnapshot } 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';
|
|
@@ -12,6 +12,10 @@ export const authGuard = () => {
|
|
|
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
|
+
if (state.url.includes('/login/invalid')) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
15
19
|
if (commonApiService.isTokenValid()) {
|
|
16
20
|
authService.setAuthenticated(true);
|
|
17
21
|
return true;
|
|
@@ -23,9 +27,8 @@ export const authGuard = () => {
|
|
|
23
27
|
authService.setAuthenticated(true);
|
|
24
28
|
return true;
|
|
25
29
|
}), catchError(res => {
|
|
26
|
-
console.error(res.message);
|
|
27
30
|
authService.setAuthenticated(false);
|
|
28
31
|
return of(router.parseUrl(webConfig.api_url + '/login/invalid'));
|
|
29
32
|
}));
|
|
30
33
|
};
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25ldy1mcm9udC1jb21tb24tbGlicmFyeS9zcmMvbGliL3V0aWwvc2VydmljZXMvZ3VhcmQvYXV0aC5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMxQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTFCLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxHQUFHLEVBQUU7SUFDNUIsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzVDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDbEQsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3JDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUM5QixNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDeEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFMUMsSUFBSSxLQUFLLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1FBQ3hDLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFFRCxJQUFJLGdCQUFnQixDQUFDLFlBQVksRUFBRSxFQUFFO1FBQ25DLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxPQUFPLElBQUksQ0FBQztLQUNiO0lBRUQsTUFBTSxJQUFJLEdBQWtCLGdCQUFnQixDQUFDLG9CQUFvQixFQUFFLENBQUM7SUFDcEUsTUFBTSxLQUFLLEdBQVcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUVuRixPQUFPLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQzFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ1gsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3hHLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNmLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQ25FLENBQUMsQ0FBQyxDQUNILENBQUM7QUFDSixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgV0VCX0NPTkZJRyB9IGZyb20gJy4uLy4uL2NvbmZpZyc7XG5pbXBvcnQgeyBDb29raWVTZXJ2aWNlIH0gZnJvbSAnbmd4LWNvb2tpZS1zZXJ2aWNlJztcbmltcG9ydCB7IENvbW1vbkFwaVNlcnZpY2UgfSBmcm9tICcuLi9hcGkvY29tbW9uLWFwaS5zZXJ2aWNlJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEF1dGhVc2VyTW9kZWwgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBdXRoU2VydmljZSB9IGZyb20gJy4uL2F1dGgvYXV0aC5zZXJ2aWNlJztcbmltcG9ydCB7IG9mIH0gZnJvbSBcInJ4anNcIjtcblxuZXhwb3J0IGNvbnN0IGF1dGhHdWFyZCA9ICgpID0+IHtcbiAgY29uc3QgY29va2llU2VydmljZSA9IGluamVjdChDb29raWVTZXJ2aWNlKTtcbiAgY29uc3QgY29tbW9uQXBpU2VydmljZSA9IGluamVjdChDb21tb25BcGlTZXJ2aWNlKTtcbiAgY29uc3Qgd2ViQ29uZmlnID0gaW5qZWN0KFdFQl9DT05GSUcpO1xuICBjb25zdCByb3V0ZXIgPSBpbmplY3QoUm91dGVyKTtcbiAgY29uc3QgYXV0aFNlcnZpY2UgPSBpbmplY3QoQXV0aFNlcnZpY2UpO1xuICBjb25zdCBzdGF0ZSA9IGluamVjdChSb3V0ZXJTdGF0ZVNuYXBzaG90KTtcblxuICBpZiAoc3RhdGUudXJsLmluY2x1ZGVzKCcvbG9naW4vaW52YWxpZCcpKSB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cblxuICBpZiAoY29tbW9uQXBpU2VydmljZS5pc1Rva2VuVmFsaWQoKSkge1xuICAgIGF1dGhTZXJ2aWNlLnNldEF1dGhlbnRpY2F0ZWQodHJ1ZSk7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cblxuICBjb25zdCB1c2VyOiBBdXRoVXNlck1vZGVsID0gY29tbW9uQXBpU2VydmljZS5nZXRVc2VyRGF0YUZyb21Ub2tlbigpO1xuICBjb25zdCBlbWFpbDogc3RyaW5nID0gdXNlci5zZWNvbmRhcnkgPyB1c2VyLmVtYWlsIDogY29va2llU2VydmljZS5nZXQoJ2F1dGgtbWFpbCcpO1xuXG4gIHJldHVybiBjb21tb25BcGlTZXJ2aWNlLnNzb0xvZ2luKGVtYWlsKS5waXBlKFxuICAgIG1hcCgoZGF0YSkgPT4ge1xuICAgICAgdXNlci5zZWNvbmRhcnkgPyBjb21tb25BcGlTZXJ2aWNlLnNldFNlY29uZGFyeVRva2VuKGRhdGEudG9rZW4pIDogY29tbW9uQXBpU2VydmljZS5zZXRUb2tlbihkYXRhLnRva2VuKTtcbiAgICAgIGF1dGhTZXJ2aWNlLnNldEF1dGhlbnRpY2F0ZWQodHJ1ZSk7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9KSxcbiAgICBjYXRjaEVycm9yKHJlcyA9PiB7XG4gICAgICBhdXRoU2VydmljZS5zZXRBdXRoZW50aWNhdGVkKGZhbHNlKTtcbiAgICAgIHJldHVybiBvZihyb3V0ZXIucGFyc2VVcmwod2ViQ29uZmlnLmFwaV91cmwgKyAnL2xvZ2luL2ludmFsaWQnKSk7XG4gICAgfSlcbiAgKTtcbn07XG4iXX0=
|
|
@@ -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 } from '@angular/router';
|
|
22
|
+
import { RouterModule, Router, RouterStateSnapshot } 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';
|
|
@@ -5300,6 +5300,10 @@ const authGuard = () => {
|
|
|
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
|
+
if (state.url.includes('/login/invalid')) {
|
|
5305
|
+
return true;
|
|
5306
|
+
}
|
|
5303
5307
|
if (commonApiService.isTokenValid()) {
|
|
5304
5308
|
authService.setAuthenticated(true);
|
|
5305
5309
|
return true;
|
|
@@ -5311,7 +5315,6 @@ const authGuard = () => {
|
|
|
5311
5315
|
authService.setAuthenticated(true);
|
|
5312
5316
|
return true;
|
|
5313
5317
|
}), catchError(res => {
|
|
5314
|
-
console.error(res.message);
|
|
5315
5318
|
authService.setAuthenticated(false);
|
|
5316
5319
|
return of(router.parseUrl(webConfig.api_url + '/login/invalid'));
|
|
5317
5320
|
}));
|