@webda/core 1.5.1 → 1.6.0-beta.2
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 -26
- 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/filequeue.js +3 -2
- package/lib/queues/filequeue.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 +61 -8
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +17 -1
- 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 +31 -110
- package/lib/stores/store.js +58 -286
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +12 -0
- package/lib/stores/store.spec.js +116 -24
- 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 +10 -8
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filequeue.js","sourceRoot":"","sources":["../../src/queues/filequeue.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,6BAA6B;AAG7B,sDAAiD;AACjD,iDAAwE;AACxE,yBAAyB;AACzB,+BAA4B;
|
|
1
|
+
{"version":3,"file":"filequeue.js","sourceRoot":"","sources":["../../src/queues/filequeue.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,6 @@ class Title {
|
|
|
28
28
|
let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends queue_spec_1.QueueTest {
|
|
29
29
|
receiveMessage(proto) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
console.log("receiveMessage", MemoryQueueTest_1.seq);
|
|
32
31
|
MemoryQueueTest_1.seq++;
|
|
33
32
|
switch (MemoryQueueTest_1.seq) {
|
|
34
33
|
case 1:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryqueue.spec.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAE9C,+CAA4C;AAC5C,6CAAyC;AAEzC,MAAM,KAAK;IAGT,YAAY,KAAc;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,IAAM,eAAe,uBAArB,MAAM,eAAgB,SAAQ,sBAAS;IAO/B,cAAc,CAAI,KAAqB;;YAC3C,
|
|
1
|
+
{"version":3,"file":"memoryqueue.spec.js","sourceRoot":"","sources":["../../src/queues/memoryqueue.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { Service, ServiceParameters } from "../services/service";
|
|
2
|
+
import { CancelablePromise } from "../utils/waiter";
|
|
3
|
+
export default abstract class PubSubService<T = any, K extends ServiceParameters = ServiceParameters> extends Service<K> {
|
|
4
|
+
/**
|
|
5
|
+
* Send an event to the queue
|
|
6
|
+
* @param event
|
|
7
|
+
*/
|
|
8
|
+
abstract sendMessage(event: T): Promise<void>;
|
|
9
|
+
/**
|
|
10
|
+
* Unserialize into class
|
|
11
|
+
* @param data
|
|
12
|
+
* @param proto
|
|
13
|
+
* @returns
|
|
14
|
+
*/
|
|
15
|
+
unserialize<L>(data: string, proto?: {
|
|
16
|
+
new (): L;
|
|
17
|
+
}): L;
|
|
18
|
+
/**
|
|
19
|
+
* Subscribe to a channel calling the callback with every Event received
|
|
20
|
+
* @param callback
|
|
21
|
+
* @param eventPrototype
|
|
22
|
+
*/
|
|
23
|
+
abstract consume(callback: (event: T) => Promise<void>, eventPrototype?: {
|
|
24
|
+
new (): T;
|
|
25
|
+
}, onBind?: () => void): CancelablePromise;
|
|
26
|
+
}
|
|
27
|
+
export { PubSubService };
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PubSubService = void 0;
|
|
4
|
+
const service_1 = require("../services/service");
|
|
5
|
+
class PubSubService extends service_1.Service {
|
|
6
|
+
/**
|
|
7
|
+
* Unserialize into class
|
|
8
|
+
* @param data
|
|
9
|
+
* @param proto
|
|
10
|
+
* @returns
|
|
11
|
+
*/
|
|
12
|
+
unserialize(data, proto) {
|
|
13
|
+
if (proto) {
|
|
14
|
+
return Object.assign(new proto(), JSON.parse(data));
|
|
15
|
+
}
|
|
16
|
+
return JSON.parse(data);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
exports.default = PubSubService;
|
|
20
|
+
exports.PubSubService = PubSubService;
|
|
21
|
+
//# sourceMappingURL=pubsubservice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pubsubservice.js","sourceRoot":"","sources":["../../src/queues/pubsubservice.ts"],"names":[],"mappings":";;;AAAA,iDAAiE;AAGjE,MAA8B,aAG5B,SAAQ,iBAAU;IAOlB;;;;;OAKG;IACH,WAAW,CAAI,IAAY,EAAE,KAAqB;QAChD,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACrD;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAYF;AAjCD,gCAiCC;AAEQ,sCAAa"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
2
|
+
import { ServiceParameters } from "../services/service";
|
|
3
3
|
import { WaitDelayerDefinition, WaitDelayer, CancelablePromise } from "../utils/waiter";
|
|
4
|
+
import { PubSubService } from "./pubsubservice";
|
|
4
5
|
/**
|
|
5
6
|
* Raw message from queue
|
|
6
7
|
*/
|
|
@@ -48,7 +49,7 @@ export declare class QueueParameters extends ServiceParameters {
|
|
|
48
49
|
*
|
|
49
50
|
* @category CoreServices
|
|
50
51
|
*/
|
|
51
|
-
declare abstract class Queue<T = any, K extends QueueParameters = QueueParameters> extends
|
|
52
|
+
declare abstract class Queue<T = any, K extends QueueParameters = QueueParameters> extends PubSubService<T, K> {
|
|
52
53
|
/**
|
|
53
54
|
* Current timeout handler
|
|
54
55
|
*/
|
|
@@ -66,26 +67,12 @@ declare abstract class Queue<T = any, K extends QueueParameters = QueueParameter
|
|
|
66
67
|
*/
|
|
67
68
|
protected delayer: WaitDelayer;
|
|
68
69
|
eventPrototype: new () => T;
|
|
69
|
-
/**
|
|
70
|
-
* Send an event to the queue
|
|
71
|
-
* @param event
|
|
72
|
-
*/
|
|
73
|
-
abstract sendMessage(event: T): Promise<void>;
|
|
74
70
|
/**
|
|
75
71
|
* Receive one or several messages
|
|
76
72
|
*/
|
|
77
73
|
abstract receiveMessage<L>(proto?: {
|
|
78
74
|
new (): L;
|
|
79
75
|
}): Promise<MessageReceipt<L>[]>;
|
|
80
|
-
/**
|
|
81
|
-
* Unserialize into class
|
|
82
|
-
* @param data
|
|
83
|
-
* @param proto
|
|
84
|
-
* @returns
|
|
85
|
-
*/
|
|
86
|
-
unserialize<L>(data: string, proto?: {
|
|
87
|
-
new (): L;
|
|
88
|
-
}): L;
|
|
89
76
|
/**
|
|
90
77
|
* Delete one message based on its receipt
|
|
91
78
|
* @param id
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.Queue = exports.QueueParameters = void 0;
|
|
13
13
|
const service_1 = require("../services/service");
|
|
14
14
|
const waiter_1 = require("../utils/waiter");
|
|
15
|
+
const pubsubservice_1 = require("./pubsubservice");
|
|
15
16
|
/**
|
|
16
17
|
* @inheritdoc
|
|
17
18
|
*/
|
|
@@ -35,19 +36,7 @@ exports.QueueParameters = QueueParameters;
|
|
|
35
36
|
*
|
|
36
37
|
* @category CoreServices
|
|
37
38
|
*/
|
|
38
|
-
class Queue extends
|
|
39
|
-
/**
|
|
40
|
-
* Unserialize into class
|
|
41
|
-
* @param data
|
|
42
|
-
* @param proto
|
|
43
|
-
* @returns
|
|
44
|
-
*/
|
|
45
|
-
unserialize(data, proto) {
|
|
46
|
-
if (proto) {
|
|
47
|
-
return Object.assign(new proto(), JSON.parse(data));
|
|
48
|
-
}
|
|
49
|
-
return JSON.parse(data);
|
|
50
|
-
}
|
|
39
|
+
class Queue extends pubsubservice_1.PubSubService {
|
|
51
40
|
/**
|
|
52
41
|
* Create the delayer
|
|
53
42
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueservice.js","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"queueservice.js","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"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"}
|
package/lib/router.js
CHANGED
|
@@ -20,7 +20,7 @@ class Router {
|
|
|
20
20
|
*/
|
|
21
21
|
addRoute(url, info) {
|
|
22
22
|
var _a;
|
|
23
|
-
this.webda.log("TRACE", `Add route ${url}`);
|
|
23
|
+
this.webda.log("TRACE", `Add route ${info.methods.join(",")} ${url}`);
|
|
24
24
|
(_a = info.openapi) !== null && _a !== void 0 ? _a : (info.openapi = {});
|
|
25
25
|
if (this.routes[url]) {
|
|
26
26
|
// If route is already added do not do anything
|
package/lib/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;AACA,8CAA8C;AAmC9C;;;GAGG;AACH,MAAa,MAAM;IAMjB,YAAY,KAAW;QALb,WAAM,GAA6B,IAAI,GAAG,EAAE,CAAC;QAC7C,cAAS,GAAY,KAAK,CAAC;QAKnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,GAAW,EAAE,IAAe;;QACnC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/lib/router.spec.js
CHANGED
|
@@ -33,7 +33,7 @@ let RouterTest = class RouterTest extends test_1.WebdaTest {
|
|
|
33
33
|
};
|
|
34
34
|
this.webda.addRoute("/plop", { methods: ["GET"], executor: "DefinedMailer" });
|
|
35
35
|
assert.deepStrictEqual(call, [
|
|
36
|
-
{ level: "TRACE", args: ["Add route /plop"] },
|
|
36
|
+
{ level: "TRACE", args: ["Add route GET /plop"] },
|
|
37
37
|
{ level: "WARN", args: ["GET /plop overlap with another defined route"] }
|
|
38
38
|
]);
|
|
39
39
|
// Should be skipped
|
package/lib/router.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.spec.js","sourceRoot":"","sources":["../src/router.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,iCAAmC;AACnC,6CAA8C;AAI9C,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gBAAS;IAEhC,0BAA0B;QACxB,MAAM,IAAI,GAAc,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;QACxE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5F,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;QAC/E,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAChG,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;QAC9E,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE;YAC3B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"router.spec.js","sourceRoot":"","sources":["../src/router.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export interface EventAuthenticationGetMe extends EventWithContext {
|
|
|
16
16
|
*/
|
|
17
17
|
export interface EventAuthenticationRegister extends EventAuthenticationGetMe {
|
|
18
18
|
datas: any;
|
|
19
|
+
identId: string;
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
21
22
|
* Emitted when user logout
|
|
@@ -179,6 +180,19 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
179
180
|
* Load the parameters for a service
|
|
180
181
|
*/
|
|
181
182
|
loadParameters(params: any): AuthenticationParameters;
|
|
183
|
+
/**
|
|
184
|
+
* Get the user store
|
|
185
|
+
* @returns
|
|
186
|
+
*/
|
|
187
|
+
getUserStore<K extends User = User>(): Store<K>;
|
|
188
|
+
/**
|
|
189
|
+
* Get the user store
|
|
190
|
+
* @returns
|
|
191
|
+
*/
|
|
192
|
+
getIdentStore<K extends Ident = Ident>(): Store<K>;
|
|
193
|
+
/**
|
|
194
|
+
* @override
|
|
195
|
+
*/
|
|
182
196
|
initRoutes(): void;
|
|
183
197
|
getUrl(): string;
|
|
184
198
|
setIdents(identStore: any): void;
|
|
@@ -188,6 +202,10 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
188
202
|
* Setup the default routes
|
|
189
203
|
*/
|
|
190
204
|
computeParameters(): void;
|
|
205
|
+
/**
|
|
206
|
+
* Add a provider to the oauth scheme
|
|
207
|
+
* @param name
|
|
208
|
+
*/
|
|
191
209
|
addProvider(name: string): void;
|
|
192
210
|
/**
|
|
193
211
|
* Send or resend an email to validate the email address
|
|
@@ -198,10 +216,26 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
198
216
|
* @throws 429 if a validation email has been sent recently
|
|
199
217
|
*/
|
|
200
218
|
_sendEmailValidation(ctx: any): Promise<void>;
|
|
219
|
+
/**
|
|
220
|
+
* Return current user
|
|
221
|
+
* @param ctx
|
|
222
|
+
*/
|
|
201
223
|
_getMe(ctx: Context): Promise<void>;
|
|
224
|
+
/**
|
|
225
|
+
* Handle both list of available authentication
|
|
226
|
+
* and logout with method 'DELETE'
|
|
227
|
+
*
|
|
228
|
+
* @param ctx
|
|
229
|
+
* @returns
|
|
230
|
+
*/
|
|
202
231
|
_listAuthentications(ctx: Context): Promise<void>;
|
|
203
232
|
onIdentLogin(ctx: Context, provider: string, identId: string, profile: any, tokens?: any): Promise<void>;
|
|
204
|
-
|
|
233
|
+
/**
|
|
234
|
+
* Create a new User with the link ident
|
|
235
|
+
* @param ident
|
|
236
|
+
*/
|
|
237
|
+
createUserWithIdent(provider: string, identId: string, profile?: any): Promise<void>;
|
|
238
|
+
registerUser(ctx: Context, datas: any, identId: string, user?: any): Promise<any>;
|
|
205
239
|
getPasswordRecoveryInfos(uuid: string | User, interval?: number): Promise<PasswordRecoveryInfos>;
|
|
206
240
|
_passwordRecoveryEmail(ctx: Context): Promise<void>;
|
|
207
241
|
_verifyPassword(password: string, user?: User): Promise<void>;
|
|
@@ -19,6 +19,7 @@ exports.Authentication = exports.AuthenticationParameters = exports.PasswordReco
|
|
|
19
19
|
const crypto = require("crypto");
|
|
20
20
|
const bcrypt = require("bcryptjs");
|
|
21
21
|
const service_1 = require("../services/service");
|
|
22
|
+
const context_1 = require("../utils/context");
|
|
22
23
|
/**
|
|
23
24
|
* Information required to reset a password
|
|
24
25
|
*/
|
|
@@ -76,6 +77,23 @@ class Authentication extends service_1.Service {
|
|
|
76
77
|
loadParameters(params) {
|
|
77
78
|
return new AuthenticationParameters(params);
|
|
78
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Get the user store
|
|
82
|
+
* @returns
|
|
83
|
+
*/
|
|
84
|
+
getUserStore() {
|
|
85
|
+
return this._usersStore;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Get the user store
|
|
89
|
+
* @returns
|
|
90
|
+
*/
|
|
91
|
+
getIdentStore() {
|
|
92
|
+
return this._identsStore;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* @override
|
|
96
|
+
*/
|
|
79
97
|
initRoutes() {
|
|
80
98
|
// ROUTES
|
|
81
99
|
let url = this.parameters.url;
|
|
@@ -198,6 +216,10 @@ class Authentication extends service_1.Service {
|
|
|
198
216
|
throw Error("email authentication requires a Mailer service");
|
|
199
217
|
}
|
|
200
218
|
}
|
|
219
|
+
/**
|
|
220
|
+
* Add a provider to the oauth scheme
|
|
221
|
+
* @param name
|
|
222
|
+
*/
|
|
201
223
|
addProvider(name) {
|
|
202
224
|
this.providers.add(name);
|
|
203
225
|
}
|
|
@@ -241,6 +263,10 @@ class Authentication extends service_1.Service {
|
|
|
241
263
|
yield this.sendValidationEmail(ctx, ctx.parameters.email);
|
|
242
264
|
});
|
|
243
265
|
}
|
|
266
|
+
/**
|
|
267
|
+
* Return current user
|
|
268
|
+
* @param ctx
|
|
269
|
+
*/
|
|
244
270
|
_getMe(ctx) {
|
|
245
271
|
return __awaiter(this, void 0, void 0, function* () {
|
|
246
272
|
let user = yield ctx.getCurrentUser();
|
|
@@ -254,6 +280,13 @@ class Authentication extends service_1.Service {
|
|
|
254
280
|
ctx.write(user);
|
|
255
281
|
});
|
|
256
282
|
}
|
|
283
|
+
/**
|
|
284
|
+
* Handle both list of available authentication
|
|
285
|
+
* and logout with method 'DELETE'
|
|
286
|
+
*
|
|
287
|
+
* @param ctx
|
|
288
|
+
* @returns
|
|
289
|
+
*/
|
|
257
290
|
_listAuthentications(ctx) {
|
|
258
291
|
return __awaiter(this, void 0, void 0, function* () {
|
|
259
292
|
if (ctx.getHttpContext().getMethod() === "DELETE") {
|
|
@@ -298,7 +331,7 @@ class Authentication extends service_1.Service {
|
|
|
298
331
|
}
|
|
299
332
|
if (!user) {
|
|
300
333
|
// If no user, register a new user automatically
|
|
301
|
-
user = yield this.registerUser(ctx, profile);
|
|
334
|
+
user = yield this.registerUser(ctx, profile, identId);
|
|
302
335
|
yield this._usersStore.save(user);
|
|
303
336
|
}
|
|
304
337
|
}
|
|
@@ -326,14 +359,29 @@ class Authentication extends service_1.Service {
|
|
|
326
359
|
yield this.login(ctx, user, ident);
|
|
327
360
|
});
|
|
328
361
|
}
|
|
329
|
-
|
|
362
|
+
/**
|
|
363
|
+
* Create a new User with the link ident
|
|
364
|
+
* @param ident
|
|
365
|
+
*/
|
|
366
|
+
createUserWithIdent(provider, identId, profile = {}) {
|
|
367
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
368
|
+
if (yield this._identsStore.exists(`${identId}_${provider}`)) {
|
|
369
|
+
throw new Error("Ident is already known");
|
|
370
|
+
}
|
|
371
|
+
let ctx = yield this._webda.newContext(new context_1.HttpContext("fake", "GET", "/"));
|
|
372
|
+
// Pretend we logged in with the ident
|
|
373
|
+
yield this.onIdentLogin(ctx, provider, identId, profile);
|
|
374
|
+
});
|
|
375
|
+
}
|
|
376
|
+
registerUser(ctx, datas, identId, user = this._usersStore.initModel()) {
|
|
330
377
|
return __awaiter(this, void 0, void 0, function* () {
|
|
331
378
|
user.email = datas.email;
|
|
332
379
|
user.locale = ctx.getLocale();
|
|
333
380
|
yield this.emitSync("Authentication.Register", {
|
|
334
381
|
user: user,
|
|
335
382
|
datas: datas,
|
|
336
|
-
context: ctx
|
|
383
|
+
context: ctx,
|
|
384
|
+
identId
|
|
337
385
|
});
|
|
338
386
|
return user;
|
|
339
387
|
});
|
|
@@ -484,7 +532,7 @@ class Authentication extends service_1.Service {
|
|
|
484
532
|
let mailOptions = {
|
|
485
533
|
to: email,
|
|
486
534
|
locale: locale,
|
|
487
|
-
template: "
|
|
535
|
+
template: "EMAIL_RECOVERY",
|
|
488
536
|
replacements: Object.assign(Object.assign({}, this.parameters.email), { infos, to: email, context: ctx })
|
|
489
537
|
};
|
|
490
538
|
return mailer.send(mailOptions);
|
|
@@ -511,7 +559,7 @@ class Authentication extends service_1.Service {
|
|
|
511
559
|
let mailOptions = {
|
|
512
560
|
to: email,
|
|
513
561
|
locale: ctx.getLocale(),
|
|
514
|
-
template: "
|
|
562
|
+
template: "EMAIL_REGISTER",
|
|
515
563
|
replacements: replacements
|
|
516
564
|
};
|
|
517
565
|
return mailer.send(mailOptions);
|
|
@@ -634,11 +682,11 @@ class Authentication extends service_1.Service {
|
|
|
634
682
|
_handleEmail(ctx) {
|
|
635
683
|
return __awaiter(this, void 0, void 0, function* () {
|
|
636
684
|
// If called while logged in reject
|
|
637
|
-
if (ctx.getCurrentUserId()) {
|
|
685
|
+
if (ctx.getCurrentUserId() !== undefined) {
|
|
638
686
|
throw 410;
|
|
639
687
|
}
|
|
640
688
|
let body = ctx.getRequestBody();
|
|
641
|
-
if (body.
|
|
689
|
+
if (body.login === undefined) {
|
|
642
690
|
throw 400;
|
|
643
691
|
}
|
|
644
692
|
var mailConfig = this.parameters.email;
|
|
@@ -671,12 +719,17 @@ class Authentication extends service_1.Service {
|
|
|
671
719
|
return this.sendValidationEmail(ctx, email);
|
|
672
720
|
}
|
|
673
721
|
}
|
|
722
|
+
if (!body.password) {
|
|
723
|
+
throw 400;
|
|
724
|
+
}
|
|
674
725
|
// Store with a _
|
|
675
726
|
body.__password = this.hashPassword(body.password);
|
|
676
727
|
yield this._verifyPassword(body.password);
|
|
728
|
+
// Remove useless attributes
|
|
677
729
|
delete body.password;
|
|
678
730
|
delete body.register;
|
|
679
|
-
|
|
731
|
+
delete body.token;
|
|
732
|
+
let user = yield this.registerUser(ctx, {}, uuid, body);
|
|
680
733
|
yield this.emitSync("Authentication.PasswordCreate", {
|
|
681
734
|
user,
|
|
682
735
|
password: body.__password,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
@@ -228,7 +228,14 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
228
228
|
});
|
|
229
229
|
// Activate post validation
|
|
230
230
|
ctx.getExecutor().getParameters().email.postValidation = true;
|
|
231
|
-
yield assert.rejects(() => executor.execute(ctx),
|
|
231
|
+
yield assert.rejects(() => executor.execute(ctx), /400/);
|
|
232
|
+
executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
233
|
+
login: "testBad@Webda.io",
|
|
234
|
+
register: true
|
|
235
|
+
}, {
|
|
236
|
+
"Accept-Language": "en-GB"
|
|
237
|
+
});
|
|
238
|
+
yield assert.rejects(() => executor.execute(ctx), /400/);
|
|
232
239
|
});
|
|
233
240
|
}
|
|
234
241
|
me() {
|
|
@@ -450,6 +457,12 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
450
457
|
assert.ok(yield this.identStore.exists("newtest2@webda.io_email"));
|
|
451
458
|
});
|
|
452
459
|
}
|
|
460
|
+
multipleCreate() {
|
|
461
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
462
|
+
yield this.authentication.createUserWithIdent("email", "test@test.com");
|
|
463
|
+
yield assert.rejects(() => this.authentication.createUserWithIdent("email", "test@test.com"), /Ident is already known/);
|
|
464
|
+
});
|
|
465
|
+
}
|
|
453
466
|
redirectEmailRegister() {
|
|
454
467
|
return __awaiter(this, void 0, void 0, function* () {
|
|
455
468
|
let token = this.authentication.generateEmailValidationToken(undefined, "test@webda.io");
|
|
@@ -482,6 +495,9 @@ __decorate([
|
|
|
482
495
|
__decorate([
|
|
483
496
|
(0, mocha_1.test)("add email to existing account")
|
|
484
497
|
], AuthenticationTest.prototype, "addEmailToAccount", null);
|
|
498
|
+
__decorate([
|
|
499
|
+
mocha_1.test
|
|
500
|
+
], AuthenticationTest.prototype, "multipleCreate", null);
|
|
485
501
|
__decorate([
|
|
486
502
|
mocha_1.test
|
|
487
503
|
], AuthenticationTest.prototype, "redirectEmailRegister", null);
|