unleash-server 4.20.0-beta.4 → 4.20.0-beta.5
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/lib/db/account-store.d.ts +25 -0
- package/dist/lib/db/account-store.js +143 -0
- package/dist/lib/db/account-store.js.map +1 -0
- package/dist/lib/db/environment-store.d.ts +1 -1
- package/dist/lib/db/environment-store.js +4 -1
- package/dist/lib/db/environment-store.js.map +1 -1
- package/dist/lib/db/event-store.d.ts +4 -0
- package/dist/lib/db/event-store.js +14 -0
- package/dist/lib/db/event-store.js.map +1 -1
- package/dist/lib/db/index.js +2 -0
- package/dist/lib/db/index.js.map +1 -1
- package/dist/lib/db/project-store.js +1 -0
- package/dist/lib/db/project-store.js.map +1 -1
- package/dist/lib/db/user-store.d.ts +0 -2
- package/dist/lib/db/user-store.js +3 -30
- package/dist/lib/db/user-store.js.map +1 -1
- package/dist/lib/middleware/pat-middleware.d.ts +1 -1
- package/dist/lib/middleware/pat-middleware.js +3 -3
- package/dist/lib/middleware/pat-middleware.js.map +1 -1
- package/dist/lib/middleware/pat-middleware.test.js +14 -14
- package/dist/lib/middleware/pat-middleware.test.js.map +1 -1
- package/dist/lib/openapi/index.d.ts +429 -0
- package/dist/lib/openapi/spec/client-feature-schema.d.ts +3 -0
- package/dist/lib/openapi/spec/client-features-schema.d.ts +6 -0
- package/dist/lib/openapi/spec/export-result-schema.d.ts +249 -0
- package/dist/lib/openapi/spec/export-result-schema.js +12 -0
- package/dist/lib/openapi/spec/export-result-schema.js.map +1 -1
- package/dist/lib/openapi/spec/feature-environment-schema.d.ts +6 -0
- package/dist/lib/openapi/spec/feature-environment-schema.js +3 -0
- package/dist/lib/openapi/spec/feature-environment-schema.js.map +1 -1
- package/dist/lib/openapi/spec/feature-schema.d.ts +9 -0
- package/dist/lib/openapi/spec/feature-strategy-schema.d.ts +3 -0
- package/dist/lib/openapi/spec/feature-strategy-schema.js +3 -0
- package/dist/lib/openapi/spec/feature-strategy-schema.js.map +1 -1
- package/dist/lib/openapi/spec/features-schema.d.ts +18 -0
- package/dist/lib/openapi/spec/group-schema.d.ts +8 -0
- package/dist/lib/openapi/spec/group-user-model-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/groups-schema.d.ts +16 -0
- package/dist/lib/openapi/spec/health-overview-schema.d.ts +18 -0
- package/dist/lib/openapi/spec/health-report-schema.d.ts +18 -0
- package/dist/lib/openapi/spec/me-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/profile-schema.d.ts +9 -0
- package/dist/lib/openapi/spec/public-signup-token-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/public-signup-tokens-schema.d.ts +8 -0
- package/dist/lib/openapi/spec/state-schema.d.ts +18 -0
- package/dist/lib/openapi/spec/user-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/user-schema.js +5 -0
- package/dist/lib/openapi/spec/user-schema.js.map +1 -1
- package/dist/lib/openapi/spec/users-groups-base-schema.d.ts +16 -0
- package/dist/lib/openapi/spec/users-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/users-search-schema.d.ts +4 -0
- package/dist/lib/read-models/project-status/project-status.d.ts +20 -0
- package/dist/lib/read-models/project-status/project-status.js +72 -0
- package/dist/lib/read-models/project-status/project-status.js.map +1 -0
- package/dist/lib/read-models/project-status/project-status.test.d.ts +1 -0
- package/dist/lib/read-models/project-status/project-status.test.js +182 -0
- package/dist/lib/read-models/project-status/project-status.test.js.map +1 -0
- package/dist/lib/routes/admin-api/project/health-report.d.ts +1 -4
- package/dist/lib/routes/admin-api/project/health-report.js +0 -23
- package/dist/lib/routes/admin-api/project/health-report.js.map +1 -1
- package/dist/lib/routes/admin-api/project/index.d.ts +3 -0
- package/dist/lib/routes/admin-api/project/index.js +23 -0
- package/dist/lib/routes/admin-api/project/index.js.map +1 -1
- package/dist/lib/routes/admin-api/user-admin.d.ts +2 -1
- package/dist/lib/routes/admin-api/user-admin.js +4 -2
- package/dist/lib/routes/admin-api/user-admin.js.map +1 -1
- package/dist/lib/services/access-service.d.ts +2 -2
- package/dist/lib/services/access-service.js +4 -4
- package/dist/lib/services/access-service.js.map +1 -1
- package/dist/lib/services/account-service.d.ts +23 -0
- package/dist/lib/services/account-service.js +45 -0
- package/dist/lib/services/account-service.js.map +1 -0
- package/dist/lib/services/group-service.d.ts +2 -2
- package/dist/lib/services/group-service.js +4 -4
- package/dist/lib/services/group-service.js.map +1 -1
- package/dist/lib/services/index.js +11 -2
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/project-health-service.d.ts +4 -7
- package/dist/lib/services/project-health-service.js +3 -30
- package/dist/lib/services/project-health-service.js.map +1 -1
- package/dist/lib/services/project-service.d.ts +7 -3
- package/dist/lib/services/project-service.js +38 -6
- package/dist/lib/services/project-service.js.map +1 -1
- package/dist/lib/services/user-service.d.ts +0 -6
- package/dist/lib/services/user-service.js +0 -21
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/types/experimental.d.ts +2 -0
- package/dist/lib/types/experimental.js +2 -0
- package/dist/lib/types/experimental.js.map +1 -1
- package/dist/lib/types/model.d.ts +1 -0
- package/dist/lib/types/model.js.map +1 -1
- package/dist/lib/types/services.d.ts +2 -0
- package/dist/lib/types/stores/account-store.d.ts +16 -0
- package/dist/lib/types/stores/account-store.js +3 -0
- package/dist/lib/types/stores/account-store.js.map +1 -0
- package/dist/lib/types/stores/environment-store.d.ts +1 -1
- package/dist/lib/types/stores/event-store.d.ts +4 -0
- package/dist/lib/types/stores/feature-toggle-store.d.ts +1 -0
- package/dist/lib/types/stores/user-store.d.ts +0 -2
- package/dist/lib/types/stores.d.ts +3 -1
- package/dist/lib/types/user.d.ts +7 -1
- package/dist/lib/types/user.js +5 -1
- package/dist/lib/types/user.js.map +1 -1
- package/dist/lib/util/feature-evaluator/constraint.js +4 -1
- package/dist/lib/util/feature-evaluator/constraint.js.map +1 -1
- package/dist/test/e2e/api/admin/feature.custom-auth.e2e.test.js +1 -1
- package/dist/test/e2e/api/admin/feature.custom-auth.e2e.test.js.map +1 -1
- package/dist/test/e2e/helpers/database-init.d.ts +2 -1
- package/dist/test/e2e/helpers/database-init.js +1 -0
- package/dist/test/e2e/helpers/database-init.js.map +1 -1
- package/dist/test/e2e/services/access-service.e2e.test.js +4 -1
- package/dist/test/e2e/services/access-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/api-token-service.e2e.test.js +4 -1
- package/dist/test/e2e/services/api-token-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-health-service.e2e.test.js +2 -2
- package/dist/test/e2e/services/project-health-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-service.e2e.test.js +67 -1
- package/dist/test/e2e/services/project-service.e2e.test.js.map +1 -1
- package/dist/test/fixtures/access-service-mock.js +1 -1
- package/dist/test/fixtures/access-service-mock.js.map +1 -1
- package/dist/test/fixtures/fake-account-store.d.ts +21 -0
- package/dist/test/fixtures/fake-account-store.js +78 -0
- package/dist/test/fixtures/fake-account-store.js.map +1 -0
- package/dist/test/fixtures/fake-event-store.d.ts +4 -0
- package/dist/test/fixtures/fake-event-store.js +8 -0
- package/dist/test/fixtures/fake-event-store.js.map +1 -1
- package/dist/test/fixtures/fake-user-store.d.ts +1 -0
- package/dist/test/fixtures/fake-user-store.js +3 -0
- package/dist/test/fixtures/fake-user-store.js.map +1 -1
- package/dist/test/fixtures/store.js +2 -0
- package/dist/test/fixtures/store.js.map +1 -1
- package/frontend/build/index.html +1 -1
- package/frontend/build/static/{CreateProject-a4f04092.js → CreateProject-86f55844.js} +1 -1
- package/frontend/build/static/{ExpandMore-b5ab1953.js → ExpandMore-a50af4ae.js} +1 -1
- package/frontend/build/static/{FeatureArchiveDialog-20fdd8ed.js → FeatureArchiveDialog-8866ee90.js} +1 -1
- package/frontend/build/static/{FeatureMetricsChart-bf869fe2.js → FeatureMetricsChart-856007d1.js} +1 -1
- package/frontend/build/static/{FeatureViewLazyExport-3afdab3f.js → FeatureViewLazyExport-046a4ff9.js} +2 -2
- package/frontend/build/static/{LazyAdminExport-324f6362.js → LazyAdminExport-6771bc4b.js} +17 -17
- package/frontend/build/static/LazyProjectExport-778d8e5e.js +6 -0
- package/frontend/build/static/{NetworkOverview-86efaa85.js → NetworkOverview-671ed8c5.js} +1 -1
- package/frontend/build/static/{NetworkTraffic-09823340.js → NetworkTraffic-bca4b0f1.js} +1 -1
- package/frontend/build/static/{Playground-3a887394.js → Playground-aeddf3dd.js} +1 -1
- package/frontend/build/static/{StrategyItemContainer-7daf0666.js → StrategyItemContainer-37f6a166.js} +1 -1
- package/frontend/build/static/{chartjs-adapter-date-fns.esm-087a63d2.js → chartjs-adapter-date-fns.esm-1f605735.js} +1 -1
- package/frontend/build/static/{index-b22b5960.js → index-bd4aa357.js} +1 -1
- package/frontend/build/static/{index-31dfe7e0.js → index-d051088f.js} +62 -62
- package/frontend/build/static/{index-5b4dadbc.js → index-f2f3d72a.js} +1 -1
- package/frontend/build/static/{unknownify-1c72d6ee.js → unknownify-e0bb32f6.js} +1 -1
- package/frontend/build/static/{useProjectRole-383d2fcb.js → useProjectRole-10187977.js} +1 -1
- package/frontend/package.json +1 -1
- package/package.json +3 -3
- package/frontend/build/static/LazyProjectExport-70ed052e.js +0 -6
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Knex } from 'knex';
|
|
2
|
+
import { LogProvider } from '../logger';
|
|
3
|
+
import User from '../types/user';
|
|
4
|
+
import { IUserLookup } from '../types/stores/user-store';
|
|
5
|
+
import { IAccountStore } from '../types';
|
|
6
|
+
export declare class AccountStore implements IAccountStore {
|
|
7
|
+
private db;
|
|
8
|
+
private logger;
|
|
9
|
+
constructor(db: Knex, getLogger: LogProvider);
|
|
10
|
+
buildSelectAccount(q: IUserLookup): any;
|
|
11
|
+
activeAccounts(): any;
|
|
12
|
+
hasAccount(idQuery: IUserLookup): Promise<number | undefined>;
|
|
13
|
+
getAll(): Promise<User[]>;
|
|
14
|
+
search(query: string): Promise<User[]>;
|
|
15
|
+
getAllWithId(userIdList: number[]): Promise<User[]>;
|
|
16
|
+
getByQuery(idQuery: IUserLookup): Promise<User>;
|
|
17
|
+
delete(id: number): Promise<void>;
|
|
18
|
+
deleteAll(): Promise<void>;
|
|
19
|
+
count(): Promise<number>;
|
|
20
|
+
destroy(): void;
|
|
21
|
+
exists(id: number): Promise<boolean>;
|
|
22
|
+
get(id: number): Promise<User>;
|
|
23
|
+
getAccountByPersonalAccessToken(secret: string): Promise<User>;
|
|
24
|
+
markSeenAt(secrets: string[]): Promise<void>;
|
|
25
|
+
}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.AccountStore = void 0;
|
|
7
|
+
const user_1 = __importDefault(require("../types/user"));
|
|
8
|
+
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
9
|
+
const TABLE = 'users';
|
|
10
|
+
const USER_COLUMNS_PUBLIC = [
|
|
11
|
+
'id',
|
|
12
|
+
'name',
|
|
13
|
+
'username',
|
|
14
|
+
'email',
|
|
15
|
+
'image_url',
|
|
16
|
+
'seen_at',
|
|
17
|
+
'is_service',
|
|
18
|
+
];
|
|
19
|
+
const USER_COLUMNS = [...USER_COLUMNS_PUBLIC, 'login_attempts', 'created_at'];
|
|
20
|
+
const emptify = (value) => {
|
|
21
|
+
if (!value) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
return value;
|
|
25
|
+
};
|
|
26
|
+
const safeToLower = (s) => (s ? s.toLowerCase() : s);
|
|
27
|
+
const rowToUser = (row) => {
|
|
28
|
+
if (!row) {
|
|
29
|
+
throw new notfound_error_1.default('No user found');
|
|
30
|
+
}
|
|
31
|
+
return new user_1.default({
|
|
32
|
+
id: row.id,
|
|
33
|
+
name: emptify(row.name),
|
|
34
|
+
username: emptify(row.username),
|
|
35
|
+
email: emptify(row.email),
|
|
36
|
+
imageUrl: emptify(row.image_url),
|
|
37
|
+
loginAttempts: row.login_attempts,
|
|
38
|
+
seenAt: row.seen_at,
|
|
39
|
+
createdAt: row.created_at,
|
|
40
|
+
isService: row.is_service,
|
|
41
|
+
});
|
|
42
|
+
};
|
|
43
|
+
class AccountStore {
|
|
44
|
+
constructor(db, getLogger) {
|
|
45
|
+
this.db = db;
|
|
46
|
+
this.logger = getLogger('account-store.ts');
|
|
47
|
+
}
|
|
48
|
+
buildSelectAccount(q) {
|
|
49
|
+
const query = this.activeAccounts();
|
|
50
|
+
if (q.id) {
|
|
51
|
+
return query.where('id', q.id);
|
|
52
|
+
}
|
|
53
|
+
if (q.email) {
|
|
54
|
+
return query.where('email', safeToLower(q.email));
|
|
55
|
+
}
|
|
56
|
+
if (q.username) {
|
|
57
|
+
return query.where('username', q.username);
|
|
58
|
+
}
|
|
59
|
+
throw new Error('Can only find users with id, username or email.');
|
|
60
|
+
}
|
|
61
|
+
activeAccounts() {
|
|
62
|
+
return this.db(TABLE).where({
|
|
63
|
+
deleted_at: null,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
async hasAccount(idQuery) {
|
|
67
|
+
const query = this.buildSelectAccount(idQuery);
|
|
68
|
+
const item = await query.first('id');
|
|
69
|
+
return item ? item.id : undefined;
|
|
70
|
+
}
|
|
71
|
+
async getAll() {
|
|
72
|
+
const users = await this.activeAccounts().select(USER_COLUMNS);
|
|
73
|
+
return users.map(rowToUser);
|
|
74
|
+
}
|
|
75
|
+
async search(query) {
|
|
76
|
+
const users = await this.activeAccounts()
|
|
77
|
+
.select(USER_COLUMNS_PUBLIC)
|
|
78
|
+
.where('name', 'ILIKE', `%${query}%`)
|
|
79
|
+
.orWhere('username', 'ILIKE', `${query}%`)
|
|
80
|
+
.orWhere('email', 'ILIKE', `${query}%`);
|
|
81
|
+
return users.map(rowToUser);
|
|
82
|
+
}
|
|
83
|
+
async getAllWithId(userIdList) {
|
|
84
|
+
const users = await this.activeAccounts()
|
|
85
|
+
.select(USER_COLUMNS_PUBLIC)
|
|
86
|
+
.whereIn('id', userIdList);
|
|
87
|
+
return users.map(rowToUser);
|
|
88
|
+
}
|
|
89
|
+
async getByQuery(idQuery) {
|
|
90
|
+
const row = await this.buildSelectAccount(idQuery).first(USER_COLUMNS);
|
|
91
|
+
return rowToUser(row);
|
|
92
|
+
}
|
|
93
|
+
async delete(id) {
|
|
94
|
+
return this.activeAccounts()
|
|
95
|
+
.where({ id })
|
|
96
|
+
.update({
|
|
97
|
+
deleted_at: new Date(),
|
|
98
|
+
email: null,
|
|
99
|
+
username: null,
|
|
100
|
+
name: this.db.raw('name || ?', '(Deleted)'),
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
async deleteAll() {
|
|
104
|
+
await this.activeAccounts().del();
|
|
105
|
+
}
|
|
106
|
+
async count() {
|
|
107
|
+
return this.activeAccounts()
|
|
108
|
+
.count('*')
|
|
109
|
+
.then((res) => Number(res[0].count));
|
|
110
|
+
}
|
|
111
|
+
destroy() { }
|
|
112
|
+
async exists(id) {
|
|
113
|
+
const result = await this.db.raw(`SELECT EXISTS (SELECT 1 FROM ${TABLE} WHERE id = ? and deleted_at = null) AS present`, [id]);
|
|
114
|
+
const { present } = result.rows[0];
|
|
115
|
+
return present;
|
|
116
|
+
}
|
|
117
|
+
async get(id) {
|
|
118
|
+
const row = await this.activeAccounts().where({ id }).first();
|
|
119
|
+
return rowToUser(row);
|
|
120
|
+
}
|
|
121
|
+
async getAccountByPersonalAccessToken(secret) {
|
|
122
|
+
const row = await this.activeAccounts()
|
|
123
|
+
.select(USER_COLUMNS.map((column) => `${TABLE}.${column}`))
|
|
124
|
+
.leftJoin('personal_access_tokens', 'personal_access_tokens.user_id', `${TABLE}.id`)
|
|
125
|
+
.where('secret', secret)
|
|
126
|
+
.andWhere('expires_at', '>', 'now()')
|
|
127
|
+
.first();
|
|
128
|
+
return rowToUser(row);
|
|
129
|
+
}
|
|
130
|
+
async markSeenAt(secrets) {
|
|
131
|
+
const now = new Date();
|
|
132
|
+
try {
|
|
133
|
+
await this.db('personal_access_tokens')
|
|
134
|
+
.whereIn('secret', secrets)
|
|
135
|
+
.update({ seen_at: now });
|
|
136
|
+
}
|
|
137
|
+
catch (err) {
|
|
138
|
+
this.logger.error('Could not update lastSeen, error: ', err);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
exports.AccountStore = AccountStore;
|
|
143
|
+
//# sourceMappingURL=account-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-store.js","sourceRoot":"","sources":["../../../src/lib/db/account-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export default class EnvironmentStore implements IEnvironmentStore {
|
|
|
15
15
|
get(key: string): Promise<IEnvironment>;
|
|
16
16
|
getAll(query?: Object): Promise<IEnvironment[]>;
|
|
17
17
|
getAllWithCounts(query?: Object): Promise<IEnvironment[]>;
|
|
18
|
-
getProjectEnvironments(projectId: string): Promise<IProjectEnvironment[]>;
|
|
18
|
+
getProjectEnvironments(projectId: string, query?: Object): Promise<IProjectEnvironment[]>;
|
|
19
19
|
exists(name: string): Promise<boolean>;
|
|
20
20
|
getByName(name: string): Promise<IEnvironment>;
|
|
21
21
|
updateProperty(id: string, field: string, value: string | number): Promise<void>;
|
|
@@ -118,13 +118,16 @@ class EnvironmentStore {
|
|
|
118
118
|
const rows = await qB;
|
|
119
119
|
return rows.map(mapRowWithCounts);
|
|
120
120
|
}
|
|
121
|
-
async getProjectEnvironments(projectId) {
|
|
121
|
+
async getProjectEnvironments(projectId, query) {
|
|
122
122
|
let qB = this.db(TABLE)
|
|
123
123
|
.select('*', this.db.raw('(SELECT COUNT(*) FROM api_tokens LEFT JOIN api_token_project ON api_tokens.secret = api_token_project.secret WHERE api_tokens.environment = environments.name AND (project = :projectId OR project IS null)) as project_api_token_count', { projectId }), this.db.raw('(SELECT COUNT(*) FROM feature_environments INNER JOIN features on feature_environments.feature_name = features.name WHERE enabled=true AND feature_environments.environment = environments.name AND project = :projectId) as project_enabled_toggle_count', { projectId }))
|
|
124
124
|
.orderBy([
|
|
125
125
|
{ column: 'sort_order', order: 'asc' },
|
|
126
126
|
{ column: 'created_at', order: 'asc' },
|
|
127
127
|
]);
|
|
128
|
+
if (query) {
|
|
129
|
+
qB = qB.where(query);
|
|
130
|
+
}
|
|
128
131
|
const rows = await qB;
|
|
129
132
|
return rows.map(mapRowWithProjectCounts);
|
|
130
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/environment-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/environment-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,10 @@ declare class EventStore extends AnyEventEmitter implements IEventStore {
|
|
|
29
29
|
deleteAll(): Promise<void>;
|
|
30
30
|
destroy(): void;
|
|
31
31
|
exists(key: number): Promise<boolean>;
|
|
32
|
+
getForFeatures(features: string[], environments: string[], query: {
|
|
33
|
+
type: string;
|
|
34
|
+
projectId: string;
|
|
35
|
+
}): Promise<IEvent[]>;
|
|
32
36
|
get(key: number): Promise<IEvent>;
|
|
33
37
|
getAll(query?: Object): Promise<IEvent[]>;
|
|
34
38
|
getEvents(query?: Object): Promise<IEvent[]>;
|
|
@@ -86,6 +86,20 @@ class EventStore extends anyEventEmitter_1.AnyEventEmitter {
|
|
|
86
86
|
const { present } = result.rows[0];
|
|
87
87
|
return present;
|
|
88
88
|
}
|
|
89
|
+
async getForFeatures(features, environments, query) {
|
|
90
|
+
try {
|
|
91
|
+
const rows = await this.db
|
|
92
|
+
.select(EVENT_COLUMNS)
|
|
93
|
+
.from(TABLE)
|
|
94
|
+
.where({ type: query.type, project: query.projectId })
|
|
95
|
+
.whereIn('feature_name', features)
|
|
96
|
+
.whereIn('environment', environments);
|
|
97
|
+
return rows.map(this.rowToEvent);
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
return [];
|
|
101
|
+
}
|
|
102
|
+
}
|
|
89
103
|
async get(key) {
|
|
90
104
|
const row = await this.db(TABLE).where({ id: key }).first();
|
|
91
105
|
return this.rowToEvent(row);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-store.js","sourceRoot":"","sources":["../../../src/lib/db/event-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"event-store.js","sourceRoot":"","sources":["../../../src/lib/db/event-store.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/db/index.js
CHANGED
|
@@ -36,6 +36,7 @@ const pat_store_1 = __importDefault(require("./pat-store"));
|
|
|
36
36
|
const public_signup_token_store_1 = require("./public-signup-token-store");
|
|
37
37
|
const favorite_features_store_1 = require("./favorite-features-store");
|
|
38
38
|
const favorite_projects_store_1 = require("./favorite-projects-store");
|
|
39
|
+
const account_store_1 = require("./account-store");
|
|
39
40
|
const createStores = (config, db) => {
|
|
40
41
|
const { getLogger, eventBus } = config;
|
|
41
42
|
const eventStore = new event_store_1.default(db, getLogger);
|
|
@@ -50,6 +51,7 @@ const createStores = (config, db) => {
|
|
|
50
51
|
contextFieldStore: new context_field_store_1.default(db, getLogger),
|
|
51
52
|
settingStore: new setting_store_1.default(db, getLogger),
|
|
52
53
|
userStore: new user_store_1.default(db, getLogger),
|
|
54
|
+
accountStore: new account_store_1.AccountStore(db, getLogger),
|
|
53
55
|
projectStore: new project_store_1.default(db, eventBus, getLogger, config.flagResolver),
|
|
54
56
|
tagStore: new tag_store_1.default(db, eventBus, getLogger),
|
|
55
57
|
tagTypeStore: new tag_type_store_1.default(db, eventBus, getLogger),
|
package/dist/lib/db/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":";;;;;;AAIA,gEAAuC;AACvC,kFAAwD;AACxD,8EAAoD;AACpD,sEAA6C;AAC7C,oFAA0D;AAC1D,4FAAkE;AAClE,gFAAsD;AACtD,oEAA2C;AAC3C,8DAAqC;AACrC,oEAA2C;AAC3C,4DAAmC;AACnC,sEAA4C;AAC5C,gEAAuC;AACvC,uDAAkD;AAClD,oEAA2C;AAC3C,iDAA6C;AAC7C,2DAAsD;AACtD,gFAAsD;AACtD,sFAA4D;AAC5D,gGAAqE;AACrE,4EAAmD;AACnD,4EAAkD;AAClD,2EAAsE;AACtE,uEAAiE;AACjE,4EAAkD;AAClD,8DAAqC;AACrC,oEAA2C;AAC3C,gEAAuC;AACvC,4DAAmC;AACnC,2EAAqE;AACrE,uEAAkE;AAClE,uEAAkE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ class ProjectStore {
|
|
|
44
44
|
const projectTimer = this.timer('getProjectsWithCount');
|
|
45
45
|
let projects = this.db(TABLE)
|
|
46
46
|
.leftJoin('features', 'features.project', 'projects.id')
|
|
47
|
+
.where('features.archived_at', null)
|
|
47
48
|
.orderBy('projects.name', 'asc');
|
|
48
49
|
if (query) {
|
|
49
50
|
projects = projects.where(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-store.js","sourceRoot":"","sources":["../../../src/lib/db/project-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-store.js","sourceRoot":"","sources":["../../../src/lib/db/project-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,5 @@ declare class UserStore implements IUserStore {
|
|
|
27
27
|
destroy(): void;
|
|
28
28
|
exists(id: number): Promise<boolean>;
|
|
29
29
|
get(id: number): Promise<User>;
|
|
30
|
-
getUserByPersonalAccessToken(secret: string): Promise<User>;
|
|
31
|
-
markSeenAt(secrets: string[]): Promise<void>;
|
|
32
30
|
}
|
|
33
31
|
export default UserStore;
|
|
@@ -7,16 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
const user_1 = __importDefault(require("../types/user"));
|
|
8
8
|
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
9
9
|
const TABLE = 'users';
|
|
10
|
-
const USER_COLUMNS = [
|
|
11
|
-
'id',
|
|
12
|
-
'name',
|
|
13
|
-
'username',
|
|
14
|
-
'email',
|
|
15
|
-
'image_url',
|
|
16
|
-
'login_attempts',
|
|
17
|
-
'seen_at',
|
|
18
|
-
'created_at',
|
|
19
|
-
];
|
|
20
10
|
const USER_COLUMNS_PUBLIC = [
|
|
21
11
|
'id',
|
|
22
12
|
'name',
|
|
@@ -24,7 +14,9 @@ const USER_COLUMNS_PUBLIC = [
|
|
|
24
14
|
'email',
|
|
25
15
|
'image_url',
|
|
26
16
|
'seen_at',
|
|
17
|
+
'is_service',
|
|
27
18
|
];
|
|
19
|
+
const USER_COLUMNS = [...USER_COLUMNS_PUBLIC, 'login_attempts', 'created_at'];
|
|
28
20
|
const emptify = (value) => {
|
|
29
21
|
if (!value) {
|
|
30
22
|
return undefined;
|
|
@@ -51,6 +43,7 @@ const rowToUser = (row) => {
|
|
|
51
43
|
loginAttempts: row.login_attempts,
|
|
52
44
|
seenAt: row.seen_at,
|
|
53
45
|
createdAt: row.created_at,
|
|
46
|
+
isService: row.is_service,
|
|
54
47
|
});
|
|
55
48
|
};
|
|
56
49
|
class UserStore {
|
|
@@ -179,26 +172,6 @@ class UserStore {
|
|
|
179
172
|
const row = await this.activeUsers().where({ id }).first();
|
|
180
173
|
return rowToUser(row);
|
|
181
174
|
}
|
|
182
|
-
async getUserByPersonalAccessToken(secret) {
|
|
183
|
-
const row = await this.activeAll()
|
|
184
|
-
.select(USER_COLUMNS.map((column) => `${TABLE}.${column}`))
|
|
185
|
-
.leftJoin('personal_access_tokens', 'personal_access_tokens.user_id', `${TABLE}.id`)
|
|
186
|
-
.where('secret', secret)
|
|
187
|
-
.andWhere('expires_at', '>', 'now()')
|
|
188
|
-
.first();
|
|
189
|
-
return rowToUser(row);
|
|
190
|
-
}
|
|
191
|
-
async markSeenAt(secrets) {
|
|
192
|
-
const now = new Date();
|
|
193
|
-
try {
|
|
194
|
-
await this.db('personal_access_tokens')
|
|
195
|
-
.whereIn('secret', secrets)
|
|
196
|
-
.update({ seen_at: now });
|
|
197
|
-
}
|
|
198
|
-
catch (err) {
|
|
199
|
-
this.logger.error('Could not update lastSeen, error: ', err);
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
175
|
}
|
|
203
176
|
module.exports = UserStore;
|
|
204
177
|
exports.default = UserStore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-store.js","sourceRoot":"","sources":["../../../src/lib/db/user-store.ts"],"names":[],"mappings":";AAAA,6BAA6B;;;;;AAI7B,yDAAiC;AAEjC,6EAAoD;AAQpD,MAAM,KAAK,GAAG,OAAO,CAAC;AAEtB,MAAM,
|
|
1
|
+
{"version":3,"file":"user-store.js","sourceRoot":"","sources":["../../../src/lib/db/user-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { IUnleashConfig } from '../types';
|
|
2
|
-
declare const patMiddleware: ({ getLogger }: Pick<IUnleashConfig, 'getLogger'>, {
|
|
2
|
+
declare const patMiddleware: ({ getLogger }: Pick<IUnleashConfig, 'getLogger'>, { accountService }: any) => any;
|
|
3
3
|
export default patMiddleware;
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
4
|
-
const patMiddleware = ({ getLogger }, {
|
|
4
|
+
const patMiddleware = ({ getLogger }, { accountService }) => {
|
|
5
5
|
const logger = getLogger('/middleware/pat-middleware.ts');
|
|
6
6
|
logger.debug('Enabling PAT middleware');
|
|
7
7
|
return async (req, res, next) => {
|
|
8
8
|
try {
|
|
9
9
|
const apiToken = req.header('authorization');
|
|
10
10
|
if (apiToken?.startsWith('user:')) {
|
|
11
|
-
const user = await
|
|
11
|
+
const user = await accountService.getAccountByPersonalAccessToken(apiToken);
|
|
12
12
|
req.user = user;
|
|
13
|
-
|
|
13
|
+
accountService.addPATSeen(apiToken);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.ts"],"names":[],"mappings":";;AAGA,sEAAsE;AACtE,MAAM,aAAa,GAAG,CAClB,EAAE,SAAS,EAAqC,EAChD,EAAE,
|
|
1
|
+
{"version":3,"file":"pat-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.ts"],"names":[],"mappings":";;AAGA,sEAAsE;AACtE,MAAM,aAAa,GAAG,CAClB,EAAE,SAAS,EAAqC,EAChD,EAAE,cAAc,EAAO,EACpB,EAAE;IACL,MAAM,MAAM,GAAG,SAAS,CAAC,+BAA+B,CAAC,CAAC;IAC1D,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAExC,OAAO,KAAK,EAAE,GAAiB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1C,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC7C,IAAI,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC/B,MAAM,IAAI,GACN,MAAM,cAAc,CAAC,+BAA+B,CAChD,QAAQ,CACX,CAAC;gBACN,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;gBAChB,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACvC;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACvB;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -16,10 +16,10 @@ beforeEach(() => {
|
|
|
16
16
|
};
|
|
17
17
|
});
|
|
18
18
|
test('should not set user if unknown token', async () => {
|
|
19
|
-
const
|
|
20
|
-
|
|
19
|
+
const accountService = {
|
|
20
|
+
getAccountByPersonalAccessToken: jest.fn(),
|
|
21
21
|
};
|
|
22
|
-
const func = (0, pat_middleware_1.default)(config, {
|
|
22
|
+
const func = (0, pat_middleware_1.default)(config, { accountService });
|
|
23
23
|
const cb = jest.fn();
|
|
24
24
|
const req = {
|
|
25
25
|
header: jest.fn().mockReturnValue('user:some-token'),
|
|
@@ -31,17 +31,17 @@ test('should not set user if unknown token', async () => {
|
|
|
31
31
|
expect(req.user).toBeFalsy();
|
|
32
32
|
});
|
|
33
33
|
test('should not set user if token wrong format', async () => {
|
|
34
|
-
const
|
|
35
|
-
|
|
34
|
+
const accountService = {
|
|
35
|
+
getAccountByPersonalAccessToken: jest.fn(),
|
|
36
36
|
};
|
|
37
|
-
const func = (0, pat_middleware_1.default)(config, {
|
|
37
|
+
const func = (0, pat_middleware_1.default)(config, { accountService });
|
|
38
38
|
const cb = jest.fn();
|
|
39
39
|
const req = {
|
|
40
40
|
header: jest.fn().mockReturnValue('token-not-starting-with-user'),
|
|
41
41
|
user: undefined,
|
|
42
42
|
};
|
|
43
43
|
await func(req, undefined, cb);
|
|
44
|
-
expect(
|
|
44
|
+
expect(accountService.getAccountByPersonalAccessToken).not.toHaveBeenCalled();
|
|
45
45
|
expect(cb).toHaveBeenCalled();
|
|
46
46
|
expect(req.header).toHaveBeenCalled();
|
|
47
47
|
expect(req.user).toBeFalsy();
|
|
@@ -51,10 +51,10 @@ test('should add user if known token', async () => {
|
|
|
51
51
|
id: 44,
|
|
52
52
|
username: 'my-user',
|
|
53
53
|
});
|
|
54
|
-
const
|
|
55
|
-
|
|
54
|
+
const accountService = {
|
|
55
|
+
getAccountByPersonalAccessToken: jest.fn().mockReturnValue(apiUser),
|
|
56
56
|
};
|
|
57
|
-
const func = (0, pat_middleware_1.default)(config, {
|
|
57
|
+
const func = (0, pat_middleware_1.default)(config, { accountService });
|
|
58
58
|
const cb = jest.fn();
|
|
59
59
|
const req = {
|
|
60
60
|
header: jest.fn().mockReturnValue('user:some-known-token'),
|
|
@@ -66,14 +66,14 @@ test('should add user if known token', async () => {
|
|
|
66
66
|
expect(req.header).toHaveBeenCalled();
|
|
67
67
|
expect(req.user).toBe(apiUser);
|
|
68
68
|
});
|
|
69
|
-
test('should call next if
|
|
69
|
+
test('should call next if accountService throws exception', async () => {
|
|
70
70
|
no_logger_1.default.setMuteError(true);
|
|
71
|
-
const
|
|
72
|
-
|
|
71
|
+
const accountService = {
|
|
72
|
+
getAccountByPersonalAccessToken: () => {
|
|
73
73
|
throw new Error('Error occurred');
|
|
74
74
|
},
|
|
75
75
|
};
|
|
76
|
-
const func = (0, pat_middleware_1.default)(config, {
|
|
76
|
+
const func = (0, pat_middleware_1.default)(config, { accountService });
|
|
77
77
|
const cb = jest.fn();
|
|
78
78
|
const req = {
|
|
79
79
|
header: jest.fn().mockReturnValue('user:some-token'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-middleware.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.test.ts"],"names":[],"mappings":";;;;;AAAA,8EAAsD;AACtD,sEAA6C;AAC7C,yDAAiC;AAEjC,IAAI,MAAW,CAAC;AAEhB,UAAU,CAAC,GAAG,EAAE;IACZ,MAAM,GAAG;QACL,SAAS,EAAT,mBAAS;QACT,YAAY,EAAE;YACV,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;SAC7C;KACJ,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,
|
|
1
|
+
{"version":3,"file":"pat-middleware.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/pat-middleware.test.ts"],"names":[],"mappings":";;;;;AAAA,8EAAsD;AACtD,sEAA6C;AAC7C,yDAAiC;AAEjC,IAAI,MAAW,CAAC;AAEhB,UAAU,CAAC,GAAG,EAAE;IACZ,MAAM,GAAG;QACL,SAAS,EAAT,mBAAS;QACT,YAAY,EAAE;YACV,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;SAC7C;KACJ,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,cAAc,GAAG;QACnB,+BAA+B,EAAE,IAAI,CAAC,EAAE,EAAE;KAC7C,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,wBAAa,EAAC,MAAM,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAEvD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAErB,MAAM,GAAG,GAAG;QACR,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,iBAAiB,CAAC;QACpD,IAAI,EAAE,SAAS;KAClB,CAAC;IAEF,MAAM,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAE/B,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;IACzD,MAAM,cAAc,GAAG;QACnB,+BAA+B,EAAE,IAAI,CAAC,EAAE,EAAE;KAC7C,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,wBAAa,EAAC,MAAM,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAEvD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAErB,MAAM,GAAG,GAAG;QACR,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,8BAA8B,CAAC;QACjE,IAAI,EAAE,SAAS;KAClB,CAAC;IAEF,MAAM,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAE/B,MAAM,CACF,cAAc,CAAC,+BAA+B,CACjD,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;IAC9C,MAAM,OAAO,GAAG,IAAI,cAAI,CAAC;QACrB,EAAE,EAAE,EAAE;QACN,QAAQ,EAAE,SAAS;KACtB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG;QACnB,+BAA+B,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC;KACtE,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,wBAAa,EAAC,MAAM,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAEvD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAErB,MAAM,GAAG,GAAG;QACR,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,uBAAuB,CAAC;QAC1D,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,aAAa;KACtB,CAAC;IAEF,MAAM,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAE/B,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;IACnE,mBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,cAAc,GAAG;QACnB,+BAA+B,EAAE,GAAG,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtC,CAAC;KACJ,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,wBAAa,EAAC,MAAM,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAEvD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAErB,MAAM,GAAG,GAAG;QACR,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,iBAAiB,CAAC;QACpD,IAAI,EAAE,SAAS;KAClB,CAAC;IAEF,MAAM,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAE/B,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9B,mBAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC"}
|