@sumaris-net/ngx-components 2.12.29-beta1 → 2.12.29

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/doc/changelog.md CHANGED
@@ -886,4 +886,7 @@ enh: Environment: add useHash property to configure Angular router to use hash U
886
886
  - fix(app-table): `toggleSelectRow()` should not call `event.preventDefault()` otherwise checkbox will not be checked
887
887
 
888
888
  # 2.12.27
889
- - enh(app-table): implement `markForCheck()` and `detectCHanges()`
889
+ - enh(app-table): implement `markForCheck()` and `detectChanges()`
890
+
891
+ # 2.12.29
892
+ - fix(new-token-modal): Add a full form and fix save issue
@@ -2,7 +2,7 @@ var UserToken_1;
2
2
  import { __decorate } from "tslib";
3
3
  import { EntityClass } from './entity.decorators';
4
4
  import { Entity } from './entity.model';
5
- import { fromDateISOString, toDateISOString } from '../../../shared/dates';
5
+ import { DateUtils, fromDateISOString, toDateISOString } from '../../../shared/dates';
6
6
  import { isNotNil, toNumber } from '../../../shared/functions';
7
7
  export class TokenScope {
8
8
  id;
@@ -14,7 +14,8 @@ let UserToken = class UserToken extends Entity {
14
14
  static { UserToken_1 = this; }
15
15
  static fromObject;
16
16
  static equals(t1, t2) {
17
- return (isNotNil(t1.id) && t1.id === t2?.id) || (t1 && t1.pubkey && t1.pubkey === t2?.pubkey && t1.name === t2?.name);
17
+ return ((isNotNil(t1.id) && t1.id === t2?.id) ||
18
+ (t1 && t1.pubkey && t1.pubkey === t2?.pubkey && t1.name === t2?.name && DateUtils.equals(t1.expirationDate, t2?.expirationDate)));
18
19
  }
19
20
  pubkey = null;
20
21
  token = null;
@@ -53,4 +54,4 @@ UserToken = UserToken_1 = __decorate([
53
54
  EntityClass({ typename: 'UserTokenVO' })
54
55
  ], UserToken);
55
56
  export { UserToken };
56
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4ubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvcmUvc2VydmljZXMvbW9kZWwvdG9rZW4ubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLE1BQU0sRUFBeUIsTUFBTSxnQkFBZ0IsQ0FBQztBQUUvRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0UsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUUvRCxNQUFNLE9BQU8sVUFBVTtJQUNyQixFQUFFLENBQVM7SUFDWCxJQUFJLENBQVM7SUFDYixJQUFJLENBQVM7Q0FDZDtBQUVELFdBQVc7QUFFSixJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVUsU0FBUSxNQUFpQjs7SUFDOUMsTUFBTSxDQUFDLFVBQVUsQ0FBeUM7SUFFMUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFhLEVBQUUsRUFBYTtRQUN4QyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxNQUFNLEtBQUssRUFBRSxFQUFFLE1BQU0sSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUN4SCxDQUFDO0lBRUQsTUFBTSxHQUFXLElBQUksQ0FBQztJQUN0QixLQUFLLEdBQVcsSUFBSSxDQUFDO0lBQ3JCLElBQUksR0FBVyxJQUFJLENBQUM7SUFDcEIsS0FBSyxHQUFXLElBQUksQ0FBQztJQUNyQixNQUFNLEdBQWlCLElBQUksQ0FBQztJQUM1QixjQUFjLEdBQVcsSUFBSSxDQUFDO0lBQzlCLFlBQVksR0FBVyxJQUFJLENBQUM7SUFDNUIsWUFBWSxHQUFXLElBQUksQ0FBQztJQUU1QjtRQUNFLEtBQUssQ0FBQyxXQUFTLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDNUIsQ0FBQztJQUVELFFBQVEsQ0FBQyxJQUE0QjtRQUNuQyxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sQ0FBQyxjQUFjLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUM3RCxNQUFNLENBQUMsWUFBWSxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDekQsTUFBTSxDQUFDLFlBQVksR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3pELElBQUksSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO1lBQ2pCLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUN2QixDQUFDO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVELFVBQVUsQ0FBQyxNQUFXLEVBQUUsSUFBVTtRQUNoQyxLQUFLLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUM1QixJQUFJLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7UUFDNUIsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDL0QsSUFBSSxDQUFDLFlBQVksR0FBRyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDM0QsSUFBSSxDQUFDLFlBQVksR0FBRyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDN0QsQ0FBQztDQUNGLENBQUE7QUExQ1ksU0FBUztJQURyQixXQUFXLENBQUMsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7R0FDNUIsU0FBUyxDQTBDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnRpdHlDbGFzcyB9IGZyb20gJy4vZW50aXR5LmRlY29yYXRvcnMnO1xuaW1wb3J0IHsgRW50aXR5LCBFbnRpdHlBc09iamVjdE9wdGlvbnMgfSBmcm9tICcuL2VudGl0eS5tb2RlbCc7XG5pbXBvcnQgeyBNb21lbnQgfSBmcm9tICdtb21lbnQvbW9tZW50JztcbmltcG9ydCB7IGZyb21EYXRlSVNPU3RyaW5nLCB0b0RhdGVJU09TdHJpbmcgfSBmcm9tICcuLi8uLi8uLi9zaGFyZWQvZGF0ZXMnO1xuaW1wb3J0IHsgaXNOb3ROaWwsIHRvTnVtYmVyIH0gZnJvbSAnLi4vLi4vLi4vc2hhcmVkL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBUb2tlblNjb3BlIHtcbiAgaWQ6IHN0cmluZztcbiAgZmxhZzogbnVtYmVyO1xuICBuYW1lOiBzdHJpbmc7XG59XG5cbi8vIEBkeW5hbWljXG5ARW50aXR5Q2xhc3MoeyB0eXBlbmFtZTogJ1VzZXJUb2tlblZPJyB9KVxuZXhwb3J0IGNsYXNzIFVzZXJUb2tlbiBleHRlbmRzIEVudGl0eTxVc2VyVG9rZW4+IHtcbiAgc3RhdGljIGZyb21PYmplY3Q6IChzb3VyY2U6IGFueSwgb3B0cz86IGFueSkgPT4gVXNlclRva2VuO1xuXG4gIHN0YXRpYyBlcXVhbHModDE6IFVzZXJUb2tlbiwgdDI6IFVzZXJUb2tlbik6IGJvb2xlYW4ge1xuICAgIHJldHVybiAoaXNOb3ROaWwodDEuaWQpICYmIHQxLmlkID09PSB0Mj8uaWQpIHx8ICh0MSAmJiB0MS5wdWJrZXkgJiYgdDEucHVia2V5ID09PSB0Mj8ucHVia2V5ICYmIHQxLm5hbWUgPT09IHQyPy5uYW1lKTtcbiAgfVxuXG4gIHB1YmtleTogc3RyaW5nID0gbnVsbDtcbiAgdG9rZW46IHN0cmluZyA9IG51bGw7XG4gIG5hbWU6IHN0cmluZyA9IG51bGw7XG4gIGZsYWdzOiBudW1iZXIgPSBudWxsO1xuICBzY29wZXM6IFRva2VuU2NvcGVbXSA9IG51bGw7XG4gIGV4cGlyYXRpb25EYXRlOiBNb21lbnQgPSBudWxsO1xuICBsYXN0VXNlZERhdGU6IE1vbWVudCA9IG51bGw7XG4gIGNyZWF0aW9uRGF0ZTogTW9tZW50ID0gbnVsbDtcblxuICBjb25zdHJ1Y3RvcigpIHtcbiAgICBzdXBlcihVc2VyVG9rZW4uVFlQRU5BTUUpO1xuICB9XG5cbiAgYXNPYmplY3Qob3B0cz86IEVudGl0eUFzT2JqZWN0T3B0aW9ucyk6IGFueSB7XG4gICAgY29uc3QgdGFyZ2V0ID0gc3VwZXIuYXNPYmplY3Qob3B0cyk7XG4gICAgdGFyZ2V0LmV4cGlyYXRpb25EYXRlID0gdG9EYXRlSVNPU3RyaW5nKHRoaXMuZXhwaXJhdGlvbkRhdGUpO1xuICAgIHRhcmdldC5sYXN0VXNlZERhdGUgPSB0b0RhdGVJU09TdHJpbmcodGhpcy5sYXN0VXNlZERhdGUpO1xuICAgIHRhcmdldC5jcmVhdGlvbkRhdGUgPSB0b0RhdGVJU09TdHJpbmcodGhpcy5jcmVhdGlvbkRhdGUpO1xuICAgIGlmIChvcHRzPy5taW5pZnkpIHtcbiAgICAgIGRlbGV0ZSB0YXJnZXQuc2NvcGVzO1xuICAgIH1cbiAgICByZXR1cm4gdGFyZ2V0O1xuICB9XG5cbiAgZnJvbU9iamVjdChzb3VyY2U6IGFueSwgb3B0cz86IGFueSkge1xuICAgIHN1cGVyLmZyb21PYmplY3Qoc291cmNlKTtcbiAgICB0aGlzLnB1YmtleSA9IHNvdXJjZS5wdWJrZXk7XG4gICAgdGhpcy50b2tlbiA9IHNvdXJjZS50b2tlbjtcbiAgICB0aGlzLm5hbWUgPSBzb3VyY2UubmFtZTtcbiAgICB0aGlzLmZsYWdzID0gdG9OdW1iZXIoc291cmNlLmZsYWdzKTtcbiAgICB0aGlzLnNjb3BlcyA9IHNvdXJjZS5zY29wZXM7XG4gICAgdGhpcy5leHBpcmF0aW9uRGF0ZSA9IGZyb21EYXRlSVNPU3RyaW5nKHNvdXJjZS5leHBpcmF0aW9uRGF0ZSk7XG4gICAgdGhpcy5sYXN0VXNlZERhdGUgPSBmcm9tRGF0ZUlTT1N0cmluZyhzb3VyY2UubGFzdFVzZWREYXRlKTtcbiAgICB0aGlzLmNyZWF0aW9uRGF0ZSA9IGZyb21EYXRlSVNPU3RyaW5nKHNvdXJjZS5jcmVhdGlvbkRhdGUpO1xuICB9XG59XG4iXX0=
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4ubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvcmUvc2VydmljZXMvbW9kZWwvdG9rZW4ubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLE1BQU0sRUFBeUIsTUFBTSxnQkFBZ0IsQ0FBQztBQUUvRCxPQUFPLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RGLE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFL0QsTUFBTSxPQUFPLFVBQVU7SUFDckIsRUFBRSxDQUFTO0lBQ1gsSUFBSSxDQUFTO0lBQ2IsSUFBSSxDQUFTO0NBQ2Q7QUFFRCxXQUFXO0FBRUosSUFBTSxTQUFTLEdBQWYsTUFBTSxTQUFVLFNBQVEsTUFBaUI7O0lBQzlDLE1BQU0sQ0FBQyxVQUFVLENBQXlDO0lBRTFELE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBYSxFQUFFLEVBQWE7UUFDeEMsT0FBTyxDQUNMLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUM7WUFDckMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsTUFBTSxLQUFLLEVBQUUsRUFBRSxNQUFNLElBQUksRUFBRSxDQUFDLElBQUksS0FBSyxFQUFFLEVBQUUsSUFBSSxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGNBQWMsRUFBRSxFQUFFLEVBQUUsY0FBYyxDQUFDLENBQUMsQ0FDakksQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLEdBQVcsSUFBSSxDQUFDO0lBQ3RCLEtBQUssR0FBVyxJQUFJLENBQUM7SUFDckIsSUFBSSxHQUFXLElBQUksQ0FBQztJQUNwQixLQUFLLEdBQVcsSUFBSSxDQUFDO0lBQ3JCLE1BQU0sR0FBaUIsSUFBSSxDQUFDO0lBQzVCLGNBQWMsR0FBVyxJQUFJLENBQUM7SUFDOUIsWUFBWSxHQUFXLElBQUksQ0FBQztJQUM1QixZQUFZLEdBQVcsSUFBSSxDQUFDO0lBRTVCO1FBQ0UsS0FBSyxDQUFDLFdBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM1QixDQUFDO0lBRUQsUUFBUSxDQUFDLElBQTRCO1FBQ25DLE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEMsTUFBTSxDQUFDLGNBQWMsR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQzdELE1BQU0sQ0FBQyxZQUFZLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUN6RCxNQUFNLENBQUMsWUFBWSxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDekQsSUFBSSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7WUFDakIsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQ3ZCLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsVUFBVSxDQUFDLE1BQVcsRUFBRSxJQUFVO1FBQ2hDLEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDekIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQzVCLElBQUksQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUMxQixJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUM7UUFDeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztRQUM1QixJQUFJLENBQUMsY0FBYyxHQUFHLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUMvRCxJQUFJLENBQUMsWUFBWSxHQUFHLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUMzRCxJQUFJLENBQUMsWUFBWSxHQUFHLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUM3RCxDQUFDO0NBQ0YsQ0FBQTtBQTdDWSxTQUFTO0lBRHJCLFdBQVcsQ0FBQyxFQUFFLFFBQVEsRUFBRSxhQUFhLEVBQUUsQ0FBQztHQUM1QixTQUFTLENBNkNyQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEVudGl0eUNsYXNzIH0gZnJvbSAnLi9lbnRpdHkuZGVjb3JhdG9ycyc7XG5pbXBvcnQgeyBFbnRpdHksIEVudGl0eUFzT2JqZWN0T3B0aW9ucyB9IGZyb20gJy4vZW50aXR5Lm1vZGVsJztcbmltcG9ydCB7IE1vbWVudCB9IGZyb20gJ21vbWVudC9tb21lbnQnO1xuaW1wb3J0IHsgRGF0ZVV0aWxzLCBmcm9tRGF0ZUlTT1N0cmluZywgdG9EYXRlSVNPU3RyaW5nIH0gZnJvbSAnLi4vLi4vLi4vc2hhcmVkL2RhdGVzJztcbmltcG9ydCB7IGlzTm90TmlsLCB0b051bWJlciB9IGZyb20gJy4uLy4uLy4uL3NoYXJlZC9mdW5jdGlvbnMnO1xuXG5leHBvcnQgY2xhc3MgVG9rZW5TY29wZSB7XG4gIGlkOiBzdHJpbmc7XG4gIGZsYWc6IG51bWJlcjtcbiAgbmFtZTogc3RyaW5nO1xufVxuXG4vLyBAZHluYW1pY1xuQEVudGl0eUNsYXNzKHsgdHlwZW5hbWU6ICdVc2VyVG9rZW5WTycgfSlcbmV4cG9ydCBjbGFzcyBVc2VyVG9rZW4gZXh0ZW5kcyBFbnRpdHk8VXNlclRva2VuPiB7XG4gIHN0YXRpYyBmcm9tT2JqZWN0OiAoc291cmNlOiBhbnksIG9wdHM/OiBhbnkpID0+IFVzZXJUb2tlbjtcblxuICBzdGF0aWMgZXF1YWxzKHQxOiBVc2VyVG9rZW4sIHQyOiBVc2VyVG9rZW4pOiBib29sZWFuIHtcbiAgICByZXR1cm4gKFxuICAgICAgKGlzTm90TmlsKHQxLmlkKSAmJiB0MS5pZCA9PT0gdDI/LmlkKSB8fFxuICAgICAgKHQxICYmIHQxLnB1YmtleSAmJiB0MS5wdWJrZXkgPT09IHQyPy5wdWJrZXkgJiYgdDEubmFtZSA9PT0gdDI/Lm5hbWUgJiYgRGF0ZVV0aWxzLmVxdWFscyh0MS5leHBpcmF0aW9uRGF0ZSwgdDI/LmV4cGlyYXRpb25EYXRlKSlcbiAgICApO1xuICB9XG5cbiAgcHVia2V5OiBzdHJpbmcgPSBudWxsO1xuICB0b2tlbjogc3RyaW5nID0gbnVsbDtcbiAgbmFtZTogc3RyaW5nID0gbnVsbDtcbiAgZmxhZ3M6IG51bWJlciA9IG51bGw7XG4gIHNjb3BlczogVG9rZW5TY29wZVtdID0gbnVsbDtcbiAgZXhwaXJhdGlvbkRhdGU6IE1vbWVudCA9IG51bGw7XG4gIGxhc3RVc2VkRGF0ZTogTW9tZW50ID0gbnVsbDtcbiAgY3JlYXRpb25EYXRlOiBNb21lbnQgPSBudWxsO1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIHN1cGVyKFVzZXJUb2tlbi5UWVBFTkFNRSk7XG4gIH1cblxuICBhc09iamVjdChvcHRzPzogRW50aXR5QXNPYmplY3RPcHRpb25zKTogYW55IHtcbiAgICBjb25zdCB0YXJnZXQgPSBzdXBlci5hc09iamVjdChvcHRzKTtcbiAgICB0YXJnZXQuZXhwaXJhdGlvbkRhdGUgPSB0b0RhdGVJU09TdHJpbmcodGhpcy5leHBpcmF0aW9uRGF0ZSk7XG4gICAgdGFyZ2V0Lmxhc3RVc2VkRGF0ZSA9IHRvRGF0ZUlTT1N0cmluZyh0aGlzLmxhc3RVc2VkRGF0ZSk7XG4gICAgdGFyZ2V0LmNyZWF0aW9uRGF0ZSA9IHRvRGF0ZUlTT1N0cmluZyh0aGlzLmNyZWF0aW9uRGF0ZSk7XG4gICAgaWYgKG9wdHM/Lm1pbmlmeSkge1xuICAgICAgZGVsZXRlIHRhcmdldC5zY29wZXM7XG4gICAgfVxuICAgIHJldHVybiB0YXJnZXQ7XG4gIH1cblxuICBmcm9tT2JqZWN0KHNvdXJjZTogYW55LCBvcHRzPzogYW55KSB7XG4gICAgc3VwZXIuZnJvbU9iamVjdChzb3VyY2UpO1xuICAgIHRoaXMucHVia2V5ID0gc291cmNlLnB1YmtleTtcbiAgICB0aGlzLnRva2VuID0gc291cmNlLnRva2VuO1xuICAgIHRoaXMubmFtZSA9IHNvdXJjZS5uYW1lO1xuICAgIHRoaXMuZmxhZ3MgPSB0b051bWJlcihzb3VyY2UuZmxhZ3MpO1xuICAgIHRoaXMuc2NvcGVzID0gc291cmNlLnNjb3BlcztcbiAgICB0aGlzLmV4cGlyYXRpb25EYXRlID0gZnJvbURhdGVJU09TdHJpbmcoc291cmNlLmV4cGlyYXRpb25EYXRlKTtcbiAgICB0aGlzLmxhc3RVc2VkRGF0ZSA9IGZyb21EYXRlSVNPU3RyaW5nKHNvdXJjZS5sYXN0VXNlZERhdGUpO1xuICAgIHRoaXMuY3JlYXRpb25EYXRlID0gZnJvbURhdGVJU09TdHJpbmcoc291cmNlLmNyZWF0aW9uRGF0ZSk7XG4gIH1cbn1cbiJdfQ==
@@ -17780,7 +17780,8 @@ let UserToken = class UserToken extends Entity {
17780
17780
  static { UserToken_1 = this; }
17781
17781
  static fromObject;
17782
17782
  static equals(t1, t2) {
17783
- return (isNotNil(t1.id) && t1.id === t2?.id) || (t1 && t1.pubkey && t1.pubkey === t2?.pubkey && t1.name === t2?.name);
17783
+ return ((isNotNil(t1.id) && t1.id === t2?.id) ||
17784
+ (t1 && t1.pubkey && t1.pubkey === t2?.pubkey && t1.name === t2?.name && DateUtils.equals(t1.expirationDate, t2?.expirationDate)));
17784
17785
  }
17785
17786
  pubkey = null;
17786
17787
  token = null;