@webda/core 1.6.0-beta.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.js +21 -16
- package/lib/application.js.map +1 -1
- package/lib/core.js +1 -2
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +2 -2
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +11 -9
- package/lib/index.js +11 -9
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +26 -7
- package/lib/models/aclmodel.js +65 -17
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +52 -18
- package/lib/models/aclmodel.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 +29 -1
- package/lib/models/user.js +30 -0
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +11 -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/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 +52 -4
- 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 +4 -4
- package/lib/services/binary.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/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/mailer.d.ts +43 -2
- package/lib/services/mailer.js +33 -4
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +29 -0
- 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 +10 -4
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +3 -0
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/file.spec.js +5 -4
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.js +52 -26
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +119 -0
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/store.js +12 -10
- package/lib/stores/store.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 +2 -1
- package/lib/utils/context.js +7 -3
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +1 -1
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.js +17 -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 +3 -3
- package/test/config-invitation.json +63 -0
package/lib/services/mailer.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.Mailer = exports.MailerParameters = void 0;
|
|
12
|
+
exports.Mailer = exports.AbstractMailer = exports.MailerParameters = void 0;
|
|
13
13
|
const Email = require("email-templates");
|
|
14
14
|
const fs = require("fs");
|
|
15
15
|
const nodemailer = require("nodemailer");
|
|
@@ -32,6 +32,35 @@ class MailerParameters extends service_1.ServiceParameters {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
exports.MailerParameters = MailerParameters;
|
|
35
|
+
class AbstractMailer extends service_1.Service {
|
|
36
|
+
/**
|
|
37
|
+
* If user has an email
|
|
38
|
+
* @param user
|
|
39
|
+
* @returns
|
|
40
|
+
*/
|
|
41
|
+
handleNotificationFor(user) {
|
|
42
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
+
return user.getEmail() !== null;
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* @override
|
|
48
|
+
*/
|
|
49
|
+
sendNotification(user, notification, replacements) {
|
|
50
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
+
let email = user.getEmail();
|
|
52
|
+
if (!email) {
|
|
53
|
+
throw new Error(`Cannot find a valid email for ${user.__type} '${user.getUuid()}'`);
|
|
54
|
+
}
|
|
55
|
+
return this.send({
|
|
56
|
+
template: notification,
|
|
57
|
+
replacements: Object.assign({}, replacements),
|
|
58
|
+
to: email
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
exports.AbstractMailer = AbstractMailer;
|
|
35
64
|
/**
|
|
36
65
|
* A basic Mailer based on the nodemailer module
|
|
37
66
|
*
|
|
@@ -43,7 +72,7 @@ exports.MailerParameters = MailerParameters;
|
|
|
43
72
|
* config: { ... }
|
|
44
73
|
* @category CoreServices
|
|
45
74
|
*/
|
|
46
|
-
class Mailer extends
|
|
75
|
+
class Mailer extends AbstractMailer {
|
|
47
76
|
constructor() {
|
|
48
77
|
super(...arguments);
|
|
49
78
|
this._templates = {};
|
|
@@ -80,7 +109,7 @@ class Mailer extends service_1.Service {
|
|
|
80
109
|
*/
|
|
81
110
|
_getTemplate(name) {
|
|
82
111
|
if (!this._templates[name]) {
|
|
83
|
-
if (!this.
|
|
112
|
+
if (!this.hasNotification(name)) {
|
|
84
113
|
this._webda.log("WARN", "No template found for", name);
|
|
85
114
|
return;
|
|
86
115
|
}
|
|
@@ -99,7 +128,7 @@ class Mailer extends service_1.Service {
|
|
|
99
128
|
* @param name
|
|
100
129
|
* @returns
|
|
101
130
|
*/
|
|
102
|
-
|
|
131
|
+
hasNotification(name) {
|
|
103
132
|
// Load template
|
|
104
133
|
return fs.existsSync(this.parameters.templates + name);
|
|
105
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,yCAAyC;AACzC,yBAAyB;AACzB,yCAAyC;AACzC,6BAA8B;
|
|
1
|
+
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ const mocha_1 = require("@testdeck/mocha");
|
|
|
20
20
|
const test_1 = require("../test");
|
|
21
21
|
const __1 = require("..");
|
|
22
22
|
const mailer_1 = require("./mailer");
|
|
23
|
+
const sinon = require("sinon");
|
|
23
24
|
let MailerTest = class MailerTest extends test_1.WebdaTest {
|
|
24
25
|
before() {
|
|
25
26
|
const _super = Object.create(null, {
|
|
@@ -117,6 +118,28 @@ let MailerTest = class MailerTest extends test_1.WebdaTest {
|
|
|
117
118
|
}), /Cannot send email as no transporter is defined/);
|
|
118
119
|
});
|
|
119
120
|
}
|
|
121
|
+
handleNotificationFor() {
|
|
122
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
123
|
+
const user = new __1.User();
|
|
124
|
+
assert.strictEqual(yield this.mailer.handleNotificationFor(user), false);
|
|
125
|
+
user.load({ email: "test@test.com" });
|
|
126
|
+
assert.strictEqual(yield this.mailer.handleNotificationFor(user), true);
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
sendNotification() {
|
|
130
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
131
|
+
let stub = sinon.stub(this.mailer, "send").callsFake(() => __awaiter(this, void 0, void 0, function* () { }));
|
|
132
|
+
try {
|
|
133
|
+
const user = new __1.User();
|
|
134
|
+
assert.rejects(() => this.mailer.sendNotification(user, "", undefined, undefined), /Cannot find a valid email for user/);
|
|
135
|
+
user.load({ email: "test@test.com" });
|
|
136
|
+
yield this.mailer.sendNotification(user, "", undefined, undefined);
|
|
137
|
+
}
|
|
138
|
+
finally {
|
|
139
|
+
stub.restore();
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
}
|
|
120
143
|
};
|
|
121
144
|
__decorate([
|
|
122
145
|
mocha_1.test
|
|
@@ -142,6 +165,12 @@ __decorate([
|
|
|
142
165
|
__decorate([
|
|
143
166
|
mocha_1.test
|
|
144
167
|
], MailerTest.prototype, "noTransporter", null);
|
|
168
|
+
__decorate([
|
|
169
|
+
mocha_1.test
|
|
170
|
+
], MailerTest.prototype, "handleNotificationFor", null);
|
|
171
|
+
__decorate([
|
|
172
|
+
mocha_1.test
|
|
173
|
+
], MailerTest.prototype, "sendNotification", null);
|
|
145
174
|
MailerTest = __decorate([
|
|
146
175
|
mocha_1.suite
|
|
147
176
|
], MailerTest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;AAEb,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { Ident } from "../models/ident";
|
|
2
|
+
import { User } from "../models/user";
|
|
3
|
+
import { Service, ServiceParameters } from "./service";
|
|
4
|
+
/**
|
|
5
|
+
* Define a service that can notify a user based on his info
|
|
6
|
+
* It can use email or SMS or any other media
|
|
7
|
+
*/
|
|
8
|
+
export interface NotificationService {
|
|
9
|
+
/**
|
|
10
|
+
* Check if this type of notification is available
|
|
11
|
+
*/
|
|
12
|
+
hasNotification(notification: string): Promise<boolean>;
|
|
13
|
+
/**
|
|
14
|
+
* Check if the service can deliver notification to this user
|
|
15
|
+
* @param user
|
|
16
|
+
*/
|
|
17
|
+
handleNotificationFor(userOrIdent: User | Ident): Promise<boolean>;
|
|
18
|
+
/**
|
|
19
|
+
* Send the notification to the user
|
|
20
|
+
* @param user
|
|
21
|
+
* @param notification
|
|
22
|
+
* @param replacements
|
|
23
|
+
*/
|
|
24
|
+
sendNotification(user: User | Ident, notification: string, replacements: any): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Parameters for multi notification service
|
|
28
|
+
*/
|
|
29
|
+
export declare class MultiNotificationParameters extends ServiceParameters {
|
|
30
|
+
/**
|
|
31
|
+
* Notification service that will send
|
|
32
|
+
* The order of the array is important if multiple is false
|
|
33
|
+
* When multiple is `false` the first available NotificationService will
|
|
34
|
+
* be used, otherwise every available NotificationService will be used
|
|
35
|
+
*/
|
|
36
|
+
senders: string[];
|
|
37
|
+
/**
|
|
38
|
+
* Define if it sends one or several notification per user
|
|
39
|
+
* @default false
|
|
40
|
+
*/
|
|
41
|
+
multiple?: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* @override
|
|
44
|
+
*/
|
|
45
|
+
constructor(params: any);
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Allow an aggregation of Notification to send via multiple media
|
|
49
|
+
* like SMS and Email
|
|
50
|
+
*/
|
|
51
|
+
export default class MultiNotificationService<T extends MultiNotificationParameters = MultiNotificationParameters> extends Service<T> implements NotificationService {
|
|
52
|
+
senders: NotificationService[];
|
|
53
|
+
/**
|
|
54
|
+
* @override
|
|
55
|
+
*/
|
|
56
|
+
loadParameters(params: any): MultiNotificationParameters;
|
|
57
|
+
/**
|
|
58
|
+
* @override
|
|
59
|
+
*/
|
|
60
|
+
resolve(): void;
|
|
61
|
+
/**
|
|
62
|
+
* @override
|
|
63
|
+
*/
|
|
64
|
+
sendNotification(user: User | Ident, notification: string, replacements: any): Promise<void>;
|
|
65
|
+
/**
|
|
66
|
+
* @override
|
|
67
|
+
*/
|
|
68
|
+
handleNotificationFor(user: User | Ident): Promise<boolean>;
|
|
69
|
+
/**
|
|
70
|
+
* @override
|
|
71
|
+
*/
|
|
72
|
+
hasNotification(notification: string): Promise<boolean>;
|
|
73
|
+
}
|
|
74
|
+
export { MultiNotificationService };
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.MultiNotificationService = exports.MultiNotificationParameters = void 0;
|
|
13
|
+
const service_1 = require("./service");
|
|
14
|
+
/**
|
|
15
|
+
* Parameters for multi notification service
|
|
16
|
+
*/
|
|
17
|
+
class MultiNotificationParameters extends service_1.ServiceParameters {
|
|
18
|
+
/**
|
|
19
|
+
* @override
|
|
20
|
+
*/
|
|
21
|
+
constructor(params) {
|
|
22
|
+
var _a;
|
|
23
|
+
super(params);
|
|
24
|
+
(_a = this.senders) !== null && _a !== void 0 ? _a : (this.senders = []);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
exports.MultiNotificationParameters = MultiNotificationParameters;
|
|
28
|
+
/**
|
|
29
|
+
* Allow an aggregation of Notification to send via multiple media
|
|
30
|
+
* like SMS and Email
|
|
31
|
+
*/
|
|
32
|
+
class MultiNotificationService extends service_1.Service {
|
|
33
|
+
/**
|
|
34
|
+
* @override
|
|
35
|
+
*/
|
|
36
|
+
loadParameters(params) {
|
|
37
|
+
return new MultiNotificationParameters(params);
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* @override
|
|
41
|
+
*/
|
|
42
|
+
resolve() {
|
|
43
|
+
this.senders = this.parameters.senders.map(s => {
|
|
44
|
+
let service = this.getService(s);
|
|
45
|
+
if (!service) {
|
|
46
|
+
throw new Error(`Unknown service '${s}'`);
|
|
47
|
+
}
|
|
48
|
+
return service;
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* @override
|
|
53
|
+
*/
|
|
54
|
+
sendNotification(user, notification, replacements) {
|
|
55
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
56
|
+
const selectedSenders = (yield Promise.all(this.senders.map((s) => __awaiter(this, void 0, void 0, function* () {
|
|
57
|
+
if ((yield s.hasNotification(notification)) && (yield s.handleNotificationFor(user))) {
|
|
58
|
+
return s;
|
|
59
|
+
}
|
|
60
|
+
})))).filter(s => s !== undefined);
|
|
61
|
+
if (!selectedSenders.length) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (!this.parameters.multiple) {
|
|
65
|
+
return selectedSenders.shift().sendNotification(user, notification, replacements);
|
|
66
|
+
}
|
|
67
|
+
yield Promise.all(selectedSenders.map(s => s.sendNotification(user, notification, replacements)));
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* @override
|
|
72
|
+
*/
|
|
73
|
+
handleNotificationFor(user) {
|
|
74
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
return (yield Promise.all(this.senders.map(s => s.handleNotificationFor(user)))).some(s => s);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* @override
|
|
80
|
+
*/
|
|
81
|
+
hasNotification(notification) {
|
|
82
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
return (yield Promise.all(this.senders.map(s => s.hasNotification(notification)))).some(s => s);
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
exports.default = MultiNotificationService;
|
|
88
|
+
exports.MultiNotificationService = MultiNotificationService;
|
|
89
|
+
//# sourceMappingURL=notificationservice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationservice.js","sourceRoot":"","sources":["../../src/services/notificationservice.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,uCAAuD;AAyBvD;;GAEG;AACH,MAAa,2BAA4B,SAAQ,2BAAiB;IAchE;;OAEG;IACH,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;IACtB,CAAC;CACF;AArBD,kEAqBC;AAED;;;GAGG;AACH,MAAqB,wBACnB,SAAQ,iBAAU;IAKlB;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,2BAA2B,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC7C,IAAI,OAAO,GAAkC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC;YACjE,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;aAC3C;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACG,gBAAgB,CAAC,IAAkB,EAAE,YAAoB,EAAE,YAAiB;;YAChF,MAAM,eAAe,GAAG,CACtB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAM,CAAC,EAAC,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE;oBACpF,OAAO,CAAC,CAAC;iBACV;YACH,CAAC,CAAA,CAAC,CACH,CACF,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;YAC/B,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;gBAC3B,OAAO;aACR;YACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;aACnF;YACD,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QACpG,CAAC;KAAA;IAED;;OAEG;IACG,qBAAqB,CAAC,IAAkB;;YAC5C,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChG,CAAC;KAAA;IAED;;OAEG;IACG,eAAe,CAAC,YAAoB;;YACxC,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClG,CAAC;KAAA;CACF;AA7DD,2CA6DC;AAEQ,4DAAwB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,104 @@
|
|
|
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 notificationservice_1 = require("./notificationservice");
|
|
22
|
+
const __1 = require("..");
|
|
23
|
+
class FakeNotification extends __1.Service {
|
|
24
|
+
constructor() {
|
|
25
|
+
super(...arguments);
|
|
26
|
+
this.template = false;
|
|
27
|
+
this.user = false;
|
|
28
|
+
this.sent = 0;
|
|
29
|
+
}
|
|
30
|
+
hasNotification(notification) {
|
|
31
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
return this.template;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
handleNotificationFor(user) {
|
|
36
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
return this.user;
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
sendNotification(user, notification, replacements) {
|
|
41
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
this.sent++;
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
let NotificationServiceTest = class NotificationServiceTest extends test_1.WebdaTest {
|
|
47
|
+
getTestConfiguration() {
|
|
48
|
+
return process.cwd() + "/test/config-invitation.json";
|
|
49
|
+
}
|
|
50
|
+
before() {
|
|
51
|
+
const _super = Object.create(null, {
|
|
52
|
+
before: { get: () => super.before }
|
|
53
|
+
});
|
|
54
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
yield _super.before.call(this);
|
|
56
|
+
this.service = new notificationservice_1.MultiNotificationService(this.webda, "notif", {
|
|
57
|
+
senders: ["notifA", "notifB"]
|
|
58
|
+
});
|
|
59
|
+
this.fakeA = new FakeNotification(this.webda, "notifA", {});
|
|
60
|
+
this.fakeB = new FakeNotification(this.webda, "notifB", {});
|
|
61
|
+
this.registerService(this.fakeA);
|
|
62
|
+
this.registerService(this.fakeB);
|
|
63
|
+
this.registerService(this.service);
|
|
64
|
+
this.service.resolve();
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
cov() {
|
|
68
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
69
|
+
assert.strictEqual(yield this.service.handleNotificationFor(undefined), false);
|
|
70
|
+
assert.strictEqual(yield this.service.hasNotification(undefined), false);
|
|
71
|
+
this.fakeB.user = true;
|
|
72
|
+
assert.strictEqual(yield this.service.handleNotificationFor(undefined), true);
|
|
73
|
+
this.fakeA.template = true;
|
|
74
|
+
assert.strictEqual(yield this.service.hasNotification(undefined), true);
|
|
75
|
+
yield this.service.sendNotification(undefined, undefined, undefined);
|
|
76
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 0);
|
|
77
|
+
this.fakeA.user = true;
|
|
78
|
+
yield this.service.sendNotification(undefined, undefined, undefined);
|
|
79
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 1);
|
|
80
|
+
this.fakeB.template = true;
|
|
81
|
+
yield this.service.sendNotification(undefined, undefined, undefined);
|
|
82
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 2);
|
|
83
|
+
this.service.getParameters().multiple = true;
|
|
84
|
+
yield this.service.sendNotification(undefined, undefined, undefined);
|
|
85
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 4);
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
exception() {
|
|
89
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
this.service.getParameters().senders.push("unknown");
|
|
91
|
+
assert.throws(() => this.service.resolve(), /Unknown service 'unknown'/);
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
__decorate([
|
|
96
|
+
mocha_1.test
|
|
97
|
+
], NotificationServiceTest.prototype, "cov", null);
|
|
98
|
+
__decorate([
|
|
99
|
+
mocha_1.test
|
|
100
|
+
], NotificationServiceTest.prototype, "exception", null);
|
|
101
|
+
NotificationServiceTest = __decorate([
|
|
102
|
+
mocha_1.suite
|
|
103
|
+
], NotificationServiceTest);
|
|
104
|
+
//# sourceMappingURL=notificationservice.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationservice.spec.js","sourceRoot":"","sources":["../../src/services/notificationservice.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,10 +54,10 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
54
54
|
});
|
|
55
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
56
|
yield _super.before.call(this);
|
|
57
|
-
this.service = new FakeOAuthService(this.webda, "
|
|
57
|
+
this.service = new FakeOAuthService(this.webda, "fake", {
|
|
58
58
|
authorized_uris: ["https://redirect.me/plop"]
|
|
59
59
|
});
|
|
60
|
-
this.registerService(
|
|
60
|
+
this.registerService(this.service);
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
testCheckRequest() {
|
|
@@ -104,8 +104,8 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
104
104
|
assert.strictEqual(ctx.getCurrentUserId(), userId);
|
|
105
105
|
yield this.service.handleReturn(ctx, "plop3", { email: "rcattiau@gmail.com" }, undefined);
|
|
106
106
|
// Default to false for token
|
|
107
|
-
assert.rejects(() => this.
|
|
108
|
-
assert.rejects(() => this.
|
|
107
|
+
assert.rejects(() => this.execute(ctx, "webda.io", "GET", "/fake/scope"), /404/);
|
|
108
|
+
assert.rejects(() => this.execute(ctx, "webda.io", "POST", "/fake/token"), /404/);
|
|
109
109
|
// @ts-ignore
|
|
110
110
|
this.service.parameters = this.service.loadParameters({
|
|
111
111
|
authenticationService: "Authentication2",
|
|
@@ -116,14 +116,15 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
116
116
|
});
|
|
117
117
|
this.service.hasToken = () => true;
|
|
118
118
|
this.service.resolve();
|
|
119
|
+
this.registerService(this.service);
|
|
119
120
|
assert.strictEqual(this.service._authenticationService, undefined, "Should not get any Authentication service");
|
|
120
|
-
yield this.
|
|
121
|
+
yield this.execute(ctx, "webda.io", "GET", "/bouzouf/scope");
|
|
121
122
|
assert.deepStrictEqual(JSON.parse(ctx.getResponseBody()), ["email", "image"]);
|
|
122
123
|
let event = 0;
|
|
123
124
|
this.service.addListener("OAuth.Token", () => {
|
|
124
125
|
event++;
|
|
125
126
|
});
|
|
126
|
-
yield this.
|
|
127
|
+
yield this.execute(ctx, "webda.io", "POST", "/bouzouf/token");
|
|
127
128
|
assert.strictEqual(event, 1);
|
|
128
129
|
this.service.removeAllListeners();
|
|
129
130
|
this.service.addListener("OAuth.Callback", () => {
|
|
@@ -147,10 +148,6 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
147
148
|
}
|
|
148
149
|
redirect() {
|
|
149
150
|
return __awaiter(this, void 0, void 0, function* () {
|
|
150
|
-
this.service = new FakeOAuthService(this.webda, "oauth", {
|
|
151
|
-
authorized_uris: ["https://redirect.me/plop"]
|
|
152
|
-
});
|
|
153
|
-
this.registerService("oauth", this.service);
|
|
154
151
|
let ctx = yield this.newContext();
|
|
155
152
|
ctx.setHttpContext(new __1.HttpContext("test.webda.io", "GET", "/fake", "https", 443, undefined, {
|
|
156
153
|
referer: "https://redirect.me/plop"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.spec.js","sourceRoot":"","sources":["../../src/services/oauth.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA4D;AAC5D,kCAAoC;AACpC,mCAAuC;AACvC,2BAAgD;AAGhD,MAAM,gBAAiB,SAAQ,oBAAY;IACzC,aAAa;QACX,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,eAAe;QACb,OAAO,eAAe,CAAC;IACzB,CAAC;IAEK,WAAW;;YACf,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,EAAE;aACZ,CAAC;QACJ,CAAC;KAAA;IAEK,cAAc;;YAClB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC;KAAA;IAED,OAAO;QACL,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kBAAkB;QAChB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9B,CAAC;CACF;AAGD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,gBAAS;IAGhC,MAAM;;;;;YACV,MAAM,OAAM,MAAM,WAAE,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"oauth.spec.js","sourceRoot":"","sources":["../../src/services/oauth.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,12 @@ export declare class ServiceParameters {
|
|
|
34
34
|
*/
|
|
35
35
|
constructor(params: any);
|
|
36
36
|
}
|
|
37
|
+
export declare type DeepPartial<T> = {
|
|
38
|
+
[P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
|
|
39
|
+
};
|
|
40
|
+
export declare type PartialModel<T> = {
|
|
41
|
+
[P in keyof T]: T[P] extends Function ? T[P] : T[P] extends object ? null | PartialModel<T[P]> : T[P] | null;
|
|
42
|
+
};
|
|
37
43
|
/**
|
|
38
44
|
* Use this object for representing a service in the application
|
|
39
45
|
* A Service is a singleton in the application, that is init after all others services are created
|
|
@@ -74,11 +80,11 @@ declare abstract class Service<T extends ServiceParameters = ServiceParameters>
|
|
|
74
80
|
* @param {String} name - The name of the service
|
|
75
81
|
* @param {Object} params - The parameters block define in the configuration file
|
|
76
82
|
*/
|
|
77
|
-
constructor(webda: Core, name: string, params?:
|
|
83
|
+
constructor(webda: Core, name: string, params?: DeepPartial<T>);
|
|
78
84
|
/**
|
|
79
85
|
* Load the parameters for a service
|
|
80
86
|
*/
|
|
81
|
-
loadParameters(params:
|
|
87
|
+
loadParameters(params: DeepPartial<T>): ServiceParameters;
|
|
82
88
|
/**
|
|
83
89
|
* Used to compute or derivate input parameter to attribute
|
|
84
90
|
*/
|
|
@@ -172,11 +178,11 @@ declare abstract class Service<T extends ServiceParameters = ServiceParameters>
|
|
|
172
178
|
*
|
|
173
179
|
* @abstract
|
|
174
180
|
*/
|
|
175
|
-
__clean(): Promise<
|
|
181
|
+
__clean(): Promise<void>;
|
|
176
182
|
/**
|
|
177
183
|
* @private
|
|
178
184
|
*/
|
|
179
|
-
___cleanData(): Promise<
|
|
185
|
+
___cleanData(): Promise<void>;
|
|
180
186
|
/**
|
|
181
187
|
*
|
|
182
188
|
* @param level to log
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,iCAAkC;AAQlC;;;;GAIG;AACH,MAAM,QAAQ;IAMZ;;;;;;OAMG;IACH,YAAY,QAAgB,EAAE,eAAuB,EAAE,YAAqB,EAAE,WAAoB,KAAK;QACrG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,EAAE;YACjB,IAAI,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBACzC,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aAC5C;iBAAM;gBACL,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC;aAC9B;SACF;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC;SAClC;IACH,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,OAAgB;QACtB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC;SAC9D;QACD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC7C,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,MAAM,IAAI,KAAK,CACb,gCAAgC,IAAI,eAAe,IAAI,CAAC,SAAS,UAAU,OAAO,CAAC,OAAO,EAAE,GAAG,CAChG,CAAC;aACH;YACD,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,UAAU,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SACrF;IACH,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,OAAgB;QAChC,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAClG,CAAC;CACF;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,MAAM,CAAC,eAAuB,EAAE,YAA+B,EAAE,QAAkB;IACjG,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;QAC1C,IAAI,OAAO,YAAY,KAAK,SAAS,EAAE;YACrC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SAC7F;aAAM;YACL,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;SAC5F;IACH,CAAC,CAAC;AACJ,CAAC;AATD,wBASC;AAED;;GAEG;AACH,MAAa,iBAAiB;IAM5B;;;;OAIG;IACH,YAAY,MAAW;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;CACF;AAdD,8CAcC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,9 @@ const test_1 = require("../test");
|
|
|
20
20
|
const assert = require("assert");
|
|
21
21
|
const __1 = require("..");
|
|
22
22
|
const sinon = require("sinon");
|
|
23
|
+
const service_1 = require("./service");
|
|
24
|
+
class FakeServiceParameters extends service_1.ServiceParameters {
|
|
25
|
+
}
|
|
23
26
|
class FakeService extends __1.Service {
|
|
24
27
|
}
|
|
25
28
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.spec.js","sourceRoot":"","sources":["../../src/services/service.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,kCAAoC;AACpC,iCAAiC;AACjC,0BAAqC;AACrC,+BAA+B;
|
|
1
|
+
{"version":3,"file":"service.spec.js","sourceRoot":"","sources":["../../src/services/service.spec.ts"],"names":[],"mappings":"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"}
|