zek 14.2.62 → 14.2.64
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/lib/services/auth.service.mjs +20 -20
- package/fesm2015/zek.mjs +18 -18
- package/fesm2015/zek.mjs.map +1 -1
- package/fesm2020/zek.mjs +18 -18
- package/fesm2020/zek.mjs.map +1 -1
- package/package.json +1 -1
package/fesm2020/zek.mjs
CHANGED
|
@@ -1121,17 +1121,16 @@ class AuthService {
|
|
|
1121
1121
|
}
|
|
1122
1122
|
get user() {
|
|
1123
1123
|
if (!this._isInitialized) {
|
|
1124
|
-
let
|
|
1125
|
-
if (
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
tmp.refreshTokenTime = DateHelper.parseDate(tmp.refreshTokenTime);
|
|
1124
|
+
let user = StorageHelper.get('login');
|
|
1125
|
+
if (user) {
|
|
1126
|
+
user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
|
|
1127
|
+
user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
1128
|
+
user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
1129
|
+
if (Array.isArray(user.roles)) {
|
|
1130
|
+
user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
|
|
1131
|
+
}
|
|
1133
1132
|
}
|
|
1134
|
-
this._user =
|
|
1133
|
+
this._user = user;
|
|
1135
1134
|
this._isInitialized = true;
|
|
1136
1135
|
this._starRefreshTokenTimer();
|
|
1137
1136
|
}
|
|
@@ -1189,14 +1188,15 @@ class AuthService {
|
|
|
1189
1188
|
return this._onRefreshTokenObservable;
|
|
1190
1189
|
}
|
|
1191
1190
|
login(user) {
|
|
1192
|
-
if (user) {
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
|
|
1197
|
-
|
|
1198
|
-
|
|
1199
|
-
}
|
|
1191
|
+
// if (user) {
|
|
1192
|
+
// // I think we don't need this
|
|
1193
|
+
// user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
|
|
1194
|
+
// user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
1195
|
+
// user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
1196
|
+
// if (Array.isArray(user.roles)) {
|
|
1197
|
+
// user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
|
|
1198
|
+
// }
|
|
1199
|
+
// }
|
|
1200
1200
|
StorageHelper.set('login', user);
|
|
1201
1201
|
this._user = null;
|
|
1202
1202
|
this._isInitialized = false; //user get method will init user
|