@webda/core 1.5.2 → 1.6.0-beta.3
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/lib/application.d.ts +0 -7
- package/lib/application.js +33 -27
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +23 -2
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +20 -2
- package/lib/core.js +74 -34
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +5 -5
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +12 -7
- package/lib/index.js +12 -7
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +63 -5
- package/lib/models/aclmodel.js +115 -12
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +65 -19
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +22 -6
- package/lib/models/coremodel.js +14 -6
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +0 -1
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +5 -0
- package/lib/models/ident.js +6 -0
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +3 -0
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.js +1 -2
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/user.d.ts +30 -0
- package/lib/models/user.js +34 -2
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +18 -0
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +0 -1
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +27 -0
- package/lib/queues/pubsubservice.js +21 -0
- package/lib/queues/pubsubservice.js.map +1 -0
- package/lib/queues/queueservice.d.ts +3 -16
- package/lib/queues/queueservice.js +2 -13
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.js +1 -1
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +1 -1
- package/lib/router.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +35 -1
- package/lib/services/authentication.js +55 -5
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +9 -0
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.js +15 -10
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +1 -1
- package/lib/services/configuration.d.ts +9 -0
- package/lib/services/configuration.js +27 -2
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +19 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.spec.js +2 -2
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +10 -3
- package/lib/services/debugmailer.js +18 -4
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +1 -0
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/filebinary.spec.js +0 -1
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +7 -1
- package/lib/services/fileconfiguration.js +9 -0
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +81 -2
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +196 -0
- package/lib/services/invitationservice.js +441 -0
- package/lib/services/invitationservice.js.map +1 -0
- package/lib/services/invitationservice.spec.d.ts +1 -0
- package/lib/services/invitationservice.spec.js +516 -0
- package/lib/services/invitationservice.spec.js.map +1 -0
- package/lib/services/kubernetesconfiguration.d.ts +6 -0
- package/lib/services/kubernetesconfiguration.js +13 -0
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +31 -7
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +93 -3
- package/lib/services/mailer.js +55 -11
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +30 -1
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +74 -0
- package/lib/services/notificationservice.js +89 -0
- package/lib/services/notificationservice.js.map +1 -0
- package/lib/services/notificationservice.spec.d.ts +1 -0
- package/lib/services/notificationservice.spec.js +104 -0
- package/lib/services/notificationservice.spec.js.map +1 -0
- package/lib/services/oauth.spec.js +7 -10
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/service.d.ts +20 -4
- package/lib/services/service.js +35 -5
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +26 -0
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +43 -0
- package/lib/stores/aggregator.js +106 -0
- package/lib/stores/aggregator.js.map +1 -0
- package/lib/stores/file.d.ts +1 -1
- package/lib/stores/file.js +5 -5
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +48 -19
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +151 -0
- package/lib/stores/mapper.js +320 -0
- package/lib/stores/mapper.js.map +1 -0
- package/lib/stores/mapper.spec.d.ts +1 -0
- package/lib/stores/mapper.spec.js +174 -0
- package/lib/stores/mapper.spec.js.map +1 -0
- package/lib/stores/memory.js +0 -3
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -1
- package/lib/stores/memory.spec.js +12 -0
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +30 -109
- package/lib/stores/store.js +57 -285
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +10 -0
- package/lib/stores/store.spec.js +41 -14
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/test.d.ts +2 -1
- package/lib/test.js +21 -3
- package/lib/test.js.map +1 -1
- package/lib/utils/context.d.ts +12 -1
- package/lib/utils/context.js +21 -5
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +6 -1
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +12 -0
- package/lib/utils/cookie.js +29 -19
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +0 -1
- package/lib/utils/cookie.spec.js.map +1 -1
- package/package.json +9 -7
- package/test/config-file-no-reload.json +70 -0
- package/test/config-file-reload.json +7 -1
- package/test/config-invitation.json +63 -0
- package/test/config-kube-reload.json +7 -1
- package/test/config.json +35 -23
- package/test/config.old-default.json +0 -16
- package/test/config.old.json +0 -16
|
@@ -0,0 +1,516 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
const assert = require("assert");
|
|
19
|
+
const mocha_1 = require("@testdeck/mocha");
|
|
20
|
+
const test_1 = require("../test");
|
|
21
|
+
const aclmodel_1 = require("../models/aclmodel");
|
|
22
|
+
const invitationservice_1 = require("./invitationservice");
|
|
23
|
+
const sinon = require("sinon");
|
|
24
|
+
class MyCompany extends aclmodel_1.AclModel {
|
|
25
|
+
canAct(ctx, action) {
|
|
26
|
+
const _super = Object.create(null, {
|
|
27
|
+
canAct: { get: () => super.canAct }
|
|
28
|
+
});
|
|
29
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
if (action === "create") {
|
|
31
|
+
return this;
|
|
32
|
+
}
|
|
33
|
+
return _super.canAct.call(this, ctx, action);
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
let InvitationTest = class InvitationTest extends test_1.WebdaTest {
|
|
38
|
+
getTestConfiguration() {
|
|
39
|
+
return process.cwd() + "/test/config-invitation.json";
|
|
40
|
+
}
|
|
41
|
+
before() {
|
|
42
|
+
const _super = Object.create(null, {
|
|
43
|
+
before: { get: () => super.before }
|
|
44
|
+
});
|
|
45
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
yield _super.before.call(this);
|
|
47
|
+
this.service = new invitationservice_1.default(this.webda, "invit", {
|
|
48
|
+
modelStore: "Companies",
|
|
49
|
+
invitationStore: "Invitations",
|
|
50
|
+
attribute: "__acl",
|
|
51
|
+
mapAttribute: "_companies",
|
|
52
|
+
pendingAttribute: "__invitations",
|
|
53
|
+
notificationService: "DebugMailer",
|
|
54
|
+
mapFields: ["name"]
|
|
55
|
+
});
|
|
56
|
+
this.webda.getServices()["invit"] = this.service;
|
|
57
|
+
this.store = this.webda.getService("Companies");
|
|
58
|
+
this.store._model = MyCompany;
|
|
59
|
+
this.invitations = this.webda.getService("Invitations");
|
|
60
|
+
this.authentication = this.webda.getService("Authentication");
|
|
61
|
+
this.mailer = this.webda.getService("DebugMailer");
|
|
62
|
+
this.service.resolve();
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
params() {
|
|
66
|
+
let p = new invitationservice_1.InvitationParameters({
|
|
67
|
+
mapFields: "test,test2",
|
|
68
|
+
attribute: "_attr"
|
|
69
|
+
});
|
|
70
|
+
assert.deepStrictEqual(p.mapFields, ["test", "test2"]);
|
|
71
|
+
assert.strictEqual(p.pendingAttribute, "_attrPending");
|
|
72
|
+
assert.strictEqual(p.multiple, true);
|
|
73
|
+
assert.strictEqual(p.authenticationService, "Authentication");
|
|
74
|
+
assert.throws(() => new invitationservice_1.InvitationParameters({
|
|
75
|
+
attribute: "plop"
|
|
76
|
+
}), /needs to start with a _/);
|
|
77
|
+
assert.throws(() => new invitationservice_1.InvitationParameters({
|
|
78
|
+
attribute: "_plop",
|
|
79
|
+
pendingAttribute: "bouzouf"
|
|
80
|
+
}), /needs to start with a _/);
|
|
81
|
+
assert.throws(() => new invitationservice_1.InvitationParameters({
|
|
82
|
+
autoAccept: true,
|
|
83
|
+
multiple: false,
|
|
84
|
+
fields: "test,test2",
|
|
85
|
+
attribute: "_attr"
|
|
86
|
+
}), /You cannot have multiple=false with autoAccept=true/);
|
|
87
|
+
}
|
|
88
|
+
initNoTemplate() {
|
|
89
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
let stub = sinon.stub(this.mailer, "hasNotification").callsFake(() => __awaiter(this, void 0, void 0, function* () { return false; }));
|
|
91
|
+
try {
|
|
92
|
+
this.service.getParameters().notification = "plop";
|
|
93
|
+
yield assert.rejects(() => this.service.init(), /Email template should exist/);
|
|
94
|
+
}
|
|
95
|
+
finally {
|
|
96
|
+
stub.restore();
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
inviteOnMissing() {
|
|
101
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
+
let ctx = yield this.newContext();
|
|
103
|
+
yield assert.rejects(() => this.execute(ctx, "test.webda.io", "POST", `/companies/unknown/invitations`, {}), /404/);
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
inviteOnAclWithAutoAccept() {
|
|
107
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
108
|
+
this.service.getParameters().autoAccept = true;
|
|
109
|
+
this.service.getParameters().notification = "COMPANY_INVITE";
|
|
110
|
+
sinon.stub(this.service.notificationService, "sendNotification").callsFake(() => __awaiter(this, void 0, void 0, function* () { }));
|
|
111
|
+
// New model as owner
|
|
112
|
+
let ctx = yield this.newContext();
|
|
113
|
+
let user = yield this.authentication.getUserStore().save({ displayName: "Webda.io Test" });
|
|
114
|
+
ctx.getSession().userId = user.getUuid();
|
|
115
|
+
let res = yield this.execute(ctx, "test.webda.io", "POST", "/companies", { name: "MyTestCompany" });
|
|
116
|
+
const company = yield this.store.get(res.uuid);
|
|
117
|
+
// Auto register 2 users
|
|
118
|
+
yield this.authentication.createUserWithIdent("email", "test1@webda.io");
|
|
119
|
+
yield this.authentication.createUserWithIdent("email", "test2@webda.io");
|
|
120
|
+
const ident1 = yield this.authentication.getIdentStore().get(`test1@webda.io_email`);
|
|
121
|
+
const ident2 = yield this.authentication.getIdentStore().get(`test2@webda.io_email`);
|
|
122
|
+
// Add four users to the ACL
|
|
123
|
+
// 2 unregistered , 2 registered
|
|
124
|
+
yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
|
|
125
|
+
idents: ["test1@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
|
|
126
|
+
users: [ident2.getUser(), "unknown"],
|
|
127
|
+
metadata: "read"
|
|
128
|
+
});
|
|
129
|
+
yield company.refresh();
|
|
130
|
+
assert.deepStrictEqual(company.__acl, {
|
|
131
|
+
[ident1.getUser()]: "read",
|
|
132
|
+
[ident2.getUser()]: "read",
|
|
133
|
+
[user.getUuid()]: "all"
|
|
134
|
+
});
|
|
135
|
+
let getter = yield this.execute(ctx, "test.webda.io", "GET", `/companies/${company.getUuid()}/invitations`);
|
|
136
|
+
// @ts-ignore
|
|
137
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
138
|
+
"ident_test3@webda.io_email": "read",
|
|
139
|
+
"ident_test4@webda.io_email": "read"
|
|
140
|
+
});
|
|
141
|
+
// @ts-ignore
|
|
142
|
+
assert.deepStrictEqual(company.__invitations, getter);
|
|
143
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
|
|
144
|
+
{
|
|
145
|
+
uuid: "test3@webda.io_email_invit",
|
|
146
|
+
metadata: "read",
|
|
147
|
+
inviter: {
|
|
148
|
+
uuid: user.getUuid(),
|
|
149
|
+
displayName: "Webda.io Test"
|
|
150
|
+
}
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
uuid: "test4@webda.io_email_invit",
|
|
154
|
+
metadata: "read",
|
|
155
|
+
inviter: {
|
|
156
|
+
uuid: user.getUuid(),
|
|
157
|
+
displayName: "Webda.io Test"
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
]);
|
|
161
|
+
// Reinviting should be handled and metadata overwritten
|
|
162
|
+
yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
|
|
163
|
+
idents: ["test2@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
|
|
164
|
+
users: [ident1.getUser()],
|
|
165
|
+
metadata: "read,write"
|
|
166
|
+
});
|
|
167
|
+
yield company.refresh();
|
|
168
|
+
assert.deepStrictEqual(company.__acl, {
|
|
169
|
+
[ident1.getUser()]: "read,write",
|
|
170
|
+
[ident2.getUser()]: "read,write",
|
|
171
|
+
[user.getUuid()]: "all"
|
|
172
|
+
});
|
|
173
|
+
let userCheck = yield this.authentication.getUserStore().get(ident1.getUser());
|
|
174
|
+
assert.deepStrictEqual(userCheck["_companies"], [
|
|
175
|
+
{
|
|
176
|
+
inviter: {
|
|
177
|
+
displayName: "Webda.io Test",
|
|
178
|
+
uuid: user.getUuid()
|
|
179
|
+
},
|
|
180
|
+
metadata: {
|
|
181
|
+
name: "MyTestCompany"
|
|
182
|
+
},
|
|
183
|
+
model: company.getUuid(),
|
|
184
|
+
pending: false
|
|
185
|
+
}
|
|
186
|
+
]);
|
|
187
|
+
// @ts-ignore
|
|
188
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
189
|
+
"ident_test3@webda.io_email": "read,write",
|
|
190
|
+
"ident_test4@webda.io_email": "read,write"
|
|
191
|
+
});
|
|
192
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
|
|
193
|
+
{
|
|
194
|
+
uuid: "test3@webda.io_email_invit",
|
|
195
|
+
metadata: "read,write",
|
|
196
|
+
inviter: {
|
|
197
|
+
uuid: user.getUuid(),
|
|
198
|
+
displayName: "Webda.io Test"
|
|
199
|
+
}
|
|
200
|
+
},
|
|
201
|
+
{
|
|
202
|
+
uuid: "test4@webda.io_email_invit",
|
|
203
|
+
metadata: "read,write",
|
|
204
|
+
inviter: {
|
|
205
|
+
uuid: user.getUuid(),
|
|
206
|
+
displayName: "Webda.io Test"
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
]);
|
|
210
|
+
// Remove 1 unregistered and one registered from the ACL
|
|
211
|
+
yield this.execute(ctx, "test.webda.io", "DELETE", `/companies/${company.getUuid()}/invitations`, {
|
|
212
|
+
idents: ["test1@webda.io_email", "test3@webda.io_email"]
|
|
213
|
+
});
|
|
214
|
+
yield company.refresh();
|
|
215
|
+
assert.deepStrictEqual(company.__acl, {
|
|
216
|
+
[ident2.getUser()]: "read,write",
|
|
217
|
+
[user.getUuid()]: "all"
|
|
218
|
+
});
|
|
219
|
+
// @ts-ignore
|
|
220
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
221
|
+
"ident_test4@webda.io_email": "read,write"
|
|
222
|
+
});
|
|
223
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
|
|
224
|
+
{ uuid: "test3@webda.io_email_invit" },
|
|
225
|
+
{
|
|
226
|
+
uuid: "test4@webda.io_email_invit",
|
|
227
|
+
metadata: "read,write",
|
|
228
|
+
inviter: {
|
|
229
|
+
uuid: user.getUuid(),
|
|
230
|
+
displayName: "Webda.io Test"
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
]);
|
|
234
|
+
// Missing model
|
|
235
|
+
yield this.invitations.setAttribute("test4@webda.io_email_invit", "invit_test", "all");
|
|
236
|
+
// Register user 3 and 4
|
|
237
|
+
yield this.authentication.createUserWithIdent("email", "test3@webda.io");
|
|
238
|
+
yield this.authentication.createUserWithIdent("email", "test4@webda.io");
|
|
239
|
+
const ident3 = yield this.authentication.getIdentStore().get(`test3@webda.io_email`);
|
|
240
|
+
const ident4 = yield this.authentication.getIdentStore().get(`test4@webda.io_email`);
|
|
241
|
+
yield company.refresh();
|
|
242
|
+
assert.deepStrictEqual(company.__acl, {
|
|
243
|
+
[ident2.getUser()]: "read,write",
|
|
244
|
+
[ident4.getUser()]: "read,write",
|
|
245
|
+
[user.getUuid()]: "all"
|
|
246
|
+
});
|
|
247
|
+
// @ts-ignore
|
|
248
|
+
assert.deepStrictEqual(company.__invitations, {});
|
|
249
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => ({
|
|
250
|
+
uuid: i.getUuid(),
|
|
251
|
+
metadata: i[this.service.getInvitationAttribute(company.getUuid())]
|
|
252
|
+
})), []);
|
|
253
|
+
userCheck = yield this.authentication.getUserStore().get(ident3.getUser());
|
|
254
|
+
assert.deepStrictEqual(userCheck["_companies"] || [], []);
|
|
255
|
+
userCheck = yield this.authentication.getUserStore().get(ident4.getUser());
|
|
256
|
+
assert.deepStrictEqual(userCheck["_companies"], [
|
|
257
|
+
{
|
|
258
|
+
inviter: {
|
|
259
|
+
displayName: "Webda.io Test",
|
|
260
|
+
uuid: user.getUuid()
|
|
261
|
+
},
|
|
262
|
+
metadata: {
|
|
263
|
+
name: "MyTestCompany"
|
|
264
|
+
},
|
|
265
|
+
model: company.getUuid(),
|
|
266
|
+
pending: false
|
|
267
|
+
}
|
|
268
|
+
]);
|
|
269
|
+
});
|
|
270
|
+
}
|
|
271
|
+
inviteOnAclWithoutAutoAccept() {
|
|
272
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
273
|
+
this.service.getParameters().autoAccept = false;
|
|
274
|
+
// New model as owner
|
|
275
|
+
let ctx = yield this.newContext();
|
|
276
|
+
let user = yield this.authentication.getUserStore().save({
|
|
277
|
+
displayName: "Webda.io Test"
|
|
278
|
+
});
|
|
279
|
+
ctx.getSession().userId = user.getUuid();
|
|
280
|
+
let res = yield this.execute(ctx, "test.webda.io", "POST", "/companies", { name: "MyTestCompany" });
|
|
281
|
+
const company = yield this.store.get(res.uuid);
|
|
282
|
+
// Auto register 2 users
|
|
283
|
+
yield this.authentication.createUserWithIdent("email", "test1@webda.io");
|
|
284
|
+
yield this.authentication.createUserWithIdent("email", "test2@webda.io");
|
|
285
|
+
const ident1 = yield this.authentication.getIdentStore().get(`test1@webda.io_email`);
|
|
286
|
+
const ident2 = yield this.authentication.getIdentStore().get(`test2@webda.io_email`);
|
|
287
|
+
// Add four users to the ACL
|
|
288
|
+
// 2 unregistered , 2 registered
|
|
289
|
+
yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
|
|
290
|
+
idents: ["test1@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
|
|
291
|
+
users: [ident2.getUser()],
|
|
292
|
+
metadata: "read"
|
|
293
|
+
});
|
|
294
|
+
yield company.refresh();
|
|
295
|
+
assert.deepStrictEqual(company.__acl, {
|
|
296
|
+
[user.getUuid()]: "all"
|
|
297
|
+
});
|
|
298
|
+
// @ts-ignore
|
|
299
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
300
|
+
[`user_${ident1.getUser()}`]: "read",
|
|
301
|
+
[`user_${ident2.getUser()}`]: "read",
|
|
302
|
+
"ident_test3@webda.io_email": "read",
|
|
303
|
+
"ident_test4@webda.io_email": "read"
|
|
304
|
+
});
|
|
305
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
|
|
306
|
+
{
|
|
307
|
+
uuid: "test3@webda.io_email_invit",
|
|
308
|
+
metadata: "read",
|
|
309
|
+
inviter: {
|
|
310
|
+
uuid: user.getUuid(),
|
|
311
|
+
displayName: "Webda.io Test"
|
|
312
|
+
}
|
|
313
|
+
},
|
|
314
|
+
{
|
|
315
|
+
uuid: "test4@webda.io_email_invit",
|
|
316
|
+
metadata: "read",
|
|
317
|
+
inviter: {
|
|
318
|
+
uuid: user.getUuid(),
|
|
319
|
+
displayName: "Webda.io Test"
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
]);
|
|
323
|
+
let userCheck = yield this.authentication.getUserStore().get(ident1.getUser());
|
|
324
|
+
assert.deepStrictEqual(userCheck["_companies"], [
|
|
325
|
+
{
|
|
326
|
+
inviter: {
|
|
327
|
+
displayName: "Webda.io Test",
|
|
328
|
+
uuid: user.getUuid()
|
|
329
|
+
},
|
|
330
|
+
metadata: {
|
|
331
|
+
name: "MyTestCompany"
|
|
332
|
+
},
|
|
333
|
+
model: company.getUuid(),
|
|
334
|
+
pending: true
|
|
335
|
+
}
|
|
336
|
+
]);
|
|
337
|
+
yield userCheck.update({
|
|
338
|
+
_companies: [
|
|
339
|
+
{
|
|
340
|
+
model: "Test"
|
|
341
|
+
},
|
|
342
|
+
...userCheck["_companies"]
|
|
343
|
+
]
|
|
344
|
+
});
|
|
345
|
+
// Accepting the invite for user1
|
|
346
|
+
let ctx2 = yield this.newContext();
|
|
347
|
+
ctx2.getSession().userId = ident1.getUser();
|
|
348
|
+
yield assert.rejects(() => this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {}), /400/);
|
|
349
|
+
yield this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
|
|
350
|
+
accept: true
|
|
351
|
+
});
|
|
352
|
+
yield company.refresh();
|
|
353
|
+
assert.deepStrictEqual(company.__acl, {
|
|
354
|
+
[ident1.getUser()]: "read",
|
|
355
|
+
[user.getUuid()]: "all"
|
|
356
|
+
});
|
|
357
|
+
// Reinviting should be handled and metadata overwritten
|
|
358
|
+
yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
|
|
359
|
+
idents: ["test1@webda.io_email", "test2@webda.io_email", "test3@webda.io_email", "test4@webda.io_email"],
|
|
360
|
+
metadata: "read,write"
|
|
361
|
+
});
|
|
362
|
+
yield company.refresh();
|
|
363
|
+
assert.deepStrictEqual(company.__acl, {
|
|
364
|
+
[ident1.getUser()]: "read",
|
|
365
|
+
[user.getUuid()]: "all"
|
|
366
|
+
});
|
|
367
|
+
// @ts-ignore
|
|
368
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
369
|
+
[`user_${ident2.getUser()}`]: "read,write",
|
|
370
|
+
"ident_test3@webda.io_email": "read,write",
|
|
371
|
+
"ident_test4@webda.io_email": "read,write"
|
|
372
|
+
});
|
|
373
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
|
|
374
|
+
{
|
|
375
|
+
uuid: "test3@webda.io_email_invit",
|
|
376
|
+
metadata: "read,write",
|
|
377
|
+
inviter: {
|
|
378
|
+
uuid: user.getUuid(),
|
|
379
|
+
displayName: "Webda.io Test"
|
|
380
|
+
}
|
|
381
|
+
},
|
|
382
|
+
{
|
|
383
|
+
uuid: "test4@webda.io_email_invit",
|
|
384
|
+
metadata: "read,write",
|
|
385
|
+
inviter: {
|
|
386
|
+
uuid: user.getUuid(),
|
|
387
|
+
displayName: "Webda.io Test"
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
]);
|
|
391
|
+
// Remove 1 unregistered and one registered from the ACL
|
|
392
|
+
yield this.execute(ctx, "test.webda.io", "DELETE", `/companies/${company.getUuid()}/invitations`, {
|
|
393
|
+
idents: ["test3@webda.io_email"],
|
|
394
|
+
users: [ident1.getUser(), ident2.getUser()]
|
|
395
|
+
});
|
|
396
|
+
yield company.refresh();
|
|
397
|
+
assert.deepStrictEqual(company.__acl, {
|
|
398
|
+
[user.getUuid()]: "all"
|
|
399
|
+
});
|
|
400
|
+
// @ts-ignore
|
|
401
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
402
|
+
"ident_test4@webda.io_email": "read,write"
|
|
403
|
+
});
|
|
404
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), [
|
|
405
|
+
{ uuid: "test3@webda.io_email_invit" },
|
|
406
|
+
{
|
|
407
|
+
uuid: "test4@webda.io_email_invit",
|
|
408
|
+
metadata: "read,write",
|
|
409
|
+
inviter: {
|
|
410
|
+
uuid: user.getUuid(),
|
|
411
|
+
displayName: "Webda.io Test"
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
]);
|
|
415
|
+
userCheck = yield this.authentication.getUserStore().get(ident1.getUser());
|
|
416
|
+
assert.deepStrictEqual(userCheck["_companies"], [
|
|
417
|
+
{
|
|
418
|
+
model: "Test"
|
|
419
|
+
}
|
|
420
|
+
]);
|
|
421
|
+
userCheck = yield this.authentication.getUserStore().get(ident2.getUser());
|
|
422
|
+
assert.deepStrictEqual(userCheck["_companies"], []);
|
|
423
|
+
// Missing model
|
|
424
|
+
yield this.invitations.setAttribute("test4@webda.io_email_invit", "invit_test", "all");
|
|
425
|
+
// Register user 3 and 4
|
|
426
|
+
yield this.authentication.createUserWithIdent("email", "test3@webda.io");
|
|
427
|
+
yield this.authentication.createUserWithIdent("email", "test4@webda.io");
|
|
428
|
+
yield this.authentication.getIdentStore().get(`test3@webda.io_email`);
|
|
429
|
+
const ident4 = yield this.authentication.getIdentStore().get(`test4@webda.io_email`);
|
|
430
|
+
yield company.refresh();
|
|
431
|
+
assert.deepStrictEqual(company.__acl, {
|
|
432
|
+
[user.getUuid()]: "all"
|
|
433
|
+
});
|
|
434
|
+
// @ts-ignore
|
|
435
|
+
assert.deepStrictEqual(company.__invitations, {
|
|
436
|
+
"ident_test4@webda.io_email": "read,write"
|
|
437
|
+
});
|
|
438
|
+
assert.deepStrictEqual((yield this.invitations.getAll()).map(i => (Object.assign({ uuid: i.getUuid() }, i[this.service.getInvitationAttribute(company.getUuid())]))), []);
|
|
439
|
+
ctx2.getSession().userId = ident4.getUser();
|
|
440
|
+
// Force refresh of user as we changed user manually
|
|
441
|
+
yield ctx2.getCurrentUser(true);
|
|
442
|
+
yield this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
|
|
443
|
+
accept: true
|
|
444
|
+
});
|
|
445
|
+
yield company.refresh();
|
|
446
|
+
assert.deepStrictEqual(company.__acl, {
|
|
447
|
+
[user.getUuid()]: "all",
|
|
448
|
+
[ident4.getUser()]: "read,write"
|
|
449
|
+
});
|
|
450
|
+
// @ts-ignore
|
|
451
|
+
assert.deepStrictEqual(company.__invitations, {});
|
|
452
|
+
});
|
|
453
|
+
}
|
|
454
|
+
invitationDeletedModel() {
|
|
455
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
456
|
+
this.service.getParameters().autoAccept = false;
|
|
457
|
+
// New model as owner
|
|
458
|
+
let ctx = yield this.newContext();
|
|
459
|
+
let user = yield this.authentication.getUserStore().save({
|
|
460
|
+
displayName: "Webda.io Test"
|
|
461
|
+
});
|
|
462
|
+
ctx.getSession().userId = user.getUuid();
|
|
463
|
+
let res = yield this.execute(ctx, "test.webda.io", "POST", "/companies", { name: "MyTestCompany" });
|
|
464
|
+
const company = yield this.store.get(res.uuid);
|
|
465
|
+
// Auto register 2 users
|
|
466
|
+
yield this.authentication.createUserWithIdent("email", "test1@webda.io");
|
|
467
|
+
const ident1 = yield this.authentication.getIdentStore().get(`test1@webda.io_email`);
|
|
468
|
+
// Add two users to the ACL
|
|
469
|
+
// 1 unregistered , 1 registered
|
|
470
|
+
yield this.execute(ctx, "test.webda.io", "POST", `/companies/${company.getUuid()}/invitations`, {
|
|
471
|
+
idents: ["test2@webda.io_email"],
|
|
472
|
+
users: [ident1.getUser()],
|
|
473
|
+
metadata: "read"
|
|
474
|
+
});
|
|
475
|
+
yield company.delete();
|
|
476
|
+
let checkUser = yield this.authentication.getUserStore().get(ident1.getUser());
|
|
477
|
+
assert.strictEqual(checkUser["_companies"].length, 1);
|
|
478
|
+
// Accepting the invite for user1
|
|
479
|
+
let ctx2 = yield this.newContext();
|
|
480
|
+
ctx2.getSession().userId = ident1.getUser();
|
|
481
|
+
// It should be removed and get a 410 error code
|
|
482
|
+
yield assert.rejects(() => this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
|
|
483
|
+
accept: true
|
|
484
|
+
}), /410/);
|
|
485
|
+
yield checkUser.refresh();
|
|
486
|
+
assert.strictEqual(checkUser["_companies"].length, 0);
|
|
487
|
+
// Register pending one
|
|
488
|
+
yield this.authentication.createUserWithIdent("email", "test2@webda.io");
|
|
489
|
+
const ident2 = yield this.authentication.getIdentStore().get(`test2@webda.io_email`);
|
|
490
|
+
checkUser = yield this.authentication.getUserStore().get(ident2.getUser());
|
|
491
|
+
assert.strictEqual(checkUser["_companies"].length, 0);
|
|
492
|
+
});
|
|
493
|
+
}
|
|
494
|
+
};
|
|
495
|
+
__decorate([
|
|
496
|
+
mocha_1.test
|
|
497
|
+
], InvitationTest.prototype, "params", null);
|
|
498
|
+
__decorate([
|
|
499
|
+
mocha_1.test
|
|
500
|
+
], InvitationTest.prototype, "initNoTemplate", null);
|
|
501
|
+
__decorate([
|
|
502
|
+
mocha_1.test
|
|
503
|
+
], InvitationTest.prototype, "inviteOnMissing", null);
|
|
504
|
+
__decorate([
|
|
505
|
+
mocha_1.test
|
|
506
|
+
], InvitationTest.prototype, "inviteOnAclWithAutoAccept", null);
|
|
507
|
+
__decorate([
|
|
508
|
+
mocha_1.test
|
|
509
|
+
], InvitationTest.prototype, "inviteOnAclWithoutAutoAccept", null);
|
|
510
|
+
__decorate([
|
|
511
|
+
mocha_1.test
|
|
512
|
+
], InvitationTest.prototype, "invitationDeletedModel", null);
|
|
513
|
+
InvitationTest = __decorate([
|
|
514
|
+
mocha_1.suite
|
|
515
|
+
], InvitationTest);
|
|
516
|
+
//# sourceMappingURL=invitationservice.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invitationservice.spec.js","sourceRoot":"","sources":["../../src/services/invitationservice.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,12 @@ export declare class KubernetesConfigurationService<T extends ConfigurationServi
|
|
|
8
8
|
* @ignore
|
|
9
9
|
*/
|
|
10
10
|
init(): Promise<void>;
|
|
11
|
+
/**
|
|
12
|
+
* Read the file and store it
|
|
13
|
+
*/
|
|
14
|
+
initConfiguration(): Promise<{
|
|
15
|
+
[key: string]: any;
|
|
16
|
+
}>;
|
|
11
17
|
/**
|
|
12
18
|
* Load configuration from a ConfigMap or a Secret
|
|
13
19
|
* @override
|
|
@@ -38,6 +38,14 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
|
|
|
38
38
|
yield this.checkUpdate();
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* Read the file and store it
|
|
43
|
+
*/
|
|
44
|
+
initConfiguration() {
|
|
45
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
return this.loadAndStoreConfiguration();
|
|
47
|
+
});
|
|
48
|
+
}
|
|
41
49
|
/**
|
|
42
50
|
* Load configuration from a ConfigMap or a Secret
|
|
43
51
|
* @override
|
|
@@ -45,9 +53,11 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
|
|
|
45
53
|
loadConfiguration() {
|
|
46
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
55
|
let result = {};
|
|
56
|
+
let found = 0;
|
|
48
57
|
fs.readdirSync(this.parameters.source)
|
|
49
58
|
.filter(f => !f.startsWith("."))
|
|
50
59
|
.forEach(f => {
|
|
60
|
+
found++;
|
|
51
61
|
let filePath = path.join(this.parameters.source, f);
|
|
52
62
|
// Auto parse JSON and YAML
|
|
53
63
|
if (f.match(/\.(json|ya?ml)$/i)) {
|
|
@@ -57,6 +67,9 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
|
|
|
57
67
|
result[f] = fs.readFileSync(filePath, "utf-8");
|
|
58
68
|
}
|
|
59
69
|
});
|
|
70
|
+
if (found === 0) {
|
|
71
|
+
return undefined;
|
|
72
|
+
}
|
|
60
73
|
this.log("TRACE", "loadConfiguration", result);
|
|
61
74
|
return result;
|
|
62
75
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,SAAS,CAAC;aAClB;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;AAhED,wEAgEC"}
|