@ts-core/angular 13.0.17 → 13.0.18
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/login/LoginGuard.mjs +10 -7
- package/esm2020/login/LoginNotGuard.mjs +10 -7
- package/esm2020/login/LoginRequireResolver.mjs +3 -3
- package/esm2020/login/LoginResolver.mjs +8 -5
- package/fesm2015/ts-core-angular.mjs +28 -13
- package/fesm2015/ts-core-angular.mjs.map +1 -1
- package/fesm2020/ts-core-angular.mjs +22 -13
- package/fesm2020/ts-core-angular.mjs.map +1 -1
- package/login/LoginGuard.d.ts +6 -6
- package/login/LoginNotGuard.d.ts +6 -6
- package/login/LoginRequireResolver.d.ts +4 -4
- package/login/LoginResolver.d.ts +4 -4
- package/package.json +1 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
1
|
+
import { Inject, Injectable } from '@angular/core';
|
|
2
|
+
import { LoginBaseService } from './LoginBaseService';
|
|
2
3
|
import { LoginRequireResolver } from './LoginRequireResolver';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
|
-
import * as i1 from "
|
|
5
|
-
import * as i2 from "@angular/router";
|
|
5
|
+
import * as i1 from "@angular/router";
|
|
6
6
|
export class LoginGuard extends LoginRequireResolver {
|
|
7
7
|
// --------------------------------------------------------------------------
|
|
8
8
|
//
|
|
@@ -18,7 +18,7 @@ export class LoginGuard extends LoginRequireResolver {
|
|
|
18
18
|
// Public Methods
|
|
19
19
|
//
|
|
20
20
|
// --------------------------------------------------------------------------
|
|
21
|
-
canActivate() {
|
|
21
|
+
canActivate(route, state) {
|
|
22
22
|
return this.isLoggedIn() ? true : this.router.parseUrl(LoginGuard.redirectUrl);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -28,10 +28,13 @@ export class LoginGuard extends LoginRequireResolver {
|
|
|
28
28
|
//
|
|
29
29
|
// --------------------------------------------------------------------------
|
|
30
30
|
LoginGuard.redirectUrl = '/login';
|
|
31
|
-
LoginGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, deps: [{ token:
|
|
31
|
+
LoginGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginBaseService }, { token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
32
32
|
LoginGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, providedIn: 'root' });
|
|
33
33
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, decorators: [{
|
|
34
34
|
type: Injectable,
|
|
35
35
|
args: [{ providedIn: 'root' }]
|
|
36
|
-
}], ctorParameters: function () { return [{ type:
|
|
37
|
-
|
|
36
|
+
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
37
|
+
type: Inject,
|
|
38
|
+
args: [LoginBaseService]
|
|
39
|
+
}] }, { type: i1.Router }]; } });
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5HdWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sb2dpbi9Mb2dpbkd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRW5ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDOzs7QUFLOUQsTUFBTSxPQUFPLFVBQTBELFNBQVEsb0JBQXVCO0lBU2xHLDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0YsZUFBZTtJQUNmLEVBQUU7SUFDRiw2RUFBNkU7SUFFN0UsWUFBc0MsS0FBUSxFQUFZLE1BQWM7UUFDcEUsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRHlDLFdBQU0sR0FBTixNQUFNLENBQVE7SUFFeEUsQ0FBQztJQUVELDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLEVBQUU7SUFDRiw2RUFBNkU7SUFFdEUsV0FBVyxDQUNkLEtBQTZCLEVBQzdCLEtBQTBCO1FBRTFCLE9BQU8sSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNuRixDQUFDOztBQTdCRCw2RUFBNkU7QUFDN0UsRUFBRTtBQUNGLGNBQWM7QUFDZCxFQUFFO0FBQ0YsNkVBQTZFO0FBRS9ELHNCQUFXLEdBQVcsUUFBUyxDQUFBO3VHQVBwQyxVQUFVLGtCQWVDLGdCQUFnQjsyR0FmM0IsVUFBVSxjQURHLE1BQU07MkZBQ25CLFVBQVU7a0JBRHRCLFVBQVU7bUJBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFOzswQkFnQmpCLE1BQU07MkJBQUMsZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBDYW5BY3RpdmF0ZSwgUm91dGVyLCBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBVcmxUcmVlIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IExvZ2luQmFzZVNlcnZpY2UgfSBmcm9tICcuL0xvZ2luQmFzZVNlcnZpY2UnO1xuaW1wb3J0IHsgTG9naW5SZXF1aXJlUmVzb2x2ZXIgfSBmcm9tICcuL0xvZ2luUmVxdWlyZVJlc29sdmVyJztcbmltcG9ydCAqIGFzIF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBMb2dpbkd1YXJkPFQgZXh0ZW5kcyBMb2dpbkJhc2VTZXJ2aWNlID0gTG9naW5CYXNlU2VydmljZT4gZXh0ZW5kcyBMb2dpblJlcXVpcmVSZXNvbHZlcjxUPiBpbXBsZW1lbnRzIENhbkFjdGl2YXRlIHtcbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRQcm9wZXJ0aWVzXG4gICAgLy9cbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4gICAgcHVibGljIHN0YXRpYyByZWRpcmVjdFVybDogc3RyaW5nID0gJy9sb2dpbic7XG5cbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRDb25zdHJ1Y3RvclxuICAgIC8vXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIGNvbnN0cnVjdG9yKEBJbmplY3QoTG9naW5CYXNlU2VydmljZSkgbG9naW46IFQsIHByb3RlY3RlZCByb3V0ZXI6IFJvdXRlcikge1xuICAgICAgICBzdXBlcihsb2dpbik7XG4gICAgfVxuXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0UHVibGljIE1ldGhvZHNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgY2FuQWN0aXZhdGUoXG4gICAgICAgIHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxuICAgICAgICBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdFxuICAgICk6IE9ic2VydmFibGU8Ym9vbGVhbiB8IFVybFRyZWU+IHwgUHJvbWlzZTxib29sZWFuIHwgVXJsVHJlZT4gfCBib29sZWFuIHwgVXJsVHJlZSB7XG4gICAgICAgIHJldHVybiB0aGlzLmlzTG9nZ2VkSW4oKSA/IHRydWUgOiB0aGlzLnJvdXRlci5wYXJzZVVybChMb2dpbkd1YXJkLnJlZGlyZWN0VXJsKTtcbiAgICB9XG59XG4iXX0=
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
1
|
+
import { Inject, Injectable } from '@angular/core';
|
|
2
|
+
import { LoginBaseService } from './LoginBaseService';
|
|
2
3
|
import { LoginRequireResolver } from './LoginRequireResolver';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
|
-
import * as i1 from "
|
|
5
|
-
import * as i2 from "@angular/router";
|
|
5
|
+
import * as i1 from "@angular/router";
|
|
6
6
|
export class LoginNotGuard extends LoginRequireResolver {
|
|
7
7
|
// --------------------------------------------------------------------------
|
|
8
8
|
//
|
|
@@ -18,7 +18,7 @@ export class LoginNotGuard extends LoginRequireResolver {
|
|
|
18
18
|
// Public Methods
|
|
19
19
|
//
|
|
20
20
|
// --------------------------------------------------------------------------
|
|
21
|
-
canActivate() {
|
|
21
|
+
canActivate(route, state) {
|
|
22
22
|
return !this.isLoggedIn() ? true : this.router.parseUrl(LoginNotGuard.redirectUrl);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -28,10 +28,13 @@ export class LoginNotGuard extends LoginRequireResolver {
|
|
|
28
28
|
//
|
|
29
29
|
// --------------------------------------------------------------------------
|
|
30
30
|
LoginNotGuard.redirectUrl = '/';
|
|
31
|
-
LoginNotGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, deps: [{ token:
|
|
31
|
+
LoginNotGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginBaseService }, { token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
32
32
|
LoginNotGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, providedIn: 'root' });
|
|
33
33
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, decorators: [{
|
|
34
34
|
type: Injectable,
|
|
35
35
|
args: [{ providedIn: 'root' }]
|
|
36
|
-
}], ctorParameters: function () { return [{ type:
|
|
37
|
-
|
|
36
|
+
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
37
|
+
type: Inject,
|
|
38
|
+
args: [LoginBaseService]
|
|
39
|
+
}] }, { type: i1.Router }]; } });
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5Ob3RHdWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sb2dpbi9Mb2dpbk5vdEd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRW5ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDOzs7QUFLOUQsTUFBTSxPQUFPLGFBQTZELFNBQVEsb0JBQXVCO0lBU3JHLDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0YsZUFBZTtJQUNmLEVBQUU7SUFDRiw2RUFBNkU7SUFFN0UsWUFBc0MsS0FBUSxFQUFZLE1BQWM7UUFDcEUsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRHlDLFdBQU0sR0FBTixNQUFNLENBQVE7SUFFeEUsQ0FBQztJQUVELDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLEVBQUU7SUFDRiw2RUFBNkU7SUFFdEUsV0FBVyxDQUNkLEtBQTZCLEVBQzdCLEtBQTBCO1FBRTFCLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3ZGLENBQUM7O0FBN0JELDZFQUE2RTtBQUM3RSxFQUFFO0FBQ0YsY0FBYztBQUNkLEVBQUU7QUFDRiw2RUFBNkU7QUFFL0QseUJBQVcsR0FBVyxHQUFJLENBQUE7MEdBUC9CLGFBQWEsa0JBZUYsZ0JBQWdCOzhHQWYzQixhQUFhLGNBREEsTUFBTTsyRkFDbkIsYUFBYTtrQkFEekIsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUU7OzBCQWdCakIsTUFBTTsyQkFBQyxnQkFBZ0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIENhbkFjdGl2YXRlLCBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QsIFVybFRyZWUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgTG9naW5CYXNlU2VydmljZSB9IGZyb20gJy4vTG9naW5CYXNlU2VydmljZSc7XG5pbXBvcnQgeyBMb2dpblJlcXVpcmVSZXNvbHZlciB9IGZyb20gJy4vTG9naW5SZXF1aXJlUmVzb2x2ZXInO1xuaW1wb3J0ICogYXMgXyBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuXG5ASW5qZWN0YWJsZSh7IHByb3ZpZGVkSW46ICdyb290JyB9KVxuZXhwb3J0IGNsYXNzIExvZ2luTm90R3VhcmQ8VCBleHRlbmRzIExvZ2luQmFzZVNlcnZpY2UgPSBMb2dpbkJhc2VTZXJ2aWNlPiBleHRlbmRzIExvZ2luUmVxdWlyZVJlc29sdmVyPFQ+IGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4gICAgLy9cbiAgICAvLyBcdFByb3BlcnRpZXNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgc3RhdGljIHJlZGlyZWN0VXJsOiBzdHJpbmcgPSAnLyc7XG5cbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRDb25zdHJ1Y3RvclxuICAgIC8vXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIGNvbnN0cnVjdG9yKEBJbmplY3QoTG9naW5CYXNlU2VydmljZSkgbG9naW46IFQsIHByb3RlY3RlZCByb3V0ZXI6IFJvdXRlcikge1xuICAgICAgICBzdXBlcihsb2dpbik7XG4gICAgfVxuXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0UHVibGljIE1ldGhvZHNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgY2FuQWN0aXZhdGUoXG4gICAgICAgIHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxuICAgICAgICBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdFxuICAgICk6IE9ic2VydmFibGU8Ym9vbGVhbiB8IFVybFRyZWU+IHwgUHJvbWlzZTxib29sZWFuIHwgVXJsVHJlZT4gfCBib29sZWFuIHwgVXJsVHJlZSB7XG4gICAgICAgIHJldHVybiAhdGhpcy5pc0xvZ2dlZEluKCkgPyB0cnVlIDogdGhpcy5yb3V0ZXIucGFyc2VVcmwoTG9naW5Ob3RHdWFyZC5yZWRpcmVjdFVybCk7XG4gICAgfVxufVxuIl19
|
|
@@ -16,7 +16,7 @@ export class LoginRequireResolver {
|
|
|
16
16
|
// --------------------------------------------------------------------------
|
|
17
17
|
resolve() {
|
|
18
18
|
if (this.isLoggedIn()) {
|
|
19
|
-
return Promise.resolve(
|
|
19
|
+
return Promise.resolve();
|
|
20
20
|
}
|
|
21
21
|
let promise = PromiseHandler.create();
|
|
22
22
|
let subscription = this.login.events.subscribe(data => {
|
|
@@ -24,7 +24,7 @@ export class LoginRequireResolver {
|
|
|
24
24
|
promise.reject(data.error.toString());
|
|
25
25
|
}
|
|
26
26
|
else if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {
|
|
27
|
-
promise.resolve(
|
|
27
|
+
promise.resolve();
|
|
28
28
|
}
|
|
29
29
|
else if (data.type === LoginBaseServiceEvent.LOGIN_FINISHED) {
|
|
30
30
|
subscription.unsubscribe();
|
|
@@ -36,4 +36,4 @@ export class LoginRequireResolver {
|
|
|
36
36
|
return this.login.isLoggedIn;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5SZXF1aXJlUmVzb2x2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbG9naW4vTG9naW5SZXF1aXJlUmVzb2x2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFvQixxQkFBcUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RCxNQUFNLE9BQU8sb0JBQW9CO0lBQzdCLDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0YsZUFBZTtJQUNmLEVBQUU7SUFDRiw2RUFBNkU7SUFFN0UsWUFBc0IsS0FBUTtRQUFSLFVBQUssR0FBTCxLQUFLLENBQUc7SUFBRyxDQUFDO0lBRWxDLDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLEVBQUU7SUFDRiw2RUFBNkU7SUFFdEUsT0FBTztRQUNWLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRSxFQUFFO1lBQ25CLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1NBQzVCO1FBRUQsSUFBSSxPQUFPLEdBQUcsY0FBYyxDQUFDLE1BQU0sRUFBUSxDQUFDO1FBQzVDLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNsRCxJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUsscUJBQXFCLENBQUMsV0FBVyxFQUFFO2dCQUNqRCxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQzthQUN6QztpQkFBTSxJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUsscUJBQXFCLENBQUMsY0FBYyxFQUFFO2dCQUMzRCxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7YUFDckI7aUJBQU0sSUFBSSxJQUFJLENBQUMsSUFBSSxLQUFLLHFCQUFxQixDQUFDLGNBQWMsRUFBRTtnQkFDM0QsWUFBWSxDQUFDLFdBQVcsRUFBRSxDQUFDO2FBQzlCO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDSCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDM0IsQ0FBQztJQUVNLFVBQVU7UUFDYixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDO0lBQ2pDLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlc29sdmUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgTG9naW5CYXNlU2VydmljZSwgTG9naW5CYXNlU2VydmljZUV2ZW50IH0gZnJvbSAnLi9Mb2dpbkJhc2VTZXJ2aWNlJztcbmltcG9ydCB7IFByb21pc2VIYW5kbGVyIH0gZnJvbSAnQHRzLWNvcmUvY29tbW9uL3Byb21pc2UnO1xuXG5leHBvcnQgY2xhc3MgTG9naW5SZXF1aXJlUmVzb2x2ZXI8VCBleHRlbmRzIExvZ2luQmFzZVNlcnZpY2UgPSBMb2dpbkJhc2VTZXJ2aWNlPiBpbXBsZW1lbnRzIFJlc29sdmU8dm9pZD4ge1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4gICAgLy9cbiAgICAvLyBcdENvbnN0cnVjdG9yXG4gICAgLy9cbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4gICAgY29uc3RydWN0b3IocHJvdGVjdGVkIGxvZ2luOiBUKSB7fVxuXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0UHVibGljIE1ldGhvZHNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgcmVzb2x2ZSgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgaWYgKHRoaXMuaXNMb2dnZWRJbigpKSB7XG4gICAgICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7XG4gICAgICAgIH1cblxuICAgICAgICBsZXQgcHJvbWlzZSA9IFByb21pc2VIYW5kbGVyLmNyZWF0ZTx2b2lkPigpO1xuICAgICAgICBsZXQgc3Vic2NyaXB0aW9uID0gdGhpcy5sb2dpbi5ldmVudHMuc3Vic2NyaWJlKGRhdGEgPT4ge1xuICAgICAgICAgICAgaWYgKGRhdGEudHlwZSA9PT0gTG9naW5CYXNlU2VydmljZUV2ZW50LkxPR0lOX0VSUk9SKSB7XG4gICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoZGF0YS5lcnJvci50b1N0cmluZygpKTtcbiAgICAgICAgICAgIH0gZWxzZSBpZiAoZGF0YS50eXBlID09PSBMb2dpbkJhc2VTZXJ2aWNlRXZlbnQuTE9HSU5fQ09NUExFVEUpIHtcbiAgICAgICAgICAgICAgICBwcm9taXNlLnJlc29sdmUoKTtcbiAgICAgICAgICAgIH0gZWxzZSBpZiAoZGF0YS50eXBlID09PSBMb2dpbkJhc2VTZXJ2aWNlRXZlbnQuTE9HSU5fRklOSVNIRUQpIHtcbiAgICAgICAgICAgICAgICBzdWJzY3JpcHRpb24udW5zdWJzY3JpYmUoKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiBwcm9taXNlLnByb21pc2U7XG4gICAgfVxuXG4gICAgcHVibGljIGlzTG9nZ2VkSW4oKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiB0aGlzLmxvZ2luLmlzTG9nZ2VkSW47XG4gICAgfVxufVxuIl19
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
1
|
+
import { Inject, Injectable } from '@angular/core';
|
|
2
|
+
import { LoginBaseService } from './LoginBaseService';
|
|
2
3
|
import { LoginRequireResolver } from './LoginRequireResolver';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
|
-
import * as i1 from "./LoginBaseService";
|
|
5
5
|
export class LoginResolver extends LoginRequireResolver {
|
|
6
6
|
// --------------------------------------------------------------------------
|
|
7
7
|
//
|
|
@@ -12,10 +12,13 @@ export class LoginResolver extends LoginRequireResolver {
|
|
|
12
12
|
super(login);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
|
-
LoginResolver.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, deps: [{ token:
|
|
15
|
+
LoginResolver.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, deps: [{ token: LoginBaseService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
16
16
|
LoginResolver.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, providedIn: 'root' });
|
|
17
17
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, decorators: [{
|
|
18
18
|
type: Injectable,
|
|
19
19
|
args: [{ providedIn: 'root' }]
|
|
20
|
-
}], ctorParameters: function () { return [{ type:
|
|
21
|
-
|
|
20
|
+
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
21
|
+
type: Inject,
|
|
22
|
+
args: [LoginBaseService]
|
|
23
|
+
}] }]; } });
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5SZXNvbHZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sb2dpbi9Mb2dpblJlc29sdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDOztBQUc5RCxNQUFNLE9BQU8sYUFBMEMsU0FBUSxvQkFBdUI7SUFDbEYsNkVBQTZFO0lBQzdFLEVBQUU7SUFDRixlQUFlO0lBQ2YsRUFBRTtJQUNGLDZFQUE2RTtJQUU3RSxZQUFzQyxLQUFRO1FBQzFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNqQixDQUFDOzswR0FUUSxhQUFhLGtCQU9GLGdCQUFnQjs4R0FQM0IsYUFBYSxjQURBLE1BQU07MkZBQ25CLGFBQWE7a0JBRHpCLFVBQVU7bUJBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFOzswQkFRakIsTUFBTTsyQkFBQyxnQkFBZ0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IExvZ2luQmFzZVNlcnZpY2UgfSBmcm9tICcuL0xvZ2luQmFzZVNlcnZpY2UnO1xuaW1wb3J0IHsgTG9naW5SZXF1aXJlUmVzb2x2ZXIgfSBmcm9tICcuL0xvZ2luUmVxdWlyZVJlc29sdmVyJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBMb2dpblJlc29sdmVyPFQgZXh0ZW5kcyBMb2dpbkJhc2VTZXJ2aWNlPiBleHRlbmRzIExvZ2luUmVxdWlyZVJlc29sdmVyPFQ+IHtcbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRDb25zdHJ1Y3RvclxuICAgIC8vXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIGNvbnN0cnVjdG9yKEBJbmplY3QoTG9naW5CYXNlU2VydmljZSkgbG9naW46IFQpIHtcbiAgICAgICAgc3VwZXIobG9naW4pO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -57,10 +57,10 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
|
|
|
57
57
|
import { MomentDateAdapter } from '@angular/material-moment-adapter';
|
|
58
58
|
import { __awaiter } from 'tslib';
|
|
59
59
|
import { TransportTimeoutError, TransportNoConnectionError, TransportEvent } from '@ts-core/common/transport';
|
|
60
|
-
import * as
|
|
60
|
+
import * as i1$9 from '@angular/router';
|
|
61
61
|
import { NavigationStart, NavigationEnd, NavigationCancel, NavigationError, ActivatedRoute } from '@angular/router';
|
|
62
62
|
import { FilterableMapCollection, MapCollection } from '@ts-core/common/map';
|
|
63
|
-
import * as i1$
|
|
63
|
+
import * as i1$a from '@angular/cdk/layout';
|
|
64
64
|
import { TransportLocal } from '@ts-core/common/transport/local';
|
|
65
65
|
|
|
66
66
|
class ApplicationBaseComponent extends DestroyableContainer {
|
|
@@ -8242,7 +8242,7 @@ class LoginRequireResolver {
|
|
|
8242
8242
|
// --------------------------------------------------------------------------
|
|
8243
8243
|
resolve() {
|
|
8244
8244
|
if (this.isLoggedIn()) {
|
|
8245
|
-
return Promise.resolve(
|
|
8245
|
+
return Promise.resolve();
|
|
8246
8246
|
}
|
|
8247
8247
|
let promise = PromiseHandler.create();
|
|
8248
8248
|
let subscription = this.login.events.subscribe(data => {
|
|
@@ -8250,7 +8250,7 @@ class LoginRequireResolver {
|
|
|
8250
8250
|
promise.reject(data.error.toString());
|
|
8251
8251
|
}
|
|
8252
8252
|
else if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {
|
|
8253
|
-
promise.resolve(
|
|
8253
|
+
promise.resolve();
|
|
8254
8254
|
}
|
|
8255
8255
|
else if (data.type === LoginBaseServiceEvent.LOGIN_FINISHED) {
|
|
8256
8256
|
subscription.unsubscribe();
|
|
@@ -8278,7 +8278,7 @@ class LoginGuard extends LoginRequireResolver {
|
|
|
8278
8278
|
// Public Methods
|
|
8279
8279
|
//
|
|
8280
8280
|
// --------------------------------------------------------------------------
|
|
8281
|
-
canActivate() {
|
|
8281
|
+
canActivate(route, state) {
|
|
8282
8282
|
return this.isLoggedIn() ? true : this.router.parseUrl(LoginGuard.redirectUrl);
|
|
8283
8283
|
}
|
|
8284
8284
|
}
|
|
@@ -8288,12 +8288,17 @@ class LoginGuard extends LoginRequireResolver {
|
|
|
8288
8288
|
//
|
|
8289
8289
|
// --------------------------------------------------------------------------
|
|
8290
8290
|
LoginGuard.redirectUrl = '/login';
|
|
8291
|
-
LoginGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginBaseService }, { token:
|
|
8291
|
+
LoginGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, deps: [{ token: LoginBaseService }, { token: i1$9.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
8292
8292
|
LoginGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, providedIn: 'root' });
|
|
8293
8293
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginGuard, decorators: [{
|
|
8294
8294
|
type: Injectable,
|
|
8295
8295
|
args: [{ providedIn: 'root' }]
|
|
8296
|
-
}], ctorParameters: function () {
|
|
8296
|
+
}], ctorParameters: function () {
|
|
8297
|
+
return [{ type: undefined, decorators: [{
|
|
8298
|
+
type: Inject,
|
|
8299
|
+
args: [LoginBaseService]
|
|
8300
|
+
}] }, { type: i1$9.Router }];
|
|
8301
|
+
} });
|
|
8297
8302
|
|
|
8298
8303
|
class LoginNotGuard extends LoginRequireResolver {
|
|
8299
8304
|
// --------------------------------------------------------------------------
|
|
@@ -8310,7 +8315,7 @@ class LoginNotGuard extends LoginRequireResolver {
|
|
|
8310
8315
|
// Public Methods
|
|
8311
8316
|
//
|
|
8312
8317
|
// --------------------------------------------------------------------------
|
|
8313
|
-
canActivate() {
|
|
8318
|
+
canActivate(route, state) {
|
|
8314
8319
|
return !this.isLoggedIn() ? true : this.router.parseUrl(LoginNotGuard.redirectUrl);
|
|
8315
8320
|
}
|
|
8316
8321
|
}
|
|
@@ -8320,12 +8325,17 @@ class LoginNotGuard extends LoginRequireResolver {
|
|
|
8320
8325
|
//
|
|
8321
8326
|
// --------------------------------------------------------------------------
|
|
8322
8327
|
LoginNotGuard.redirectUrl = '/';
|
|
8323
|
-
LoginNotGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginBaseService }, { token:
|
|
8328
|
+
LoginNotGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, deps: [{ token: LoginBaseService }, { token: i1$9.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
8324
8329
|
LoginNotGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, providedIn: 'root' });
|
|
8325
8330
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginNotGuard, decorators: [{
|
|
8326
8331
|
type: Injectable,
|
|
8327
8332
|
args: [{ providedIn: 'root' }]
|
|
8328
|
-
}], ctorParameters: function () {
|
|
8333
|
+
}], ctorParameters: function () {
|
|
8334
|
+
return [{ type: undefined, decorators: [{
|
|
8335
|
+
type: Inject,
|
|
8336
|
+
args: [LoginBaseService]
|
|
8337
|
+
}] }, { type: i1$9.Router }];
|
|
8338
|
+
} });
|
|
8329
8339
|
|
|
8330
8340
|
class LoginResolver extends LoginRequireResolver {
|
|
8331
8341
|
// --------------------------------------------------------------------------
|
|
@@ -8342,7 +8352,12 @@ LoginResolver.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", versio
|
|
|
8342
8352
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: LoginResolver, decorators: [{
|
|
8343
8353
|
type: Injectable,
|
|
8344
8354
|
args: [{ providedIn: 'root' }]
|
|
8345
|
-
}], ctorParameters: function () {
|
|
8355
|
+
}], ctorParameters: function () {
|
|
8356
|
+
return [{ type: undefined, decorators: [{
|
|
8357
|
+
type: Inject,
|
|
8358
|
+
args: [LoginBaseService]
|
|
8359
|
+
}] }];
|
|
8360
|
+
} });
|
|
8346
8361
|
|
|
8347
8362
|
class MenuItemBase {
|
|
8348
8363
|
// --------------------------------------------------------------------------
|
|
@@ -9122,12 +9137,12 @@ BootstrapBreakpointService.DEFAULT_MD = 768;
|
|
|
9122
9137
|
BootstrapBreakpointService.DEFAULT_LG = 992;
|
|
9123
9138
|
BootstrapBreakpointService.DEFAULT_XL = 1200;
|
|
9124
9139
|
BootstrapBreakpointService.DEFAULT_XXL = 1400;
|
|
9125
|
-
BootstrapBreakpointService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, deps: [{ token: i1$
|
|
9140
|
+
BootstrapBreakpointService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, deps: [{ token: i1$a.BreakpointObserver }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
9126
9141
|
BootstrapBreakpointService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, providedIn: 'root' });
|
|
9127
9142
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: BootstrapBreakpointService, decorators: [{
|
|
9128
9143
|
type: Injectable,
|
|
9129
9144
|
args: [{ providedIn: 'root' }]
|
|
9130
|
-
}], ctorParameters: function () { return [{ type: i1$
|
|
9145
|
+
}], ctorParameters: function () { return [{ type: i1$a.BreakpointObserver }]; } });
|
|
9131
9146
|
var BootstrapBreakpointServiceEvent;
|
|
9132
9147
|
(function (BootstrapBreakpointServiceEvent) {
|
|
9133
9148
|
BootstrapBreakpointServiceEvent["CHANGED"] = "CHANGED";
|