@webda/core 2.4.2 → 3.0.1
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 +171 -34
- package/lib/application.js +243 -47
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +44 -8
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +113 -54
- package/lib/core.js +222 -135
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +87 -43
- package/lib/core.spec.js.map +1 -1
- package/lib/errors.d.ts +65 -0
- package/lib/errors.js +113 -0
- package/lib/errors.js.map +1 -0
- package/lib/errors.spec.d.ts +1 -0
- package/lib/errors.spec.js +33 -0
- package/lib/errors.spec.js.map +1 -0
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +4 -4
- package/lib/models/aclmodel.js +10 -6
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +33 -24
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +284 -92
- package/lib/models/coremodel.js +403 -103
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +162 -24
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +20 -6
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ownermodel.d.ts +13 -23
- package/lib/models/ownermodel.js +24 -51
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +23 -11
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/relations.d.ts +167 -0
- package/lib/models/relations.js +113 -0
- package/lib/models/relations.js.map +1 -0
- package/lib/models/rolemodel.d.ts +3 -3
- package/lib/models/rolemodel.js +6 -6
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +12 -12
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +40 -24
- package/lib/models/user.js +74 -48
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +24 -4
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +9 -5
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +17 -8
- package/lib/router.js +81 -9
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +89 -5
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.spec.js +4 -4
- package/lib/services/authentication.d.ts +21 -22
- package/lib/services/authentication.js +90 -109
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +51 -65
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +132 -31
- package/lib/services/binary.js +257 -72
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +16 -6
- package/lib/services/binary.spec.js +44 -117
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +9 -10
- package/lib/services/cloudbinary.js +14 -15
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +2 -2
- package/lib/services/cloudbinary.spec.js +13 -12
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.js +9 -9
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +5 -7
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.spec.js +3 -4
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +2 -2
- package/lib/services/cryptoservice.js +5 -2
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/domainservice.d.ts +113 -0
- package/lib/services/domainservice.js +357 -0
- package/lib/services/domainservice.js.map +1 -0
- package/lib/services/domainservice.spec.d.ts +1 -0
- package/lib/services/domainservice.spec.js +334 -0
- package/lib/services/domainservice.spec.js.map +1 -0
- package/lib/services/echo.d.ts +2 -2
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +9 -2
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +13 -14
- package/lib/services/filebinary.js +79 -73
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +5 -0
- package/lib/services/filebinary.spec.js +222 -11
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.js +4 -4
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +23 -24
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +11 -9
- package/lib/services/invitationservice.js +17 -23
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +43 -40
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.js +12 -22
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +1 -6
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.js +1 -1
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +4 -1
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +17 -9
- package/lib/services/oauth.js +30 -4
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +32 -15
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/prometheus.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +9 -8
- package/lib/services/proxy.js +65 -36
- package/lib/services/proxy.js.map +1 -1
- package/lib/services/proxy.spec.js +28 -2
- package/lib/services/proxy.spec.js.map +1 -1
- package/lib/services/resource.d.ts +3 -3
- package/lib/services/resource.js +4 -3
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +3 -3
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +10 -13
- package/lib/services/service.js +29 -13
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +49 -11
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +2 -2
- package/lib/services/version.js.map +1 -1
- package/lib/stores/aggregator.js +1 -0
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/aliasstore.d.ts +2 -2
- package/lib/stores/aliasstore.js +15 -4
- package/lib/stores/aliasstore.js.map +1 -1
- package/lib/stores/aliasstore.spec.js +4 -2
- package/lib/stores/aliasstore.spec.js.map +1 -1
- package/lib/stores/file.d.ts +5 -2
- package/lib/stores/file.js +11 -8
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.js +21 -34
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +4 -2
- package/lib/stores/mapper.js +18 -11
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +6 -3
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +5 -2
- package/lib/stores/memory.js +11 -9
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -0
- package/lib/stores/memory.spec.js +100 -11
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +177 -87
- package/lib/stores/store.js +312 -141
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +2 -2
- package/lib/stores/store.spec.js +54 -38
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +14 -13
- package/lib/stores/webdaql/WebdaQLLexer.js +121 -112
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +14 -13
- package/lib/stores/webdaql/WebdaQLParserLexer.js +121 -112
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +15 -3
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +23 -13
- package/lib/stores/webdaql/WebdaQLParserParser.js +149 -94
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +9 -2
- package/lib/stores/webdaql/query.d.ts +6 -2
- package/lib/stores/webdaql/query.js +14 -1
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +10 -1
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +48 -19
- package/lib/test.js +171 -63
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +5 -0
- package/lib/unpackedapplication.js +58 -10
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/context.d.ts +76 -29
- package/lib/utils/context.js +91 -55
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.d.ts +9 -1
- package/lib/utils/context.spec.js +73 -8
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +4 -5
- package/lib/utils/cookie.js +1 -2
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +5 -3
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +9 -3
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/serializers.d.ts +46 -17
- package/lib/utils/serializers.js +116 -2
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +84 -20
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +14 -8
- package/lib/utils/session.js +14 -3
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.js +6 -1
- package/lib/utils/session.spec.js.map +1 -1
- package/package.json +16 -10
- package/test/cachedapp/webda.config.json +6 -1
- package/test/config-cached.json +5 -0
- package/test/config-file-missing-file.json +5 -7
- package/test/config-file-no-reload.json +5 -7
- package/test/config-file-reload.json +5 -7
- package/test/config-kube-reload.json +5 -11
- package/test/config-reload.json +2 -4
- package/test/config.json +12 -2
- package/test/moddas/voidstore.js +1 -1
- package/test/models/ident.js +6 -4
- package/test/models/task.js +4 -4
- package/webda.module.json +1587 -1266
|
@@ -7,13 +7,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { suite, test } from "@testdeck/mocha";
|
|
8
8
|
import * as assert from "assert";
|
|
9
9
|
import * as sinon from "sinon";
|
|
10
|
+
import { WebdaError } from "../errors.js";
|
|
10
11
|
import { AclModel } from "../models/aclmodel.js";
|
|
12
|
+
import { ModelMapLoaderImplementation } from "../models/relations.js";
|
|
11
13
|
import { WebdaTest } from "../test.js";
|
|
12
14
|
import InvitationService, { InvitationParameters } from "./invitationservice.js";
|
|
13
15
|
class MyCompany extends AclModel {
|
|
14
16
|
async canAct(ctx, action) {
|
|
15
17
|
if (action === "create") {
|
|
16
|
-
return
|
|
18
|
+
return;
|
|
17
19
|
}
|
|
18
20
|
return super.canAct(ctx, action);
|
|
19
21
|
}
|
|
@@ -24,18 +26,19 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
24
26
|
}
|
|
25
27
|
async before() {
|
|
26
28
|
await super.before();
|
|
27
|
-
this.
|
|
28
|
-
|
|
29
|
+
this.webda.getApplication().addModel("WebdaDemo/Company", MyCompany);
|
|
30
|
+
this.store = this.webda.getService("Companies");
|
|
31
|
+
this.store._model = MyCompany;
|
|
32
|
+
this.service = this.registerService(new InvitationService(this.webda, "invit", {
|
|
33
|
+
model: "Company",
|
|
29
34
|
invitationStore: "Invitations",
|
|
30
35
|
attribute: "__acl",
|
|
31
36
|
mapAttribute: "_companies",
|
|
32
37
|
pendingAttribute: "__invitations",
|
|
33
38
|
notificationService: "DebugMailer",
|
|
34
|
-
mapFields: ["name"]
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
this.store = this.webda.getService("Companies");
|
|
38
|
-
this.store._model = MyCompany;
|
|
39
|
+
mapFields: ["name"],
|
|
40
|
+
url: "/companies"
|
|
41
|
+
}));
|
|
39
42
|
this.invitations = this.webda.getService("Invitations");
|
|
40
43
|
this.authentication = this.webda.getService("Authentication");
|
|
41
44
|
this.mailer = this.webda.getService("DebugMailer");
|
|
@@ -65,8 +68,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
65
68
|
}), /You cannot have multiple=false with autoAccept=true/);
|
|
66
69
|
}
|
|
67
70
|
async initNoTemplate() {
|
|
68
|
-
|
|
69
|
-
let stub = sinon.stub(this.mailer, "hasNotification").callsFake(async () => false);
|
|
71
|
+
let stub = sinon.stub(this.mailer, "hasNotification").callsFake(() => false);
|
|
70
72
|
try {
|
|
71
73
|
this.service.getParameters().notification = "plop";
|
|
72
74
|
await assert.rejects(() => this.service.init(), /Email template should exist/);
|
|
@@ -77,7 +79,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
77
79
|
}
|
|
78
80
|
async inviteOnMissing() {
|
|
79
81
|
let ctx = await this.newContext();
|
|
80
|
-
await assert.rejects(() => this.execute(ctx, "test.webda.io", "POST", `/companies/unknown/invitations`, {}),
|
|
82
|
+
await assert.rejects(() => this.execute(ctx, "test.webda.io", "POST", `/companies/unknown/invitations`, {}), WebdaError.NotFound);
|
|
81
83
|
}
|
|
82
84
|
async inviteOnAclWithAutoAccept() {
|
|
83
85
|
this.service.getParameters().autoAccept = true;
|
|
@@ -87,8 +89,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
87
89
|
let ctx = await this.newContext();
|
|
88
90
|
let user = await this.authentication.getUserStore().save({ displayName: "Webda.io Test" });
|
|
89
91
|
ctx.getSession().userId = user.getUuid();
|
|
90
|
-
|
|
91
|
-
const company = await this.store.get(res.uuid);
|
|
92
|
+
const company = await MyCompany.create({ name: "MyTestCompany", __acl: { [user.getUuid()]: "all" } });
|
|
92
93
|
// Auto register 2 users
|
|
93
94
|
await this.authentication.createUserWithIdent("email", "test1@webda.io");
|
|
94
95
|
await this.authentication.createUserWithIdent("email", "test2@webda.io");
|
|
@@ -103,8 +104,8 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
103
104
|
});
|
|
104
105
|
await company.refresh();
|
|
105
106
|
assert.deepStrictEqual(company.__acl, {
|
|
106
|
-
[ident1.getUser()]: "read",
|
|
107
|
-
[ident2.getUser()]: "read",
|
|
107
|
+
[ident1.getUser().toString()]: "read",
|
|
108
|
+
[ident2.getUser().toString()]: "read",
|
|
108
109
|
[user.getUuid()]: "all"
|
|
109
110
|
});
|
|
110
111
|
let getter = await this.execute(ctx, "test.webda.io", "GET", `/companies/${company.getUuid()}/invitations`);
|
|
@@ -144,11 +145,11 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
144
145
|
});
|
|
145
146
|
await company.refresh();
|
|
146
147
|
assert.deepStrictEqual(company.__acl, {
|
|
147
|
-
[ident1.getUser()]: "read,write",
|
|
148
|
-
[ident2.getUser()]: "read,write",
|
|
148
|
+
[ident1.getUser().toString()]: "read,write",
|
|
149
|
+
[ident2.getUser().toString()]: "read,write",
|
|
149
150
|
[user.getUuid()]: "all"
|
|
150
151
|
});
|
|
151
|
-
let userCheck = await this.authentication.getUserStore().get(ident1.getUser());
|
|
152
|
+
let userCheck = await this.authentication.getUserStore().get(ident1.getUser().toString());
|
|
152
153
|
assert.deepStrictEqual(userCheck["_companies"], [
|
|
153
154
|
{
|
|
154
155
|
inviter: {
|
|
@@ -194,7 +195,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
194
195
|
});
|
|
195
196
|
await company.refresh();
|
|
196
197
|
assert.deepStrictEqual(company.__acl, {
|
|
197
|
-
[ident2.getUser()]: "read,write",
|
|
198
|
+
[ident2.getUser().toString()]: "read,write",
|
|
198
199
|
[user.getUuid()]: "all"
|
|
199
200
|
});
|
|
200
201
|
// @ts-ignore
|
|
@@ -224,8 +225,8 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
224
225
|
const ident4 = await this.authentication.getIdentStore().get(`test4@webda.io_email`);
|
|
225
226
|
await company.refresh();
|
|
226
227
|
assert.deepStrictEqual(company.__acl, {
|
|
227
|
-
[ident2.getUser()]: "read,write",
|
|
228
|
-
[ident4.getUser()]: "read,write",
|
|
228
|
+
[ident2.getUser().toString()]: "read,write",
|
|
229
|
+
[ident4.getUser().toString()]: "read,write",
|
|
229
230
|
[user.getUuid()]: "all"
|
|
230
231
|
});
|
|
231
232
|
// @ts-ignore
|
|
@@ -234,9 +235,9 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
234
235
|
uuid: i.getUuid(),
|
|
235
236
|
metadata: i[this.service.getInvitationAttribute(company.getUuid())]
|
|
236
237
|
})), []);
|
|
237
|
-
userCheck = await this.authentication.getUserStore().get(ident3.getUser());
|
|
238
|
+
userCheck = await this.authentication.getUserStore().get(ident3.getUser().toString());
|
|
238
239
|
assert.deepStrictEqual(userCheck["_companies"] || [], []);
|
|
239
|
-
userCheck = await this.authentication.getUserStore().get(ident4.getUser());
|
|
240
|
+
userCheck = await this.authentication.getUserStore().get(ident4.getUser().toString());
|
|
240
241
|
assert.deepStrictEqual(userCheck["_companies"], [
|
|
241
242
|
{
|
|
242
243
|
inviter: {
|
|
@@ -259,8 +260,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
259
260
|
displayName: "Webda.io Test"
|
|
260
261
|
});
|
|
261
262
|
ctx.getSession().userId = user.getUuid();
|
|
262
|
-
|
|
263
|
-
const company = await this.store.get(res.uuid);
|
|
263
|
+
const company = await MyCompany.create({ name: "MyTestCompany", __acl: { [user.getUuid()]: "all" } });
|
|
264
264
|
// Auto register 2 users
|
|
265
265
|
await this.authentication.createUserWithIdent("email", "test1@webda.io");
|
|
266
266
|
await this.authentication.createUserWithIdent("email", "test2@webda.io");
|
|
@@ -305,7 +305,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
305
305
|
}
|
|
306
306
|
}
|
|
307
307
|
]);
|
|
308
|
-
let userCheck = await this.authentication.getUserStore().get(ident1.getUser());
|
|
308
|
+
let userCheck = await this.authentication.getUserStore().get(ident1.getUser().toString());
|
|
309
309
|
assert.deepStrictEqual(userCheck["_companies"], [
|
|
310
310
|
{
|
|
311
311
|
inviter: {
|
|
@@ -329,14 +329,13 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
329
329
|
await userCheck.save("_companies");
|
|
330
330
|
// Accepting the invite for user1
|
|
331
331
|
let ctx2 = await this.newContext();
|
|
332
|
-
ctx2.getSession().userId = ident1.getUser();
|
|
333
|
-
await assert.rejects(() => this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {}), /400/);
|
|
332
|
+
ctx2.getSession().userId = ident1.getUser().toString();
|
|
334
333
|
await this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
|
|
335
334
|
accept: true
|
|
336
335
|
});
|
|
337
336
|
await company.refresh();
|
|
338
337
|
assert.deepStrictEqual(company.__acl, {
|
|
339
|
-
[ident1.getUser()]: "read",
|
|
338
|
+
[ident1.getUser().toString()]: "read",
|
|
340
339
|
[user.getUuid()]: "all"
|
|
341
340
|
});
|
|
342
341
|
// Reinviting should be handled and metadata overwritten
|
|
@@ -346,7 +345,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
346
345
|
});
|
|
347
346
|
await company.refresh();
|
|
348
347
|
assert.deepStrictEqual(company.__acl, {
|
|
349
|
-
[ident1.getUser()]: "read",
|
|
348
|
+
[ident1.getUser().toString()]: "read",
|
|
350
349
|
[user.getUuid()]: "all"
|
|
351
350
|
});
|
|
352
351
|
// @ts-ignore
|
|
@@ -407,13 +406,13 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
407
406
|
}
|
|
408
407
|
}
|
|
409
408
|
]);
|
|
410
|
-
userCheck = await this.authentication.getUserStore().get(ident1.getUser());
|
|
409
|
+
userCheck = await this.authentication.getUserStore().get(ident1.getUser().toString());
|
|
411
410
|
assert.deepStrictEqual(userCheck["_companies"], [
|
|
412
411
|
{
|
|
413
412
|
model: "Test"
|
|
414
413
|
}
|
|
415
414
|
]);
|
|
416
|
-
userCheck = await this.authentication.getUserStore().get(ident2.getUser());
|
|
415
|
+
userCheck = await this.authentication.getUserStore().get(ident2.getUser().toString());
|
|
417
416
|
assert.deepStrictEqual(userCheck["_companies"], []);
|
|
418
417
|
// Missing model
|
|
419
418
|
await this.invitations.setAttribute("test4@webda.io_email_invit", "invit_test", "all");
|
|
@@ -434,16 +433,21 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
434
433
|
uuid: i.getUuid(),
|
|
435
434
|
...i[this.service.getInvitationAttribute(company.getUuid())]
|
|
436
435
|
})), []);
|
|
437
|
-
ctx2.getSession().userId = ident4.getUser();
|
|
436
|
+
ctx2.getSession().userId = ident4.getUser().toString();
|
|
438
437
|
// Force refresh of user as we changed user manually
|
|
439
438
|
await ctx2.getCurrentUser(true);
|
|
439
|
+
ctx2.getCurrentUser = async () => {
|
|
440
|
+
let user = await ident4.getUser().get();
|
|
441
|
+
user.getIdents = () => [new ModelMapLoaderImplementation(ident4.__class, ident4)];
|
|
442
|
+
return user;
|
|
443
|
+
};
|
|
440
444
|
await this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
|
|
441
445
|
accept: true
|
|
442
446
|
});
|
|
443
447
|
await company.refresh();
|
|
444
448
|
assert.deepStrictEqual(company.__acl, {
|
|
445
449
|
[user.getUuid()]: "all",
|
|
446
|
-
[ident4.getUser()]: "read,write"
|
|
450
|
+
[ident4.getUser().toString()]: "read,write"
|
|
447
451
|
});
|
|
448
452
|
// @ts-ignore
|
|
449
453
|
assert.deepStrictEqual(company.__invitations, {});
|
|
@@ -456,8 +460,7 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
456
460
|
displayName: "Webda.io Test"
|
|
457
461
|
});
|
|
458
462
|
ctx.getSession().userId = user.getUuid();
|
|
459
|
-
|
|
460
|
-
const company = await this.store.get(res.uuid);
|
|
463
|
+
const company = await MyCompany.create({ name: "MyTestCompany", __acl: { [user.getUuid()]: "all" } });
|
|
461
464
|
// Auto register 2 users
|
|
462
465
|
await this.authentication.createUserWithIdent("email", "test1@webda.io");
|
|
463
466
|
const ident1 = await this.authentication.getIdentStore().get(`test1@webda.io_email`);
|
|
@@ -469,21 +472,21 @@ let InvitationTest = class InvitationTest extends WebdaTest {
|
|
|
469
472
|
metadata: "read"
|
|
470
473
|
});
|
|
471
474
|
await company.delete();
|
|
472
|
-
let checkUser = await this.authentication.getUserStore().get(ident1.getUser());
|
|
475
|
+
let checkUser = await this.authentication.getUserStore().get(ident1.getUser().toString());
|
|
473
476
|
assert.strictEqual(checkUser["_companies"].length, 1);
|
|
474
477
|
// Accepting the invite for user1
|
|
475
478
|
let ctx2 = await this.newContext();
|
|
476
|
-
ctx2.getSession().userId = ident1.getUser();
|
|
479
|
+
ctx2.getSession().userId = ident1.getUser().toString();
|
|
477
480
|
// It should be removed and get a 410 error code
|
|
478
481
|
await assert.rejects(() => this.execute(ctx2, "test.webda.io", "PUT", `/companies/${company.getUuid()}/invitations`, {
|
|
479
482
|
accept: true
|
|
480
|
-
}),
|
|
483
|
+
}), WebdaError.Gone);
|
|
481
484
|
await checkUser.refresh();
|
|
482
485
|
assert.strictEqual(checkUser["_companies"].length, 0);
|
|
483
486
|
// Register pending one
|
|
484
487
|
await this.authentication.createUserWithIdent("email", "test2@webda.io");
|
|
485
488
|
const ident2 = await this.authentication.getIdentStore().get(`test2@webda.io_email`);
|
|
486
|
-
checkUser = await this.authentication.getUserStore().get(ident2.getUser());
|
|
489
|
+
checkUser = await this.authentication.getUserStore().get(ident2.getUser().toString());
|
|
487
490
|
assert.strictEqual(checkUser["_companies"].length, 0);
|
|
488
491
|
}
|
|
489
492
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitationservice.spec.js","sourceRoot":"","sources":["../../src/services/invitationservice.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"invitationservice.spec.js","sourceRoot":"","sources":["../../src/services/invitationservice.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as fs from "fs";
|
|
2
2
|
import * as path from "path";
|
|
3
|
-
import { WebdaError } from "../
|
|
4
|
-
import {
|
|
3
|
+
import { WebdaError } from "../index.js";
|
|
4
|
+
import { FileUtils } from "../utils/serializers.js";
|
|
5
5
|
import { ConfigurationService } from "./configuration.js";
|
|
6
6
|
/**
|
|
7
7
|
* Allow for dynamic configuration from ConfigMap or Secrets
|
|
@@ -16,14 +16,14 @@ export class KubernetesConfigurationService extends ConfigurationService {
|
|
|
16
16
|
async init() {
|
|
17
17
|
// Do not call super as we diverged
|
|
18
18
|
if (!this.parameters.source) {
|
|
19
|
-
throw new WebdaError("KUBE_CONFIGURATION_SOURCE_MISSING", "Need a source for KubernetesConfigurationService");
|
|
19
|
+
throw new WebdaError.CodeError("KUBE_CONFIGURATION_SOURCE_MISSING", "Need a source for KubernetesConfigurationService");
|
|
20
20
|
}
|
|
21
21
|
this.parameters.source = this._webda.getAppPath(this.parameters.source);
|
|
22
22
|
if (!fs.existsSync(this.parameters.source)) {
|
|
23
|
-
throw new WebdaError("KUBE_CONFIGURATION_SOURCE_MISSING", "Need a source for KubernetesConfigurationService");
|
|
23
|
+
throw new WebdaError.CodeError("KUBE_CONFIGURATION_SOURCE_MISSING", "Need a source for KubernetesConfigurationService");
|
|
24
24
|
}
|
|
25
25
|
// Add webda info
|
|
26
|
-
this.watch("$.
|
|
26
|
+
this.watch("$.services", (updates) => this._webda.reinit(updates));
|
|
27
27
|
fs.watchFile(path.join(this.parameters.source, "..data"), this.checkUpdate.bind(this));
|
|
28
28
|
await this.checkUpdate();
|
|
29
29
|
return this;
|
|
@@ -40,25 +40,15 @@ export class KubernetesConfigurationService extends ConfigurationService {
|
|
|
40
40
|
*/
|
|
41
41
|
async loadConfiguration() {
|
|
42
42
|
let result = {};
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
.filter(f => !f.startsWith("."))
|
|
46
|
-
.
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
// Auto parse JSON and YAML
|
|
50
|
-
if (f.match(/\.(jsonc?|ya?ml)$/i)) {
|
|
51
|
-
result[f.replace(/\.(jsonc?|ya?ml)$/i, "")] = JSONUtils.loadFile(filePath);
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
result[f] = fs.readFileSync(filePath, "utf-8");
|
|
55
|
-
}
|
|
56
|
-
});
|
|
57
|
-
if (found === 0) {
|
|
58
|
-
return undefined;
|
|
43
|
+
const found = fs
|
|
44
|
+
.readdirSync(this.parameters.source)
|
|
45
|
+
.filter(f => !f.startsWith(".") && f.match(/webda\.(jsonc?|ya?ml)$/i))
|
|
46
|
+
.pop();
|
|
47
|
+
if (!found) {
|
|
48
|
+
return this.parameters.default;
|
|
59
49
|
}
|
|
60
50
|
this.log("TRACE", "loadConfiguration", result);
|
|
61
|
-
return
|
|
51
|
+
return FileUtils.load(path.join(this.parameters.source, found));
|
|
62
52
|
}
|
|
63
53
|
}
|
|
64
54
|
//# sourceMappingURL=kubernetesconfiguration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAkC,MAAM,iBAAiB,CAAC;AAEvF;;;;;GAKG;AACH,MAAM,OAAO,8BAAyE,SAAQ,oBAAuB;IACnH;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,mCAAmC;QACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC3B,MAAM,IAAI,UAAU,CAAC,SAAS,CAC5B,mCAAmC,EACnC,kDAAkD,CACnD,CAAC;SACH;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC1C,MAAM,IAAI,UAAU,CAAC,SAAS,CAC5B,mCAAmC,EACnC,kDAAkD,CACnD,CAAC;SACH;QAED,iBAAiB;QACjB,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,OAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAExE,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;QACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB;QACrB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,EAAE;aACb,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;aACrE,GAAG,EAAE,CAAC;QACT,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;SAChC;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;CACF"}
|
|
@@ -10,7 +10,6 @@ import { mkdirSync, unlinkSync } from "fs";
|
|
|
10
10
|
import pkg from "fs-extra";
|
|
11
11
|
import * as path from "path";
|
|
12
12
|
import { stub } from "sinon";
|
|
13
|
-
import * as yaml from "yaml";
|
|
14
13
|
import { KubernetesConfigurationService } from "...js";
|
|
15
14
|
import { WebdaTest } from "../test.js";
|
|
16
15
|
import { getCommonJS } from "../utils/esm.js";
|
|
@@ -32,11 +31,7 @@ class AbstractKubernetesConfigurationServiceTest extends WebdaTest {
|
|
|
32
31
|
},
|
|
33
32
|
"Authentication.providers.email.text2": "Plop6"
|
|
34
33
|
}
|
|
35
|
-
}, undefined, 2)
|
|
36
|
-
other: "test",
|
|
37
|
-
"yaml.yml": yaml.stringify({
|
|
38
|
-
field: "test"
|
|
39
|
-
})
|
|
34
|
+
}, undefined, 2)
|
|
40
35
|
};
|
|
41
36
|
}
|
|
42
37
|
getTestConfiguration() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubernetesconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"kubernetesconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/mailer.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AA6DvD,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IA8BrD,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,KAAd,IAAI,CAAC,SAAS,GAAK,aAAa,EAAC;QACjC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;SACvB;QACD,IAAI,CAAC,eAAe,KAApB,IAAI,CAAC,eAAe,GAAK,UAAU,EAAC;QACpC,IAAI,CAAC,oBAAoB,KAAzB,IAAI,CAAC,oBAAoB,GAAK,EAAE,EAAC;QACjC,MAAA,IAAI,CAAC,oBAAoB,EAAC,cAAc,QAAd,cAAc,GAAK,EAAE,EAAC;QAChD,MAAA,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAC,YAAY,QAAZ,YAAY,GAAK,EAAE,EAAC;QAC7D,MAAA,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,YAAY,EAAC,UAAU,QAAV,UAAU,GAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC;IACpG,CAAC;CACF;AAED,MAAM,OAAgB,cACpB,SAAQ,OAAU;IAQlB;;OAEG;IACH,WAAW;;QACT,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YAC1C,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,uBAAuB;SAC9B,CAAC,CAAC;QACH,MAAA,IAAI,CAAC,OAAO,EAAC,MAAM,QAAN,MAAM,GAAK,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YAC9C,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,2BAA2B;SAClC,CAAC,EAAC;IACL,CAAC;IAWD;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAC,IAAkB;QAC5C,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,10 @@ let MailerTest = class MailerTest extends WebdaTest {
|
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
params() {
|
|
33
|
-
let params = new MailerParameters({
|
|
33
|
+
let params = new MailerParameters({
|
|
34
|
+
templates: "ts",
|
|
35
|
+
templatesEngine: "b"
|
|
36
|
+
});
|
|
34
37
|
assert.strictEqual(params.templates, "ts/");
|
|
35
38
|
assert.strictEqual(params.templatesEngine, "b");
|
|
36
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;AAEb,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/oauth.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Core, Counter } from "../core.js";
|
|
2
|
-
import {
|
|
2
|
+
import { EventWithContext, OperationContext, RequestFilter, WebContext } from "../index.js";
|
|
3
3
|
import { Authentication } from "./authentication.js";
|
|
4
4
|
import { Service, ServiceParameters } from "./service.js";
|
|
5
5
|
export interface EventOAuthToken extends EventWithContext {
|
|
@@ -102,7 +102,7 @@ export interface OAuthSession {
|
|
|
102
102
|
* OAuth service implementing the default OAuth workflow
|
|
103
103
|
* It is abstract as it does not manage any provider as is
|
|
104
104
|
*/
|
|
105
|
-
export declare abstract class OAuthService<T extends OAuthServiceParameters = OAuthServiceParameters, E extends OAuthEvents = OAuthEvents> extends Service<T, E> implements RequestFilter<
|
|
105
|
+
export declare abstract class OAuthService<T extends OAuthServiceParameters = OAuthServiceParameters, E extends OAuthEvents = OAuthEvents> extends Service<T, E> implements RequestFilter<WebContext> {
|
|
106
106
|
_authenticationService: Authentication;
|
|
107
107
|
/**
|
|
108
108
|
* @override
|
|
@@ -126,11 +126,19 @@ export declare abstract class OAuthService<T extends OAuthServiceParameters = OA
|
|
|
126
126
|
* @param context
|
|
127
127
|
* @returns
|
|
128
128
|
*/
|
|
129
|
-
checkRequest(context:
|
|
129
|
+
checkRequest(context: WebContext): Promise<boolean>;
|
|
130
130
|
/**
|
|
131
131
|
* Resolve dynamic dependancy
|
|
132
132
|
*/
|
|
133
133
|
resolve(): this;
|
|
134
|
+
/**
|
|
135
|
+
* Get OAuth callback query parameters
|
|
136
|
+
* @returns
|
|
137
|
+
*/
|
|
138
|
+
getCallbackQueryParams(): {
|
|
139
|
+
name: string;
|
|
140
|
+
required: boolean;
|
|
141
|
+
}[];
|
|
134
142
|
/**
|
|
135
143
|
* Add routes for the authentication
|
|
136
144
|
*/
|
|
@@ -139,7 +147,7 @@ export declare abstract class OAuthService<T extends OAuthServiceParameters = OA
|
|
|
139
147
|
* Expose the scope used by the authentication
|
|
140
148
|
* @param ctx
|
|
141
149
|
*/
|
|
142
|
-
_scope(ctx:
|
|
150
|
+
_scope(ctx: OperationContext): void;
|
|
143
151
|
/**
|
|
144
152
|
* Define if this provider allow authentication by tokens
|
|
145
153
|
* @returns
|
|
@@ -151,7 +159,7 @@ export declare abstract class OAuthService<T extends OAuthServiceParameters = OA
|
|
|
151
159
|
* The calling url must be and authorized_uris if defined
|
|
152
160
|
* @param ctx
|
|
153
161
|
*/
|
|
154
|
-
_redirect(ctx:
|
|
162
|
+
_redirect(ctx: WebContext): void;
|
|
155
163
|
/**
|
|
156
164
|
* Handle a token return
|
|
157
165
|
*
|
|
@@ -172,7 +180,7 @@ export declare abstract class OAuthService<T extends OAuthServiceParameters = OA
|
|
|
172
180
|
* @param identId
|
|
173
181
|
* @param profile
|
|
174
182
|
*/
|
|
175
|
-
handleReturn(ctx:
|
|
183
|
+
handleReturn(ctx: WebContext, identId: string, profile: any, _tokens?: any): Promise<void>;
|
|
176
184
|
/**
|
|
177
185
|
* Return default url for the provider
|
|
178
186
|
*/
|
|
@@ -192,16 +200,16 @@ export declare abstract class OAuthService<T extends OAuthServiceParameters = OA
|
|
|
192
200
|
* @param state random state
|
|
193
201
|
* @param ctx Context of request
|
|
194
202
|
*/
|
|
195
|
-
abstract generateAuthUrl(redirect_uri: string, state: string, ctx:
|
|
203
|
+
abstract generateAuthUrl(redirect_uri: string, state: string, ctx: WebContext): any;
|
|
196
204
|
/**
|
|
197
205
|
* Verify a token from a provider
|
|
198
206
|
*
|
|
199
207
|
* @param ctx
|
|
200
208
|
*/
|
|
201
|
-
abstract handleToken(ctx:
|
|
209
|
+
abstract handleToken(ctx: OperationContext): Promise<OAuthReturn>;
|
|
202
210
|
/**
|
|
203
211
|
* Manage the return of a provider
|
|
204
212
|
* @param ctx
|
|
205
213
|
*/
|
|
206
|
-
abstract handleCallback(ctx:
|
|
214
|
+
abstract handleCallback(ctx: WebContext): Promise<OAuthReturn>;
|
|
207
215
|
}
|