cnpmcore 3.23.2 → 3.24.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/dist/app/core/entity/Token.d.ts +3 -1
- package/dist/app/core/entity/Token.js +3 -1
- package/dist/app/core/service/TokenService.d.ts +1 -0
- package/dist/app/core/service/TokenService.js +6 -2
- package/dist/app/port/UserRoleManager.js +3 -1
- package/dist/app/port/controller/TokenController.d.ts +4 -0
- package/dist/app/port/controller/TokenController.js +5 -2
- package/dist/app/repository/model/Token.d.ts +1 -0
- package/dist/app/repository/model/Token.js +5 -1
- package/package.json +1 -1
|
@@ -12,6 +12,7 @@ interface BaseTokenData extends EntityData {
|
|
|
12
12
|
userId: string;
|
|
13
13
|
isReadonly?: boolean;
|
|
14
14
|
type?: TokenType;
|
|
15
|
+
lastUsedAt?: Date;
|
|
15
16
|
}
|
|
16
17
|
interface ClassicTokenData extends BaseTokenData {
|
|
17
18
|
isAutomation?: boolean;
|
|
@@ -25,7 +26,7 @@ interface GranularTokenData extends BaseTokenData {
|
|
|
25
26
|
expiredAt: Date;
|
|
26
27
|
}
|
|
27
28
|
type TokenData = ClassicTokenData | GranularTokenData;
|
|
28
|
-
export declare function isGranularToken(data: TokenData): data is GranularTokenData;
|
|
29
|
+
export declare function isGranularToken(data: TokenData | Token): data is GranularTokenData;
|
|
29
30
|
export declare class Token extends Entity {
|
|
30
31
|
readonly tokenId: string;
|
|
31
32
|
readonly tokenMark: string;
|
|
@@ -40,6 +41,7 @@ export declare class Token extends Entity {
|
|
|
40
41
|
readonly allowedScopes?: string[];
|
|
41
42
|
readonly expiredAt?: Date;
|
|
42
43
|
readonly expires?: number;
|
|
44
|
+
lastUsedAt: Date | null;
|
|
43
45
|
allowedPackages?: string[];
|
|
44
46
|
token?: string;
|
|
45
47
|
constructor(data: TokenData);
|
|
@@ -26,12 +26,14 @@ class Token extends Entity_1.Entity {
|
|
|
26
26
|
this.cidrWhitelist = data.cidrWhitelist || [];
|
|
27
27
|
this.isReadonly = data.isReadonly || false;
|
|
28
28
|
this.type = data.type || TokenType.classic;
|
|
29
|
+
this.lastUsedAt = data.lastUsedAt || null;
|
|
29
30
|
if (isGranularToken(data)) {
|
|
30
31
|
this.name = data.name;
|
|
31
32
|
this.description = data.description;
|
|
32
33
|
this.allowedScopes = data.allowedScopes;
|
|
33
34
|
this.expiredAt = data.expiredAt;
|
|
34
35
|
this.allowedPackages = data.allowedPackages;
|
|
36
|
+
this.isAutomation = false;
|
|
35
37
|
}
|
|
36
38
|
else {
|
|
37
39
|
this.isAutomation = data.isAutomation || false;
|
|
@@ -46,4 +48,4 @@ class Token extends Entity_1.Entity {
|
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
exports.Token = Token;
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9lbnRpdHkvVG9rZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLHFDQUE4QztBQUM5QyxtREFBMEQ7QUFFMUQsSUFBWSxTQUdYO0FBSEQsV0FBWSxTQUFTO0lBQ25CLGtDQUFxQixDQUFBO0lBQ3JCLGdDQUFtQixDQUFBO0FBQ3JCLENBQUMsRUFIVyxTQUFTLEdBQVQsaUJBQVMsS0FBVCxpQkFBUyxRQUdwQjtBQTBCRCxTQUFnQixlQUFlLENBQUMsSUFBdUI7SUFDckQsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQyxRQUFRLENBQUM7QUFDMUMsQ0FBQztBQUZELDBDQUVDO0FBRUQsTUFBYSxLQUFNLFNBQVEsZUFBTTtJQWtCL0IsWUFBWSxJQUFlO1FBQ3pCLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNaLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDNUIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUM5QixJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxhQUFhLElBQUksRUFBRSxDQUFDO1FBQzlDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLFVBQVUsSUFBSSxLQUFLLENBQUM7UUFDM0MsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLFNBQVMsQ0FBQyxPQUFPLENBQUM7UUFDM0MsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxJQUFJLElBQUksQ0FBQztRQUUxQyxJQUFJLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7WUFDdEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQztZQUN4QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDaEMsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDO1lBQzVDLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDO1NBQzNCO2FBQU07WUFDTCxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxZQUFZLElBQUksS0FBSyxDQUFDO1NBQ2hEO0lBQ0gsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBb0M7UUFDaEQsTUFBTSxPQUFPLEdBQUcsdUJBQVUsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3hELElBQUksZUFBZSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRTtZQUNsRCxPQUFPLENBQUMsU0FBUyxHQUFHLElBQUEsZUFBSyxFQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztTQUNwRjtRQUNELE9BQU8sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDNUIsQ0FBQztDQUVGO0FBakRELHNCQWlEQyJ9
|
|
@@ -6,6 +6,7 @@ export declare class TokenService extends AbstractService {
|
|
|
6
6
|
private readonly Package;
|
|
7
7
|
private readonly userRepository;
|
|
8
8
|
listTokenPackages(token: Token): Promise<PackageEntity[] | null>;
|
|
9
|
+
checkTokenExpired(token: Token): Promise<true | undefined>;
|
|
9
10
|
checkGranularTokenAccess(token: Token, fullname: string): Promise<boolean>;
|
|
10
11
|
getUserAndToken(authorization: string): Promise<{
|
|
11
12
|
token: Token;
|
|
@@ -33,7 +33,7 @@ let TokenService = class TokenService extends AbstractService_1.AbstractService
|
|
|
33
33
|
}
|
|
34
34
|
return null;
|
|
35
35
|
}
|
|
36
|
-
async
|
|
36
|
+
async checkTokenExpired(token) {
|
|
37
37
|
// skip classic token
|
|
38
38
|
if (!(0, Token_1.isGranularToken)(token)) {
|
|
39
39
|
return true;
|
|
@@ -42,6 +42,10 @@ let TokenService = class TokenService extends AbstractService_1.AbstractService
|
|
|
42
42
|
if ((0, dayjs_1.default)(token.expiredAt).isBefore(new Date())) {
|
|
43
43
|
throw new egg_errors_1.UnauthorizedError('Token expired');
|
|
44
44
|
}
|
|
45
|
+
token.lastUsedAt = new Date();
|
|
46
|
+
this.userRepository.saveToken(token);
|
|
47
|
+
}
|
|
48
|
+
async checkGranularTokenAccess(token, fullname) {
|
|
45
49
|
// check for scope whitelist
|
|
46
50
|
const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
|
|
47
51
|
// check for packages whitelist
|
|
@@ -90,4 +94,4 @@ TokenService = __decorate([
|
|
|
90
94
|
})
|
|
91
95
|
], TokenService);
|
|
92
96
|
exports.TokenService = TokenService;
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLHNDQUlxQjtBQUNyQixtQ0FBaUM7QUFDakMsa0VBQStEO0FBQy9ELDJDQUF5RDtBQUd6RCxnRkFBNkU7QUFDN0UsK0NBQTZEO0FBQzdELDJDQUErRDtBQUMvRCxpRUFBa0U7QUFDbEUsMkRBQXNEO0FBQ3RELDJFQUF3RTtBQUt4RSxJQUFhLFlBQVksR0FBekIsTUFBYSxZQUFhLFNBQVEsaUNBQWU7SUFReEMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLEtBQVk7UUFDekMsSUFBSSxJQUFBLHVCQUFlLEVBQUMsS0FBSyxDQUFDLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUN4RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3RGLE9BQU8sUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsR0FBRyxFQUFFLGlCQUFhLENBQUMsQ0FBQyxDQUFDO1NBQ3JGO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU0sS0FBSyxDQUFDLGlCQUFpQixDQUFDLEtBQVk7UUFDekMscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxJQUFBLHVCQUFlLEVBQUMsS0FBSyxDQUFDLEVBQUU7WUFDM0IsT0FB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
|
|
@@ -88,6 +88,8 @@ let UserRoleManager = class UserRoleManager {
|
|
|
88
88
|
if (!authorizedUserAndToken) {
|
|
89
89
|
return null;
|
|
90
90
|
}
|
|
91
|
+
// check token expired & set lastUsedAt
|
|
92
|
+
await this.tokenService.checkTokenExpired(authorizedUserAndToken.token);
|
|
91
93
|
this.currentAuthorizedToken = authorizedUserAndToken.token;
|
|
92
94
|
this.currentAuthorizedUser = authorizedUserAndToken.user;
|
|
93
95
|
ctx.userId = authorizedUserAndToken.user.userId;
|
|
@@ -185,4 +187,4 @@ UserRoleManager = __decorate([
|
|
|
185
187
|
})
|
|
186
188
|
], UserRoleManager);
|
|
187
189
|
exports.UserRoleManager = UserRoleManager;
|
|
188
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJvbGVNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3BvcnQvVXNlclJvbGVNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUtxQjtBQUVyQiwyQ0FBK0Q7QUFDL0QsdUVBQW9FO0FBSXBFLHVEQUF3RDtBQUN4RCxtRkFBZ0Y7QUFDaEYsK0RBQTREO0FBUzVELElBQWEsZUFBZSxHQUE1QixNQUFhLGVBQWU7SUFBNUI7UUFZVSxxQkFBZ0IsR0FBRyxLQUFLLENBQUM7SUF5Sm5DLENBQUM7SUFySkMsdUJBQXVCO0lBQ3ZCLDBCQUEwQjtJQUMxQix1Q0FBdUM7SUFDdkMscUNBQXFDO0lBQ3JDLGdFQUFnRTtJQUN6RCxLQUFLLENBQUMsa0JBQWtCLENBQUMsR0FBZSxFQUFFLFFBQWdCO1FBRS9ELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLHNCQUFzQixDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUUvRCwwQkFBMEI7UUFDMUIsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hDLElBQUksT0FBTyxFQUFFO1lBQ1gsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELHdDQUF3QztRQUN4QyxNQUFNLHNCQUFzQixHQUFHLE1BQU0sSUFBSSxDQUFDLHlCQUF5QixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pFLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxzQkFBdUIsQ0FBQztRQUMxQyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsd0JBQXdCLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBRWxFLHVDQUF1QztRQUN2QyxNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElB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
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EggContext } from '@eggjs/tegg';
|
|
2
2
|
import { Static } from '@sinclair/typebox';
|
|
3
3
|
import { AbstractController } from './AbstractController';
|
|
4
|
+
import { TokenType } from '../../core/entity/Token';
|
|
4
5
|
declare const TokenOptionsRule: import("@sinclair/typebox").TObject<{
|
|
5
6
|
password: import("@sinclair/typebox").TString;
|
|
6
7
|
readonly: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
|
|
@@ -42,6 +43,7 @@ export declare class TokenController extends AbstractController {
|
|
|
42
43
|
readonly: boolean;
|
|
43
44
|
automation: boolean;
|
|
44
45
|
created: Date;
|
|
46
|
+
lastUsedAt: Date | null;
|
|
45
47
|
updated: Date;
|
|
46
48
|
}[];
|
|
47
49
|
total: number;
|
|
@@ -66,6 +68,7 @@ export declare class TokenController extends AbstractController {
|
|
|
66
68
|
description: string | undefined;
|
|
67
69
|
allowedPackages: string[] | undefined;
|
|
68
70
|
allowedScopes: string[] | undefined;
|
|
71
|
+
lastUsedAt: Date | null;
|
|
69
72
|
expiredAt: Date | undefined;
|
|
70
73
|
token: string;
|
|
71
74
|
key: string;
|
|
@@ -73,6 +76,7 @@ export declare class TokenController extends AbstractController {
|
|
|
73
76
|
readonly: boolean;
|
|
74
77
|
created: Date;
|
|
75
78
|
updated: Date;
|
|
79
|
+
type: TokenType | undefined;
|
|
76
80
|
}[];
|
|
77
81
|
total: number;
|
|
78
82
|
urls: {};
|
|
@@ -106,6 +106,7 @@ let TokenController = class TokenController extends AbstractController_1.Abstrac
|
|
|
106
106
|
readonly: token.isReadonly,
|
|
107
107
|
automation: token.isAutomation,
|
|
108
108
|
created: token.createdAt,
|
|
109
|
+
lastUsedAt: token.lastUsedAt,
|
|
109
110
|
updated: token.updatedAt,
|
|
110
111
|
};
|
|
111
112
|
});
|
|
@@ -169,12 +170,13 @@ let TokenController = class TokenController extends AbstractController_1.Abstrac
|
|
|
169
170
|
}
|
|
170
171
|
}
|
|
171
172
|
const objects = granularTokens.map(token => {
|
|
172
|
-
const { name, description, expiredAt, allowedPackages, allowedScopes } = token;
|
|
173
|
+
const { name, description, expiredAt, allowedPackages, allowedScopes, lastUsedAt, type } = token;
|
|
173
174
|
return {
|
|
174
175
|
name,
|
|
175
176
|
description,
|
|
176
177
|
allowedPackages,
|
|
177
178
|
allowedScopes,
|
|
179
|
+
lastUsedAt,
|
|
178
180
|
expiredAt,
|
|
179
181
|
token: token.tokenMark,
|
|
180
182
|
key: token.tokenKey,
|
|
@@ -182,6 +184,7 @@ let TokenController = class TokenController extends AbstractController_1.Abstrac
|
|
|
182
184
|
readonly: token.isReadonly,
|
|
183
185
|
created: token.createdAt,
|
|
184
186
|
updated: token.updatedAt,
|
|
187
|
+
type,
|
|
185
188
|
};
|
|
186
189
|
});
|
|
187
190
|
return { objects, total: granularTokens.length, urls: {} };
|
|
@@ -272,4 +275,4 @@ TokenController = __decorate([
|
|
|
272
275
|
(0, tegg_1.HTTPController)()
|
|
273
276
|
], TokenController);
|
|
274
277
|
exports.TokenController = TokenController;
|
|
275
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
278
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TokenController.js","sourceRoot":"","sources":["../../../../app/port/controller/TokenController.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,8 +81,12 @@ __decorate([
|
|
|
81
81
|
(0, orm_1.Attribute)(leoric_1.DataTypes.DATE),
|
|
82
82
|
__metadata("design:type", Date)
|
|
83
83
|
], Token.prototype, "expiredAt", void 0);
|
|
84
|
+
__decorate([
|
|
85
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.DATE),
|
|
86
|
+
__metadata("design:type", Date)
|
|
87
|
+
], Token.prototype, "lastUsedAt", void 0);
|
|
84
88
|
Token = __decorate([
|
|
85
89
|
(0, orm_1.Model)()
|
|
86
90
|
], Token);
|
|
87
91
|
exports.Token = Token;
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9tb2RlbC9Ub2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSx5Q0FBbUQ7QUFDbkQsbUNBQXlDO0FBR3pDLElBQWEsS0FBSyxHQUFsQixNQUFhLEtBQU0sU0FBUSxhQUFJO0NBdUQ5QixDQUFBO0FBbERDO0lBSkMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLEVBQUU7UUFDM0IsT0FBTyxFQUFFLElBQUk7UUFDYixhQUFhLEVBQUUsSUFBSTtLQUNwQixDQUFDOztpQ0FDUztBQUdYO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7OEJBQ3ZDLElBQUk7d0NBQUM7QUFHaEI7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLElBQUksRUFBRSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsQ0FBQzs4QkFDekMsSUFBSTt3Q0FBQztBQUtoQjtJQUhDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFO1FBQy9CLE1BQU0sRUFBRSxJQUFJO0tBQ2IsQ0FBQzs7c0NBQ2M7QUFHaEI7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQzs7d0NBQ2Q7QUFLbEI7SUFIQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNoQyxNQUFNLEVBQUUsSUFBSTtLQUNiLENBQUM7O3VDQUNlO0FBR2pCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7O3FDQUNqQjtBQUdmO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxLQUFLLENBQUM7OzRDQUNIO0FBR3hCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxPQUFPLENBQUM7O3lDQUNUO0FBR3BCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxPQUFPLENBQUM7OzJDQUNQO0FBR3RCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7O21DQUNwQjtBQUdiO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7O21DQUNwQjtBQUdiO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7OzBDQUNiO0FBR3BCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxLQUFLLENBQUM7OzRDQUNIO0FBR3hCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxJQUFJLENBQUM7OEJBQ2YsSUFBSTt3Q0FBQztBQUdoQjtJQURDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsSUFBSSxDQUFDOzhCQUNkLElBQUk7eUNBQUM7QUF0RE4sS0FBSztJQURqQixJQUFBLFdBQUssR0FBRTtHQUNLLEtBQUssQ0F1RGpCO0FBdkRZLHNCQUFLIn0=
|