@lenne.tech/ng-base 14.28.1 → 14.29.0
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/shared/services/auth.service.mjs +20 -3
- package/fesm2015/lenne.tech-ng-base-shared.mjs +19 -2
- package/fesm2015/lenne.tech-ng-base-shared.mjs.map +1 -1
- package/fesm2020/lenne.tech-ng-base-shared.mjs +19 -2
- package/fesm2020/lenne.tech-ng-base-shared.mjs.map +1 -1
- package/package.json +1 -1
- package/shared/services/auth.service.d.ts +1 -0
|
@@ -18,8 +18,13 @@ export class AuthService {
|
|
|
18
18
|
// Subjects
|
|
19
19
|
this._currentUser = new BehaviorSubject(null);
|
|
20
20
|
this._token = new BehaviorSubject(null);
|
|
21
|
-
this.
|
|
22
|
-
|
|
21
|
+
this.loadFromStorage();
|
|
22
|
+
}
|
|
23
|
+
loadFromStorage() {
|
|
24
|
+
if (localStorage) {
|
|
25
|
+
this.token = this.storageService.load('token');
|
|
26
|
+
this.currentUser = this.storageService.load('currentUser');
|
|
27
|
+
}
|
|
23
28
|
}
|
|
24
29
|
/**
|
|
25
30
|
* Logout
|
|
@@ -36,6 +41,9 @@ export class AuthService {
|
|
|
36
41
|
if (!localStorage) {
|
|
37
42
|
return undefined;
|
|
38
43
|
}
|
|
44
|
+
else if (!this._currentUser.value) {
|
|
45
|
+
this.loadFromStorage();
|
|
46
|
+
}
|
|
39
47
|
return this._currentUser.value;
|
|
40
48
|
}
|
|
41
49
|
set currentUser(user) {
|
|
@@ -43,6 +51,9 @@ export class AuthService {
|
|
|
43
51
|
this.storageService.save('currentUser', user);
|
|
44
52
|
}
|
|
45
53
|
get currentUserObservable() {
|
|
54
|
+
if (!this._currentUser.value) {
|
|
55
|
+
this.loadFromStorage();
|
|
56
|
+
}
|
|
46
57
|
return this._currentUser.asObservable();
|
|
47
58
|
}
|
|
48
59
|
// #################################################################
|
|
@@ -52,6 +63,9 @@ export class AuthService {
|
|
|
52
63
|
if (!localStorage) {
|
|
53
64
|
return undefined;
|
|
54
65
|
}
|
|
66
|
+
else if (this._token.value) {
|
|
67
|
+
this.loadFromStorage();
|
|
68
|
+
}
|
|
55
69
|
return this._token.value;
|
|
56
70
|
}
|
|
57
71
|
set token(token) {
|
|
@@ -60,6 +74,9 @@ export class AuthService {
|
|
|
60
74
|
this.wsService.reconnect();
|
|
61
75
|
}
|
|
62
76
|
get tokenObservable() {
|
|
77
|
+
if (!this._token.value) {
|
|
78
|
+
this.loadFromStorage();
|
|
79
|
+
}
|
|
63
80
|
return this._token.asObservable();
|
|
64
81
|
}
|
|
65
82
|
}
|
|
@@ -74,4 +91,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImpo
|
|
|
74
91
|
type: Inject,
|
|
75
92
|
args: [BASE_MODULE_CONFIG]
|
|
76
93
|
}] }, { type: i1.StorageService }, { type: i2.WsService }]; } });
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmctYmFzZS9zaGFyZWQvc2VydmljZXMvYXV0aC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBRSxlQUFlLEVBQWMsTUFBTSxNQUFNLENBQUM7QUFDbkQsT0FBTyxFQUFFLGtCQUFrQixFQUFvQixNQUFNLDRDQUE0QyxDQUFDOzs7O0FBS2xHOztHQUVHO0FBSUgsTUFBTSxPQUFPLFdBQVc7SUFLdEI7O09BRUc7SUFDSCxZQUNzQyxZQUE4QixFQUMxRCxjQUE4QixFQUM5QixTQUFvQjtRQUZRLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUMxRCxtQkFBYyxHQUFkLGNBQWMsQ0FBZ0I7UUFDOUIsY0FBUyxHQUFULFNBQVMsQ0FBVztRQVY5QixXQUFXO1FBQ0gsaUJBQVksR0FBK0IsSUFBSSxlQUFlLENBQVksSUFBSSxDQUFDLENBQUM7UUFDaEYsV0FBTSxHQUE0QixJQUFJLGVBQWUsQ0FBUyxJQUFJLENBQUMsQ0FBQztRQVUxRSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVELGVBQWU7UUFDYixJQUFJLFlBQVksRUFBRTtZQUNoQixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBVyxDQUFDO1lBQ3pELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFjLENBQUM7U0FDekU7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNO1FBQ1gsSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUNyRCxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztRQUN4QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQztJQUNwQixDQUFDO0lBRUQsb0VBQW9FO0lBQ3BFLGVBQWU7SUFDZixvRUFBb0U7SUFFcEUsSUFBSSxXQUFXO1FBQ2IsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUNqQixPQUFPLFNBQVMsQ0FBQztTQUNsQjthQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRTtZQUNuQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7U0FDeEI7UUFFRCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDO0lBQ2pDLENBQUM7SUFFRCxJQUFJLFdBQVcsQ0FBQyxJQUFlO1FBQzdCLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsSUFBSSxxQkFBcUI7UUFDdkIsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFO1lBQzVCLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztTQUN4QjtRQUVELE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUMxQyxDQUFDO0lBRUQsb0VBQW9FO0lBQ3BFLFFBQVE7SUFDUixvRUFBb0U7SUFFcEUsSUFBSSxLQUFLO1FBQ1AsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUNqQixPQUFPLFNBQVMsQ0FBQztTQUNsQjthQUFNLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7WUFDNUIsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1NBQ3hCO1FBRUQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQztJQUMzQixDQUFDO0lBRUQsSUFBSSxLQUFLLENBQUMsS0FBYTtRQUNyQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN4QixJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDekMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRUQsSUFBSSxlQUFlO1FBQ2pCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtZQUN0QixJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7U0FDeEI7UUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDcEMsQ0FBQzs7eUdBckZVLFdBQVcsa0JBU1osa0JBQWtCOzZHQVRqQixXQUFXLGNBRlYsTUFBTTs0RkFFUCxXQUFXO2tCQUh2QixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7MEJBVUksTUFBTTsyQkFBQyxrQkFBa0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgQkFTRV9NT0RVTEVfQ09ORklHLCBCYXNlTW9kdWxlQ29uZmlnIH0gZnJvbSAnLi4vaW50ZXJmYWNlcy9iYXNlLW1vZHVsZS1jb25maWcuaW50ZXJmYWNlJztcbmltcG9ydCB7IEJhc2ljVXNlciB9IGZyb20gJy4uL2NsYXNzZXMvYmFzaWMtdXNlci5jbGFzcyc7XG5pbXBvcnQgeyBTdG9yYWdlU2VydmljZSB9IGZyb20gJy4vc3RvcmFnZS5zZXJ2aWNlJztcbmltcG9ydCB7IFdzU2VydmljZSB9IGZyb20gJy4vd3Muc2VydmljZSc7XG5cbi8qKlxuICogQXV0aGVudGljYXRpb24gc2VydmljZVxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290Jyxcbn0pXG5leHBvcnQgY2xhc3MgQXV0aFNlcnZpY2Uge1xuICAvLyBTdWJqZWN0c1xuICBwcml2YXRlIF9jdXJyZW50VXNlcjogQmVoYXZpb3JTdWJqZWN0PEJhc2ljVXNlcj4gPSBuZXcgQmVoYXZpb3JTdWJqZWN0PEJhc2ljVXNlcj4obnVsbCk7XG4gIHByaXZhdGUgX3Rva2VuOiBCZWhhdmlvclN1YmplY3Q8c3RyaW5nPiA9IG5ldyBCZWhhdmlvclN1YmplY3Q8c3RyaW5nPihudWxsKTtcblxuICAvKipcbiAgICogQ29uc3RydWN0b3JcbiAgICovXG4gIGNvbnN0cnVjdG9yKFxuICAgIEBJbmplY3QoQkFTRV9NT0RVTEVfQ09ORklHKSBwcml2YXRlIG1vZHVsZUNvbmZpZzogQmFzZU1vZHVsZUNvbmZpZyxcbiAgICBwcml2YXRlIHN0b3JhZ2VTZXJ2aWNlOiBTdG9yYWdlU2VydmljZSxcbiAgICBwcml2YXRlIHdzU2VydmljZTogV3NTZXJ2aWNlXG4gICkge1xuICAgIHRoaXMubG9hZEZyb21TdG9yYWdlKCk7XG4gIH1cblxuICBsb2FkRnJvbVN0b3JhZ2UoKSB7XG4gICAgaWYgKGxvY2FsU3RvcmFnZSkge1xuICAgICAgdGhpcy50b2tlbiA9IHRoaXMuc3RvcmFnZVNlcnZpY2UubG9hZCgndG9rZW4nKSBhcyBzdHJpbmc7XG4gICAgICB0aGlzLmN1cnJlbnRVc2VyID0gdGhpcy5zdG9yYWdlU2VydmljZS5sb2FkKCdjdXJyZW50VXNlcicpIGFzIEJhc2ljVXNlcjtcbiAgICB9XG4gIH1cblxuICAvKipcbiAgICogTG9nb3V0XG4gICAqL1xuICBwdWJsaWMgbG9nb3V0KCkge1xuICAgIHRoaXMuc3RvcmFnZVNlcnZpY2UucmVtb3ZlKFsndG9rZW4nLCAnY3VycmVudFVzZXInXSk7XG4gICAgdGhpcy5jdXJyZW50VXNlciA9IG51bGw7XG4gICAgdGhpcy50b2tlbiA9IG51bGw7XG4gIH1cblxuICAvLyAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjI1xuICAvLyBDdXJyZW50IFVzZXJcbiAgLy8gIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyNcblxuICBnZXQgY3VycmVudFVzZXIoKTogQmFzaWNVc2VyIHtcbiAgICBpZiAoIWxvY2FsU3RvcmFnZSkge1xuICAgICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICB9IGVsc2UgaWYgKCF0aGlzLl9jdXJyZW50VXNlci52YWx1ZSkge1xuICAgICAgdGhpcy5sb2FkRnJvbVN0b3JhZ2UoKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdGhpcy5fY3VycmVudFVzZXIudmFsdWU7XG4gIH1cblxuICBzZXQgY3VycmVudFVzZXIodXNlcjogQmFzaWNVc2VyKSB7XG4gICAgdGhpcy5fY3VycmVudFVzZXIubmV4dCh1c2VyKTtcbiAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnNhdmUoJ2N1cnJlbnRVc2VyJywgdXNlcik7XG4gIH1cblxuICBnZXQgY3VycmVudFVzZXJPYnNlcnZhYmxlKCk6IE9ic2VydmFibGU8QmFzaWNVc2VyPiB7XG4gICAgaWYgKCF0aGlzLl9jdXJyZW50VXNlci52YWx1ZSkge1xuICAgICAgdGhpcy5sb2FkRnJvbVN0b3JhZ2UoKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdGhpcy5fY3VycmVudFVzZXIuYXNPYnNlcnZhYmxlKCk7XG4gIH1cblxuICAvLyAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjI1xuICAvLyBUb2tlblxuICAvLyAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjI1xuXG4gIGdldCB0b2tlbigpOiBzdHJpbmcge1xuICAgIGlmICghbG9jYWxTdG9yYWdlKSB7XG4gICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgIH0gZWxzZSBpZiAodGhpcy5fdG9rZW4udmFsdWUpIHtcbiAgICAgIHRoaXMubG9hZEZyb21TdG9yYWdlKCk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHRoaXMuX3Rva2VuLnZhbHVlO1xuICB9XG5cbiAgc2V0IHRva2VuKHRva2VuOiBzdHJpbmcpIHtcbiAgICB0aGlzLl90b2tlbi5uZXh0KHRva2VuKTtcbiAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnNhdmUoJ3Rva2VuJywgdG9rZW4pO1xuICAgIHRoaXMud3NTZXJ2aWNlLnJlY29ubmVjdCgpO1xuICB9XG5cbiAgZ2V0IHRva2VuT2JzZXJ2YWJsZSgpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgIGlmICghdGhpcy5fdG9rZW4udmFsdWUpIHtcbiAgICAgIHRoaXMubG9hZEZyb21TdG9yYWdlKCk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHRoaXMuX3Rva2VuLmFzT2JzZXJ2YWJsZSgpO1xuICB9XG59XG4iXX0=
|
|
@@ -996,8 +996,13 @@ class AuthService {
|
|
|
996
996
|
// Subjects
|
|
997
997
|
this._currentUser = new BehaviorSubject(null);
|
|
998
998
|
this._token = new BehaviorSubject(null);
|
|
999
|
-
this.
|
|
1000
|
-
|
|
999
|
+
this.loadFromStorage();
|
|
1000
|
+
}
|
|
1001
|
+
loadFromStorage() {
|
|
1002
|
+
if (localStorage) {
|
|
1003
|
+
this.token = this.storageService.load('token');
|
|
1004
|
+
this.currentUser = this.storageService.load('currentUser');
|
|
1005
|
+
}
|
|
1001
1006
|
}
|
|
1002
1007
|
/**
|
|
1003
1008
|
* Logout
|
|
@@ -1014,6 +1019,9 @@ class AuthService {
|
|
|
1014
1019
|
if (!localStorage) {
|
|
1015
1020
|
return undefined;
|
|
1016
1021
|
}
|
|
1022
|
+
else if (!this._currentUser.value) {
|
|
1023
|
+
this.loadFromStorage();
|
|
1024
|
+
}
|
|
1017
1025
|
return this._currentUser.value;
|
|
1018
1026
|
}
|
|
1019
1027
|
set currentUser(user) {
|
|
@@ -1021,6 +1029,9 @@ class AuthService {
|
|
|
1021
1029
|
this.storageService.save('currentUser', user);
|
|
1022
1030
|
}
|
|
1023
1031
|
get currentUserObservable() {
|
|
1032
|
+
if (!this._currentUser.value) {
|
|
1033
|
+
this.loadFromStorage();
|
|
1034
|
+
}
|
|
1024
1035
|
return this._currentUser.asObservable();
|
|
1025
1036
|
}
|
|
1026
1037
|
// #################################################################
|
|
@@ -1030,6 +1041,9 @@ class AuthService {
|
|
|
1030
1041
|
if (!localStorage) {
|
|
1031
1042
|
return undefined;
|
|
1032
1043
|
}
|
|
1044
|
+
else if (this._token.value) {
|
|
1045
|
+
this.loadFromStorage();
|
|
1046
|
+
}
|
|
1033
1047
|
return this._token.value;
|
|
1034
1048
|
}
|
|
1035
1049
|
set token(token) {
|
|
@@ -1038,6 +1052,9 @@ class AuthService {
|
|
|
1038
1052
|
this.wsService.reconnect();
|
|
1039
1053
|
}
|
|
1040
1054
|
get tokenObservable() {
|
|
1055
|
+
if (!this._token.value) {
|
|
1056
|
+
this.loadFromStorage();
|
|
1057
|
+
}
|
|
1041
1058
|
return this._token.asObservable();
|
|
1042
1059
|
}
|
|
1043
1060
|
}
|