zek 14.2.62 → 14.2.65

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.
Files changed (7) hide show
  1. package/esm2020/lib/components/list-base.component.mjs +1 -1
  2. package/esm2020/lib/services/auth.service.mjs +23 -21
  3. package/fesm2015/zek.mjs +21 -19
  4. package/fesm2015/zek.mjs.map +1 -1
  5. package/fesm2020/zek.mjs +21 -19
  6. package/fesm2020/zek.mjs.map +1 -1
  7. 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 tmp = StorageHelper.get('login');
1125
- if (tmp) {
1126
- // let user:LoginUser = {
1127
- // id: +tmp.id,
1128
- // expired: DateHelper.parseDate(tmp.expired)
1129
- // }
1130
- tmp.id = Convert.parseNumber(tmp.id);
1131
- tmp.expired = DateHelper.parseDate(tmp.expired);
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 = tmp;
1133
+ this._user = user;
1135
1134
  this._isInitialized = true;
1136
1135
  this._starRefreshTokenTimer();
1137
1136
  }
@@ -1141,7 +1140,9 @@ class AuthService {
1141
1140
  this._stopRefreshTokenTimer();
1142
1141
  let user = this.user;
1143
1142
  if (user && user.refreshTokenTime) {
1144
- const timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
1143
+ let timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
1144
+ if (timeout < 0)
1145
+ timeout = 0;
1145
1146
  this._refreshTokenTimeout = setTimeout(() => {
1146
1147
  if (this._onRefreshTokenSubject) {
1147
1148
  this._onRefreshTokenSubject.next();
@@ -1189,14 +1190,15 @@ class AuthService {
1189
1190
  return this._onRefreshTokenObservable;
1190
1191
  }
1191
1192
  login(user) {
1192
- if (user) {
1193
- user.id = Convert.parseNumber(user.id);
1194
- user.expired = DateHelper.parseDate(user.expired);
1195
- user.refreshTokenTime = DateHelper.parseDate(user.refreshTokenTime);
1196
- if (Array.isArray(user.roles)) {
1197
- user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
1198
- }
1199
- }
1193
+ // if (user) {
1194
+ // // I think we don't need this
1195
+ // user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
1196
+ // user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
1197
+ // user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
1198
+ // if (Array.isArray(user.roles)) {
1199
+ // user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
1200
+ // }
1201
+ // }
1200
1202
  StorageHelper.set('login', user);
1201
1203
  this._user = null;
1202
1204
  this._isInitialized = false; //user get method will init user