@webda/core 1.6.0-beta.3 → 2.0.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 +355 -195
- package/lib/application.js +188 -682
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +109 -289
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +150 -215
- package/lib/core.js +188 -71
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +103 -42
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +4 -0
- package/lib/index.js +9 -1
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +3 -1
- package/lib/models/aclmodel.js +6 -3
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +10 -5
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +86 -24
- package/lib/models/coremodel.js +85 -36
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +21 -2
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +7 -5
- package/lib/models/ident.js +2 -1
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +1 -1
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +18 -4
- package/lib/models/ownermodel.js +24 -4
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +18 -1
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +5 -2
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +7 -6
- package/lib/models/user.js +2 -1
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +1 -1
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +2 -7
- package/lib/queues/filequeue.js +4 -13
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +2 -3
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +2 -7
- package/lib/queues/memoryqueue.js +1 -11
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +1 -1
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/queue.spec.d.ts +1 -1
- package/lib/queues/queue.spec.js +12 -10
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +1 -1
- package/lib/queues/queueservice.js +1 -1
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +52 -2
- package/lib/router.js +80 -51
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +23 -6
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.d.ts +1 -0
- package/lib/services/asyncevents.js +4 -3
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.js +2 -2
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +39 -11
- package/lib/services/authentication.js +60 -55
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +2 -1
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +127 -65
- package/lib/services/binary.js +255 -98
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +2 -1
- package/lib/services/binary.spec.js +101 -30
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +67 -0
- package/lib/services/cloudbinary.js +178 -0
- package/lib/services/cloudbinary.js.map +1 -0
- package/lib/services/cloudbinary.spec.d.ts +13 -0
- package/lib/services/cloudbinary.spec.js +212 -0
- package/lib/services/cloudbinary.spec.js.map +1 -0
- package/lib/services/configuration.d.ts +7 -2
- package/lib/services/configuration.js +6 -5
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +3 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +5 -6
- package/lib/services/cron.js +5 -12
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +3 -4
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +3 -5
- package/lib/services/debugmailer.js +3 -11
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +1 -1
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +3 -7
- package/lib/services/echo.js +1 -11
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +4 -3
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +45 -16
- package/lib/services/filebinary.js +147 -50
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +4 -2
- package/lib/services/filebinary.spec.js +50 -12
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -5
- package/lib/services/fileconfiguration.js +3 -12
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +2 -2
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +28 -4
- package/lib/services/invitationservice.js +9 -6
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +4 -3
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +3 -5
- package/lib/services/kubernetesconfiguration.js +7 -14
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +5 -5
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +1 -5
- package/lib/services/mailer.js +1 -10
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +3 -3
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +2 -0
- package/lib/services/notificationservice.js +2 -0
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +2 -2
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +8 -6
- package/lib/services/oauth.js +30 -14
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +11 -10
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/resource.d.ts +18 -5
- package/lib/services/resource.js +42 -23
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +4 -4
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +25 -25
- package/lib/services/service.js +21 -25
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +2 -2
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +2 -5
- package/lib/services/version.js +1 -10
- package/lib/services/version.js.map +1 -1
- package/lib/services/version.spec.js +1 -1
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +3 -5
- package/lib/stores/aggregator.js +3 -10
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +15 -8
- package/lib/stores/file.js +21 -18
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +32 -8
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +1 -5
- package/lib/stores/mapper.js +5 -13
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +2 -2
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +5 -9
- package/lib/stores/memory.js +5 -17
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -1
- package/lib/stores/memory.spec.js +36 -4
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +142 -29
- package/lib/stores/store.js +451 -82
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +31 -4
- package/lib/stores/store.spec.js +206 -35
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +53 -0
- package/lib/stores/webdaql/WebdaQLLexer.js +290 -0
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +53 -0
- package/lib/stores/webdaql/WebdaQLParserLexer.js +290 -0
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +284 -0
- package/lib/stores/webdaql/WebdaQLParserListener.js +4 -0
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +301 -0
- package/lib/stores/webdaql/WebdaQLParserParser.js +1781 -0
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -0
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +174 -0
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +4 -0
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -0
- package/lib/stores/webdaql/query.d.ts +300 -0
- package/lib/stores/webdaql/query.js +471 -0
- package/lib/stores/webdaql/query.js.map +1 -0
- package/lib/stores/webdaql/query.spec.d.ts +1 -0
- package/lib/stores/webdaql/query.spec.js +136 -0
- package/lib/stores/webdaql/query.spec.js.map +1 -0
- package/lib/test.d.ts +54 -9
- package/lib/test.js +139 -25
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +66 -0
- package/lib/unpackedapplication.js +219 -0
- package/lib/unpackedapplication.js.map +1 -0
- package/lib/utils/abstractdeployer.spec.js +1 -1
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +17 -58
- package/lib/utils/context.js +33 -124
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +52 -28
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +6 -3
- package/lib/utils/cookie.js +9 -5
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +5 -5
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/httpcontext.d.ts +182 -0
- package/lib/utils/httpcontext.js +325 -0
- package/lib/utils/httpcontext.js.map +1 -0
- package/lib/utils/httpcontext.spec.d.ts +5 -0
- package/lib/utils/httpcontext.spec.js +90 -0
- package/lib/utils/httpcontext.spec.js.map +1 -0
- package/lib/utils/logger.d.ts +18 -5
- package/lib/utils/logger.js +17 -4
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +5 -1
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +3 -3
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -1
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +2 -2
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +25 -18
- package/test/config-file-no-reload.json +2 -1
- package/test/config-file-reload.json +2 -1
- package/test/config-kube-reload.json +2 -1
- package/test/config-reload.json +1 -1
- package/test/config.json +8 -11
- package/test/config.old.json +1 -1
- package/test/moddas/annotatedservice.js +1 -3
- package/test/moddas/debugmailer.js +2 -7
- package/test/moddas/fakeservice.js +1 -1
- package/test/moddas/voidstore.js +2 -4
- package/test/models/ident.js +1 -1
- package/test/models/task.js +1 -6
- package/webda.module.json +1124 -0
- package/test/config.old-default.json +0 -151
|
@@ -15,15 +15,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
20
|
-
const
|
|
19
|
+
const assert = require("assert");
|
|
20
|
+
const fs_1 = require("fs");
|
|
21
21
|
const fs_extra_1 = require("fs-extra");
|
|
22
22
|
const path = require("path");
|
|
23
|
+
const sinon_1 = require("sinon");
|
|
23
24
|
const yaml = require("yaml");
|
|
24
|
-
const fs_1 = require("fs");
|
|
25
25
|
const __1 = require("..");
|
|
26
|
-
const
|
|
26
|
+
const test_1 = require("../test");
|
|
27
27
|
class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
|
|
28
28
|
constructor() {
|
|
29
29
|
super(...arguments);
|
|
@@ -99,7 +99,7 @@ let KubernetesConfigurationServiceTest = class KubernetesConfigurationServiceTes
|
|
|
99
99
|
assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
|
|
100
100
|
serv.getParameters().source = "/notexisting";
|
|
101
101
|
assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
|
|
102
|
-
let mock = (0, sinon_1.stub)(serv, "loadAndStoreConfiguration").
|
|
102
|
+
let mock = (0, sinon_1.stub)(serv, "loadAndStoreConfiguration").resolves();
|
|
103
103
|
yield serv.initConfiguration();
|
|
104
104
|
assert.strictEqual(mock.callCount, 1);
|
|
105
105
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubernetesconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"kubernetesconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/mailer.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Ident, User } from "..";
|
|
2
|
-
import { ModdaDefinition } from "../core";
|
|
3
2
|
import { NotificationService } from "./notificationservice";
|
|
4
3
|
import { Service, ServiceParameters } from "./service";
|
|
5
4
|
interface IEmailTemplate {
|
|
@@ -118,6 +117,7 @@ export declare abstract class AbstractMailer<T extends ServiceParameters = Servi
|
|
|
118
117
|
* Parameters
|
|
119
118
|
* config: { ... }
|
|
120
119
|
* @category CoreServices
|
|
120
|
+
* @WebdaModda
|
|
121
121
|
*/
|
|
122
122
|
declare class Mailer<T extends MailerParameters = MailerParameters> extends AbstractMailer<T> {
|
|
123
123
|
_transporter: any;
|
|
@@ -153,9 +153,5 @@ declare class Mailer<T extends MailerParameters = MailerParameters> extends Abst
|
|
|
153
153
|
* @params callback to pass to the sendMail
|
|
154
154
|
*/
|
|
155
155
|
send(options: MailerSendOptions, callback?: any): Promise<any>;
|
|
156
|
-
/**
|
|
157
|
-
* @inheritdoc
|
|
158
|
-
*/
|
|
159
|
-
static getModda(): ModdaDefinition;
|
|
160
156
|
}
|
|
161
157
|
export { Mailer, TemplatesMap, IEmailTemplate };
|
package/lib/services/mailer.js
CHANGED
|
@@ -71,6 +71,7 @@ exports.AbstractMailer = AbstractMailer;
|
|
|
71
71
|
* Parameters
|
|
72
72
|
* config: { ... }
|
|
73
73
|
* @category CoreServices
|
|
74
|
+
* @WebdaModda
|
|
74
75
|
*/
|
|
75
76
|
class Mailer extends AbstractMailer {
|
|
76
77
|
constructor() {
|
|
@@ -171,16 +172,6 @@ class Mailer extends AbstractMailer {
|
|
|
171
172
|
return this._transporter.sendMail(options, callback);
|
|
172
173
|
});
|
|
173
174
|
}
|
|
174
|
-
/**
|
|
175
|
-
* @inheritdoc
|
|
176
|
-
*/
|
|
177
|
-
static getModda() {
|
|
178
|
-
return {
|
|
179
|
-
uuid: "Webda/Mailer",
|
|
180
|
-
label: "Mailer",
|
|
181
|
-
description: "Allow your application to send email including a templating system"
|
|
182
|
-
};
|
|
183
|
-
}
|
|
184
175
|
}
|
|
185
176
|
exports.Mailer = Mailer;
|
|
186
177
|
//# sourceMappingURL=mailer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,12 +15,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
20
|
-
const
|
|
19
|
+
const assert = require("assert");
|
|
20
|
+
const sinon = require("sinon");
|
|
21
21
|
const __1 = require("..");
|
|
22
|
+
const test_1 = require("../test");
|
|
22
23
|
const mailer_1 = require("./mailer");
|
|
23
|
-
const sinon = require("sinon");
|
|
24
24
|
let MailerTest = class MailerTest extends test_1.WebdaTest {
|
|
25
25
|
before() {
|
|
26
26
|
const _super = Object.create(null, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;AAEb,
|
|
1
|
+
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,8 @@ export declare class MultiNotificationParameters extends ServiceParameters {
|
|
|
47
47
|
/**
|
|
48
48
|
* Allow an aggregation of Notification to send via multiple media
|
|
49
49
|
* like SMS and Email
|
|
50
|
+
*
|
|
51
|
+
* @WebdaModda
|
|
50
52
|
*/
|
|
51
53
|
export default class MultiNotificationService<T extends MultiNotificationParameters = MultiNotificationParameters> extends Service<T> implements NotificationService {
|
|
52
54
|
senders: NotificationService[];
|
|
@@ -28,6 +28,8 @@ exports.MultiNotificationParameters = MultiNotificationParameters;
|
|
|
28
28
|
/**
|
|
29
29
|
* Allow an aggregation of Notification to send via multiple media
|
|
30
30
|
* like SMS and Email
|
|
31
|
+
*
|
|
32
|
+
* @WebdaModda
|
|
31
33
|
*/
|
|
32
34
|
class MultiNotificationService extends service_1.Service {
|
|
33
35
|
/**
|
|
@@ -1 +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
|
|
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;;;;;GAKG;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"}
|
|
@@ -15,11 +15,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
|
+
const __1 = require("..");
|
|
20
21
|
const test_1 = require("../test");
|
|
21
22
|
const notificationservice_1 = require("./notificationservice");
|
|
22
|
-
const __1 = require("..");
|
|
23
23
|
class FakeNotification extends __1.Service {
|
|
24
24
|
constructor() {
|
|
25
25
|
super(...arguments);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notificationservice.spec.js","sourceRoot":"","sources":["../../src/services/notificationservice.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"notificationservice.spec.js","sourceRoot":"","sources":["../../src/services/notificationservice.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/oauth.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Context, EventWithContext, RequestFilter } from "../";
|
|
2
|
-
import { Service, ServiceParameters } from "./service";
|
|
3
|
-
import { Authentication } from "./authentication";
|
|
4
2
|
import { Core } from "../core";
|
|
3
|
+
import { Authentication } from "./authentication";
|
|
4
|
+
import { Service, ServiceParameters } from "./service";
|
|
5
5
|
export interface EventOAuthToken extends EventWithContext {
|
|
6
6
|
/**
|
|
7
7
|
* Provider from
|
|
@@ -12,8 +12,6 @@ export interface EventOAuthToken extends EventWithContext {
|
|
|
12
12
|
*/
|
|
13
13
|
[key: string]: any;
|
|
14
14
|
}
|
|
15
|
-
export interface EventOAuthCallback extends EventOAuthToken {
|
|
16
|
-
}
|
|
17
15
|
/**
|
|
18
16
|
* OAuth return definition
|
|
19
17
|
*/
|
|
@@ -70,11 +68,15 @@ export declare class OAuthServiceParameters extends ServiceParameters {
|
|
|
70
68
|
authenticationService: string;
|
|
71
69
|
constructor(params: any);
|
|
72
70
|
}
|
|
71
|
+
export declare type OAuthEvents = {
|
|
72
|
+
"OAuth.Callback": EventOAuthToken;
|
|
73
|
+
"OAuth.Token": EventOAuthToken;
|
|
74
|
+
};
|
|
73
75
|
/**
|
|
74
76
|
* OAuth service implementing the default OAuth workflow
|
|
75
77
|
* It is abstract as it does not manage any provider as is
|
|
76
78
|
*/
|
|
77
|
-
export declare abstract class OAuthService<T extends OAuthServiceParameters = OAuthServiceParameters> extends Service<T> implements RequestFilter<Context> {
|
|
79
|
+
export declare abstract class OAuthService<T extends OAuthServiceParameters = OAuthServiceParameters, E extends OAuthEvents = OAuthEvents> extends Service<T, E> implements RequestFilter<Context> {
|
|
78
80
|
_authenticationService: Authentication;
|
|
79
81
|
/**
|
|
80
82
|
* Ensure default parameter url
|
|
@@ -137,7 +139,7 @@ export declare abstract class OAuthService<T extends OAuthServiceParameters = OA
|
|
|
137
139
|
* @param identId
|
|
138
140
|
* @param profile
|
|
139
141
|
*/
|
|
140
|
-
handleReturn(ctx: Context, identId: string, profile: any,
|
|
142
|
+
handleReturn(ctx: Context, identId: string, profile: any, _tokens?: any): Promise<void>;
|
|
141
143
|
/**
|
|
142
144
|
* Return default url for the provider
|
|
143
145
|
*/
|
package/lib/services/oauth.js
CHANGED
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.OAuthService = exports.OAuthServiceParameters = void 0;
|
|
13
13
|
const service_1 = require("./service");
|
|
14
|
-
const uuid_1 = require("uuid");
|
|
15
14
|
class OAuthServiceParameters extends service_1.ServiceParameters {
|
|
16
15
|
constructor(params) {
|
|
17
16
|
var _a, _b, _c;
|
|
@@ -59,7 +58,7 @@ class OAuthService extends service_1.Service {
|
|
|
59
58
|
}
|
|
60
59
|
let regexps = this.getCallbackReferer();
|
|
61
60
|
let valid = false;
|
|
62
|
-
let referer = context.getHttpContext().
|
|
61
|
+
let referer = context.getHttpContext().getUniqueHeader("referer", "");
|
|
63
62
|
if (this.parameters.no_referer && referer === "") {
|
|
64
63
|
return true;
|
|
65
64
|
}
|
|
@@ -91,8 +90,12 @@ class OAuthService extends service_1.Service {
|
|
|
91
90
|
summary: `Redirect to ${name}`,
|
|
92
91
|
operationId: `logInWith${name}`,
|
|
93
92
|
responses: {
|
|
94
|
-
"302":
|
|
95
|
-
|
|
93
|
+
"302": {
|
|
94
|
+
description: ""
|
|
95
|
+
},
|
|
96
|
+
"400": {
|
|
97
|
+
description: "Missing token"
|
|
98
|
+
}
|
|
96
99
|
}
|
|
97
100
|
}
|
|
98
101
|
});
|
|
@@ -102,8 +105,12 @@ class OAuthService extends service_1.Service {
|
|
|
102
105
|
summary: `Use the token provide to validate with ${name} the user`,
|
|
103
106
|
operationId: `callbackFrom${name}`,
|
|
104
107
|
responses: {
|
|
105
|
-
"204":
|
|
106
|
-
|
|
108
|
+
"204": {
|
|
109
|
+
description: ""
|
|
110
|
+
},
|
|
111
|
+
"400": {
|
|
112
|
+
description: "Missing token"
|
|
113
|
+
}
|
|
107
114
|
}
|
|
108
115
|
}
|
|
109
116
|
});
|
|
@@ -114,8 +121,12 @@ class OAuthService extends service_1.Service {
|
|
|
114
121
|
summary: `Use the token provide to validate with ${name} the user`,
|
|
115
122
|
operationId: `verify${name}Token`,
|
|
116
123
|
responses: {
|
|
117
|
-
"204":
|
|
118
|
-
|
|
124
|
+
"204": {
|
|
125
|
+
description: ""
|
|
126
|
+
},
|
|
127
|
+
"400": {
|
|
128
|
+
description: "Missing token"
|
|
129
|
+
}
|
|
119
130
|
}
|
|
120
131
|
}
|
|
121
132
|
});
|
|
@@ -127,8 +138,12 @@ class OAuthService extends service_1.Service {
|
|
|
127
138
|
summary: "Retrieve the scope intended to be used with this auth",
|
|
128
139
|
operationId: `get${name}Scope`,
|
|
129
140
|
responses: {
|
|
130
|
-
"204":
|
|
131
|
-
|
|
141
|
+
"204": {
|
|
142
|
+
description: ""
|
|
143
|
+
},
|
|
144
|
+
"400": {
|
|
145
|
+
description: "Missing token"
|
|
146
|
+
}
|
|
132
147
|
}
|
|
133
148
|
}
|
|
134
149
|
});
|
|
@@ -157,9 +172,10 @@ class OAuthService extends service_1.Service {
|
|
|
157
172
|
_redirect(ctx) {
|
|
158
173
|
// implement default behavior
|
|
159
174
|
let redirect_uri = this.parameters.redirect_uri || `${ctx.getHttpContext().getAbsoluteUrl()}/callback`;
|
|
175
|
+
let redirect = ctx.getParameters().redirect || ctx.getHttpContext().getHeaders().referer;
|
|
160
176
|
if (this.parameters.authorized_uris) {
|
|
161
177
|
// Might want to use regexp here
|
|
162
|
-
if (this.parameters.authorized_uris.indexOf(
|
|
178
|
+
if (this.parameters.authorized_uris.indexOf(redirect) < 0) {
|
|
163
179
|
if (ctx.getHttpContext().getHeaders().referer || !this.parameters.no_referer) {
|
|
164
180
|
// The redirect_uri is not authorized , might be forging HOST request
|
|
165
181
|
throw 401;
|
|
@@ -167,9 +183,9 @@ class OAuthService extends service_1.Service {
|
|
|
167
183
|
}
|
|
168
184
|
}
|
|
169
185
|
// Generate 2 random uuid: nonce and state
|
|
170
|
-
ctx.getSession().state = (
|
|
186
|
+
ctx.getSession().state = this.getWebda().getUuid("base64");
|
|
171
187
|
// Redirect to the calling uri
|
|
172
|
-
ctx.getSession().redirect =
|
|
188
|
+
ctx.getSession().redirect = redirect;
|
|
173
189
|
ctx.redirect(this.generateAuthUrl(redirect_uri, ctx.getSession().state, ctx));
|
|
174
190
|
}
|
|
175
191
|
/**
|
|
@@ -204,7 +220,7 @@ class OAuthService extends service_1.Service {
|
|
|
204
220
|
* @param identId
|
|
205
221
|
* @param profile
|
|
206
222
|
*/
|
|
207
|
-
handleReturn(ctx, identId, profile,
|
|
223
|
+
handleReturn(ctx, identId, profile, _tokens = undefined) {
|
|
208
224
|
return __awaiter(this, void 0, void 0, function* () {
|
|
209
225
|
// If no identId has been provided error
|
|
210
226
|
if (!identId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/services/oauth.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/services/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,11 +15,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
|
+
const __1 = require("../");
|
|
20
21
|
const test_1 = require("../test");
|
|
21
22
|
const oauth_1 = require("./oauth");
|
|
22
|
-
const __1 = require("../");
|
|
23
23
|
class FakeOAuthService extends oauth_1.OAuthService {
|
|
24
24
|
getDefaultUrl() {
|
|
25
25
|
return "/fake";
|
|
@@ -63,18 +63,18 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
63
63
|
testCheckRequest() {
|
|
64
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
65
|
let ctx = yield this.newContext();
|
|
66
|
-
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80,
|
|
66
|
+
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80, { referer: "bouzouf.com" }));
|
|
67
67
|
assert.strictEqual(yield this.service.checkRequest(ctx), true, "should allow bouzouf.com referer");
|
|
68
|
-
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80,
|
|
68
|
+
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80, { referer: "bouzouf2.com" }));
|
|
69
69
|
assert.strictEqual(yield this.service.checkRequest(ctx), true, "should allow bouzouf2.com referer");
|
|
70
|
-
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80,
|
|
70
|
+
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80, { referer: "bouzouf12.com" }));
|
|
71
71
|
assert.strictEqual(yield this.service.checkRequest(ctx), false, "should not allow bouzouf12.com referer");
|
|
72
|
-
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/plop", "https", 80,
|
|
72
|
+
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/plop", "https", 80, { referer: "bouzouf.com" }));
|
|
73
73
|
assert.strictEqual(yield this.service.checkRequest(ctx), false, "should allow bouzouf.com only on its own url");
|
|
74
|
-
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80,
|
|
74
|
+
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {}));
|
|
75
75
|
assert.strictEqual(yield this.service.checkRequest(ctx), false, "should not allow without referer");
|
|
76
76
|
this.service.getParameters().no_referer = true;
|
|
77
|
-
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80,
|
|
77
|
+
ctx.setHttpContext(new __1.HttpContext("bouzouf.com", "GET", "/fake", "https", 80, {}));
|
|
78
78
|
assert.strictEqual(yield this.service.checkRequest(ctx), true, "should allow without referer");
|
|
79
79
|
});
|
|
80
80
|
}
|
|
@@ -141,6 +141,7 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
141
141
|
scope: ["email", "image"],
|
|
142
142
|
url: "/bouzouf"
|
|
143
143
|
});
|
|
144
|
+
// @ts-ignore readonly
|
|
144
145
|
ctx.getHttpContext().getHeaders().referer = "http://myownwebsite.com";
|
|
145
146
|
this.service._redirect(ctx);
|
|
146
147
|
assert.strictEqual(ctx.getSession().redirect, "http://myownwebsite.com");
|
|
@@ -149,14 +150,14 @@ let OAuthServiceTest = class OAuthServiceTest extends test_1.WebdaTest {
|
|
|
149
150
|
redirect() {
|
|
150
151
|
return __awaiter(this, void 0, void 0, function* () {
|
|
151
152
|
let ctx = yield this.newContext();
|
|
152
|
-
ctx.setHttpContext(new __1.HttpContext("test.webda.io", "GET", "/fake", "https", 443,
|
|
153
|
+
ctx.setHttpContext(new __1.HttpContext("test.webda.io", "GET", "/fake", "https", 443, {
|
|
153
154
|
referer: "https://redirect.me/plop"
|
|
154
155
|
}));
|
|
155
156
|
yield this.service._redirect(ctx);
|
|
156
157
|
assert.notStrictEqual(ctx.getSession().state, undefined);
|
|
157
158
|
assert.strictEqual(ctx.getSession().redirect, "https://redirect.me/plop");
|
|
158
159
|
assert.strictEqual(ctx.getResponseHeaders().Location, "/fakeredirect");
|
|
159
|
-
ctx.setHttpContext(new __1.HttpContext("test.webda.io", "GET", "/fake", "https", 443,
|
|
160
|
+
ctx.setHttpContext(new __1.HttpContext("test.webda.io", "GET", "/fake", "https", 443, {
|
|
160
161
|
referer: "https://redirect.me/plop2"
|
|
161
162
|
}));
|
|
162
163
|
assert.throws(() => this.service._redirect(ctx), /401/);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.spec.js","sourceRoot":"","sources":["../../src/services/oauth.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"oauth.spec.js","sourceRoot":"","sources":["../../src/services/oauth.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ModdaDefinition } from "..";
|
|
2
1
|
import { Context } from "../utils/context";
|
|
3
2
|
import { Service, ServiceParameters } from "./service";
|
|
4
3
|
/**
|
|
@@ -23,6 +22,19 @@ export declare class ResourceServiceParameters extends ServiceParameters {
|
|
|
23
22
|
* @default false
|
|
24
23
|
*/
|
|
25
24
|
rootRedirect?: boolean;
|
|
25
|
+
/**
|
|
26
|
+
* Index file
|
|
27
|
+
*
|
|
28
|
+
* @default index.html
|
|
29
|
+
*/
|
|
30
|
+
index?: string;
|
|
31
|
+
/**
|
|
32
|
+
* Return the index file for any unfound resource
|
|
33
|
+
* Useful for single page application
|
|
34
|
+
*
|
|
35
|
+
* @default true
|
|
36
|
+
*/
|
|
37
|
+
indexFallback?: boolean;
|
|
26
38
|
constructor(params: any);
|
|
27
39
|
}
|
|
28
40
|
/**
|
|
@@ -31,12 +43,17 @@ export declare class ResourceServiceParameters extends ServiceParameters {
|
|
|
31
43
|
* It is the same as `static` on `express`
|
|
32
44
|
*
|
|
33
45
|
* @category CoreServices
|
|
46
|
+
* @WebdaModda
|
|
34
47
|
*/
|
|
35
48
|
export default class ResourceService<T extends ResourceServiceParameters = ResourceServiceParameters> extends Service<T> {
|
|
36
49
|
/**
|
|
37
50
|
* Resolved path to the folder to serve
|
|
38
51
|
*/
|
|
39
52
|
_resolved: string;
|
|
53
|
+
/**
|
|
54
|
+
* If serving just one file
|
|
55
|
+
*/
|
|
56
|
+
fileOnly: boolean;
|
|
40
57
|
/**
|
|
41
58
|
* Load the parameters for a service
|
|
42
59
|
*/
|
|
@@ -61,9 +78,5 @@ export default class ResourceService<T extends ResourceServiceParameters = Resou
|
|
|
61
78
|
* @param ctx
|
|
62
79
|
*/
|
|
63
80
|
_serve(ctx: Context): void;
|
|
64
|
-
/**
|
|
65
|
-
* @inheritdoc
|
|
66
|
-
*/
|
|
67
|
-
static getModda(): ModdaDefinition;
|
|
68
81
|
}
|
|
69
82
|
export { ResourceService };
|