@webda/core 2.0.0-beta.3 → 2.1.0
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 +5 -5
- package/lib/application.js +71 -84
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +121 -140
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +21 -25
- package/lib/core.js +233 -320
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +334 -406
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +49 -48
- package/lib/index.js +53 -70
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +2 -2
- package/lib/models/aclmodel.js +63 -90
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +128 -152
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +33 -14
- package/lib/models/coremodel.js +160 -117
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +143 -107
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.js +1 -2
- package/lib/models/ident.d.ts +3 -3
- package/lib/models/ident.js +4 -9
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +9 -11
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +2 -2
- package/lib/models/ownermodel.js +39 -62
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +126 -168
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -1
- package/lib/models/rolemodel.js +24 -40
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +44 -63
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +9 -9
- package/lib/models/user.js +3 -8
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +14 -16
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +2 -2
- package/lib/queues/filequeue.js +72 -93
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +53 -70
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +2 -2
- package/lib/queues/memoryqueue.js +37 -61
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +142 -165
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +2 -2
- package/lib/queues/pubsubservice.js +3 -7
- package/lib/queues/pubsubservice.js.map +1 -1
- package/lib/queues/queue.spec.d.ts +1 -1
- package/lib/queues/queue.spec.js +42 -56
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +3 -3
- package/lib/queues/queueservice.js +51 -67
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +3 -3
- package/lib/router.js +46 -47
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +64 -61
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.d.ts +2 -2
- package/lib/services/asyncevents.js +44 -64
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.js +81 -98
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +23 -13
- package/lib/services/authentication.js +540 -566
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +411 -447
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +8 -6
- package/lib/services/binary.js +212 -245
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +3 -3
- package/lib/services/binary.spec.js +390 -443
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +3 -3
- package/lib/services/cloudbinary.js +45 -70
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +3 -3
- package/lib/services/cloudbinary.spec.js +133 -162
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +1 -1
- package/lib/services/configuration.js +78 -105
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +63 -83
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +3 -2
- package/lib/services/cron.js +9 -13
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +18 -21
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +9 -4
- package/lib/services/cryptoservice.js +187 -221
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/cryptoservice.spec.js +88 -115
- package/lib/services/cryptoservice.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +1 -1
- package/lib/services/debugmailer.js +13 -34
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +16 -29
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +2 -2
- package/lib/services/echo.js +15 -31
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +27 -40
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +5 -5
- package/lib/services/filebinary.js +165 -210
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +2 -1
- package/lib/services/filebinary.spec.js +106 -116
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -1
- package/lib/services/fileconfiguration.js +25 -44
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +79 -109
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +8 -8
- package/lib/services/invitationservice.js +274 -314
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +443 -449
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -1
- package/lib/services/kubernetesconfiguration.js +41 -60
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +80 -98
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +4 -4
- package/lib/services/mailer.js +62 -86
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +86 -127
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +3 -3
- package/lib/services/notificationservice.js +21 -42
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +47 -73
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +4 -4
- package/lib/services/oauth.js +68 -83
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +130 -156
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +2 -6
- package/lib/services/proxy.js +45 -58
- package/lib/services/proxy.js.map +1 -1
- package/lib/services/proxy.spec.js +34 -53
- package/lib/services/proxy.spec.js.map +1 -1
- package/lib/services/resource.d.ts +2 -2
- package/lib/services/resource.js +12 -18
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +67 -99
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +26 -3
- package/lib/services/service.js +68 -40
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +62 -67
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +1 -1
- package/lib/services/version.js +3 -8
- package/lib/services/version.js.map +1 -1
- package/lib/services/version.spec.js +11 -24
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +2 -2
- package/lib/stores/aggregator.js +37 -58
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +3 -3
- package/lib/stores/file.js +93 -131
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +2 -2
- package/lib/stores/file.spec.js +262 -289
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +3 -3
- package/lib/stores/mapper.js +110 -137
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +133 -150
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +3 -3
- package/lib/stores/memory.js +98 -144
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -2
- package/lib/stores/memory.spec.js +124 -145
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +27 -17
- package/lib/stores/store.js +833 -849
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +5 -4
- package/lib/stores/store.spec.js +625 -669
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLParserLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +10 -10
- package/lib/stores/webdaql/WebdaQLParserParser.js +62 -91
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -1
- package/lib/stores/webdaql/query.d.ts +4 -5
- package/lib/stores/webdaql/query.js +16 -19
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +30 -32
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +3 -3
- package/lib/test.js +73 -100
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +1 -1
- package/lib/unpackedapplication.js +49 -39
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.js +1 -5
- package/lib/utils/abstractdeployer.js.map +1 -1
- package/lib/utils/abstractdeployer.spec.js +6 -8
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +7 -5
- package/lib/utils/context.js +95 -103
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +139 -163
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +3 -3
- package/lib/utils/cookie.js +42 -61
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +42 -64
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/esm.d.ts +4 -0
- package/lib/utils/esm.js +10 -0
- package/lib/utils/esm.js.map +1 -0
- package/lib/utils/httpcontext.d.ts +3 -0
- package/lib/utils/httpcontext.js +48 -65
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +37 -56
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +2 -2
- package/lib/utils/logger.js +15 -28
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js +9 -11
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +17 -20
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +43 -44
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +6 -6
- package/lib/utils/session.js +37 -59
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.js +38 -51
- package/lib/utils/session.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -1
- package/lib/utils/waiter.js +32 -52
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +75 -92
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +18 -13
- package/test/config-invitation.json +1 -3
- package/test/config.json +1 -2
- package/test/config.old.json +1 -2
- package/test/moddas/annotatedservice.js +5 -5
- package/test/moddas/debugmailer.js +2 -3
- package/test/moddas/fakeservice.js +2 -3
- package/test/moddas/voidstore.js +6 -4
- package/test/models/ident.js +2 -6
- package/test/models/task.js +3 -7
- package/test/package.json +2 -1
- package/webda.module.json +895 -190
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notificationservice.js","sourceRoot":"","sources":["../../src/services/notificationservice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"notificationservice.js","sourceRoot":"","sources":["../../src/services/notificationservice.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAyBvD;;GAEG;AACH,MAAM,OAAO,2BAA4B,SAAQ,iBAAiB;IAchE;;OAEG;IACH,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,KAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;IACtB,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,wBACnB,SAAQ,OAAU;IAKlB;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,2BAA2B,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,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;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAkB,EAAE,YAAoB,EAAE,YAAiB;QAChF,MAAM,eAAe,GAAG,CACtB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE;gBACpF,OAAO,CAAC,CAAC;aACV;QACH,CAAC,CAAC,CACH,CACF,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YAC7B,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;SACnF;QACD,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;IACpG,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,IAAkB;QAC5C,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;IAChG,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,YAAoB;QACxC,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;IAClG,CAAC;CACF;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
|
|
@@ -1,104 +1,78 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
4
|
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
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
6
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
-
const assert = require("assert");
|
|
20
|
-
const __1 = require("..");
|
|
21
|
-
const test_1 = require("../test");
|
|
22
|
-
const notificationservice_1 = require("./notificationservice");
|
|
23
|
-
class FakeNotification extends __1.Service {
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import { Service } from "...js";
|
|
10
|
+
import { WebdaTest } from "../test.js";
|
|
11
|
+
import { MultiNotificationService } from "./notificationservice.js";
|
|
12
|
+
class FakeNotification extends Service {
|
|
24
13
|
constructor() {
|
|
25
14
|
super(...arguments);
|
|
26
15
|
this.template = false;
|
|
27
16
|
this.user = false;
|
|
28
17
|
this.sent = 0;
|
|
29
18
|
}
|
|
30
|
-
hasNotification(notification) {
|
|
31
|
-
return
|
|
32
|
-
return this.template;
|
|
33
|
-
});
|
|
19
|
+
async hasNotification(notification) {
|
|
20
|
+
return this.template;
|
|
34
21
|
}
|
|
35
|
-
handleNotificationFor(user) {
|
|
36
|
-
return
|
|
37
|
-
return this.user;
|
|
38
|
-
});
|
|
22
|
+
async handleNotificationFor(user) {
|
|
23
|
+
return this.user;
|
|
39
24
|
}
|
|
40
|
-
sendNotification(user, notification, replacements) {
|
|
41
|
-
|
|
42
|
-
this.sent++;
|
|
43
|
-
});
|
|
25
|
+
async sendNotification(user, notification, replacements) {
|
|
26
|
+
this.sent++;
|
|
44
27
|
}
|
|
45
28
|
}
|
|
46
|
-
let NotificationServiceTest = class NotificationServiceTest extends
|
|
29
|
+
let NotificationServiceTest = class NotificationServiceTest extends WebdaTest {
|
|
47
30
|
getTestConfiguration() {
|
|
48
31
|
return process.cwd() + "/test/config-invitation.json";
|
|
49
32
|
}
|
|
50
|
-
before() {
|
|
51
|
-
|
|
52
|
-
|
|
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();
|
|
33
|
+
async before() {
|
|
34
|
+
await super.before();
|
|
35
|
+
this.service = new MultiNotificationService(this.webda, "notif", {
|
|
36
|
+
senders: ["notifA", "notifB"]
|
|
65
37
|
});
|
|
38
|
+
this.fakeA = new FakeNotification(this.webda, "notifA", {});
|
|
39
|
+
this.fakeB = new FakeNotification(this.webda, "notifB", {});
|
|
40
|
+
this.registerService(this.fakeA);
|
|
41
|
+
this.registerService(this.fakeB);
|
|
42
|
+
this.registerService(this.service);
|
|
43
|
+
this.service.resolve();
|
|
66
44
|
}
|
|
67
|
-
cov() {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 4);
|
|
86
|
-
});
|
|
45
|
+
async cov() {
|
|
46
|
+
assert.strictEqual(await this.service.handleNotificationFor(undefined), false);
|
|
47
|
+
assert.strictEqual(await this.service.hasNotification(undefined), false);
|
|
48
|
+
this.fakeB.user = true;
|
|
49
|
+
assert.strictEqual(await this.service.handleNotificationFor(undefined), true);
|
|
50
|
+
this.fakeA.template = true;
|
|
51
|
+
assert.strictEqual(await this.service.hasNotification(undefined), true);
|
|
52
|
+
await this.service.sendNotification(undefined, undefined, undefined);
|
|
53
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 0);
|
|
54
|
+
this.fakeA.user = true;
|
|
55
|
+
await this.service.sendNotification(undefined, undefined, undefined);
|
|
56
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 1);
|
|
57
|
+
this.fakeB.template = true;
|
|
58
|
+
await this.service.sendNotification(undefined, undefined, undefined);
|
|
59
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 2);
|
|
60
|
+
this.service.getParameters().multiple = true;
|
|
61
|
+
await this.service.sendNotification(undefined, undefined, undefined);
|
|
62
|
+
assert.strictEqual(this.fakeA.sent + this.fakeB.sent, 4);
|
|
87
63
|
}
|
|
88
|
-
exception() {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
assert.throws(() => this.service.resolve(), /Unknown service 'unknown'/);
|
|
92
|
-
});
|
|
64
|
+
async exception() {
|
|
65
|
+
this.service.getParameters().senders.push("unknown");
|
|
66
|
+
assert.throws(() => this.service.resolve(), /Unknown service 'unknown'/);
|
|
93
67
|
}
|
|
94
68
|
};
|
|
95
69
|
__decorate([
|
|
96
|
-
|
|
70
|
+
test
|
|
97
71
|
], NotificationServiceTest.prototype, "cov", null);
|
|
98
72
|
__decorate([
|
|
99
|
-
|
|
73
|
+
test
|
|
100
74
|
], NotificationServiceTest.prototype, "exception", null);
|
|
101
75
|
NotificationServiceTest = __decorate([
|
|
102
|
-
|
|
76
|
+
suite
|
|
103
77
|
], NotificationServiceTest);
|
|
104
78
|
//# sourceMappingURL=notificationservice.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notificationservice.spec.js","sourceRoot":"","sources":["../../src/services/notificationservice.spec.ts"],"names":[],"mappings":"
|
|
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
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { Authentication } from "./authentication";
|
|
4
|
-
import { Service, ServiceParameters } from "./service";
|
|
1
|
+
import { Core } from "../core.js";
|
|
2
|
+
import { Context, EventWithContext, RequestFilter } from "../index.js";
|
|
3
|
+
import { Authentication } from "./authentication.js";
|
|
4
|
+
import { Service, ServiceParameters } from "./service.js";
|
|
5
5
|
export interface EventOAuthToken extends EventWithContext {
|
|
6
6
|
/**
|
|
7
7
|
* Provider from
|
package/lib/services/oauth.js
CHANGED
|
@@ -1,31 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
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.OAuthService = exports.OAuthServiceParameters = void 0;
|
|
13
|
-
const service_1 = require("./service");
|
|
14
|
-
class OAuthServiceParameters extends service_1.ServiceParameters {
|
|
1
|
+
import { Service, ServiceParameters } from "./service.js";
|
|
2
|
+
export class OAuthServiceParameters extends ServiceParameters {
|
|
15
3
|
constructor(params) {
|
|
16
|
-
var _a, _b, _c;
|
|
17
4
|
super(params);
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
5
|
+
this.scope ?? (this.scope = ["email"]);
|
|
6
|
+
this.exposeScope ?? (this.exposeScope = false);
|
|
7
|
+
this.authenticationService ?? (this.authenticationService = "Authentication");
|
|
21
8
|
}
|
|
22
9
|
}
|
|
23
|
-
exports.OAuthServiceParameters = OAuthServiceParameters;
|
|
24
10
|
/**
|
|
25
11
|
* OAuth service implementing the default OAuth workflow
|
|
26
12
|
* It is abstract as it does not manage any provider as is
|
|
27
13
|
*/
|
|
28
|
-
class OAuthService extends
|
|
14
|
+
export class OAuthService extends Service {
|
|
29
15
|
/**
|
|
30
16
|
* Ensure default parameter url
|
|
31
17
|
*/
|
|
@@ -50,26 +36,24 @@ class OAuthService extends service_1.Service {
|
|
|
50
36
|
* @param context
|
|
51
37
|
* @returns
|
|
52
38
|
*/
|
|
53
|
-
checkRequest(context) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
break;
|
|
69
|
-
}
|
|
39
|
+
async checkRequest(context) {
|
|
40
|
+
// Only authorize url from this service
|
|
41
|
+
if (!context.getHttpContext().getRelativeUri().startsWith(this.parameters.url)) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
let regexps = this.getCallbackReferer();
|
|
45
|
+
let valid = false;
|
|
46
|
+
let referer = context.getHttpContext().getUniqueHeader("referer", "");
|
|
47
|
+
if (this.parameters.no_referer && referer === "") {
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
for (let i in regexps) {
|
|
51
|
+
valid = referer.match(regexps[i]) !== null;
|
|
52
|
+
if (valid) {
|
|
53
|
+
break;
|
|
70
54
|
}
|
|
71
|
-
|
|
72
|
-
|
|
55
|
+
}
|
|
56
|
+
return valid;
|
|
73
57
|
}
|
|
74
58
|
/**
|
|
75
59
|
* Resolve dynamic dependancy
|
|
@@ -171,7 +155,6 @@ class OAuthService extends service_1.Service {
|
|
|
171
155
|
* @param ctx
|
|
172
156
|
*/
|
|
173
157
|
_redirect(ctx) {
|
|
174
|
-
var _a;
|
|
175
158
|
// implement default behavior
|
|
176
159
|
let redirect_uri = this.parameters.redirect_uri || `${ctx.getHttpContext().getAbsoluteUrl()}/callback`;
|
|
177
160
|
let redirect = ctx.getParameters().redirect || ctx.getHttpContext().getHeaders().referer;
|
|
@@ -185,7 +168,7 @@ class OAuthService extends service_1.Service {
|
|
|
185
168
|
}
|
|
186
169
|
}
|
|
187
170
|
const session = ctx.getSession();
|
|
188
|
-
|
|
171
|
+
session.oauth ?? (session.oauth = {});
|
|
189
172
|
// Generate 2 random uuid: nonce and state
|
|
190
173
|
session.oauth.state = this.getWebda().getUuid("base64");
|
|
191
174
|
// Redirect to the calling uri
|
|
@@ -198,11 +181,14 @@ class OAuthService extends service_1.Service {
|
|
|
198
181
|
* This is private to avoid any override
|
|
199
182
|
* @param context
|
|
200
183
|
*/
|
|
201
|
-
_token(context) {
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
184
|
+
async _token(context) {
|
|
185
|
+
const res = await this.handleToken(context);
|
|
186
|
+
await this.handleReturn(context, res.identId, res.profile);
|
|
187
|
+
await this.emitSync("OAuth.Callback", {
|
|
188
|
+
...res,
|
|
189
|
+
type: "token",
|
|
190
|
+
provider: this.getName(),
|
|
191
|
+
context
|
|
206
192
|
});
|
|
207
193
|
}
|
|
208
194
|
/**
|
|
@@ -211,11 +197,14 @@ class OAuthService extends service_1.Service {
|
|
|
211
197
|
* This is private to avoid any override
|
|
212
198
|
* @param ctx
|
|
213
199
|
*/
|
|
214
|
-
_callback(ctx) {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
200
|
+
async _callback(ctx) {
|
|
201
|
+
const res = await this.handleCallback(ctx);
|
|
202
|
+
await this.handleReturn(ctx, res.identId, res.profile);
|
|
203
|
+
await this.emitSync("OAuth.Callback", {
|
|
204
|
+
...res,
|
|
205
|
+
type: "callback",
|
|
206
|
+
provider: this.getName(),
|
|
207
|
+
context: ctx
|
|
219
208
|
});
|
|
220
209
|
}
|
|
221
210
|
/**
|
|
@@ -224,38 +213,34 @@ class OAuthService extends service_1.Service {
|
|
|
224
213
|
* @param identId
|
|
225
214
|
* @param profile
|
|
226
215
|
*/
|
|
227
|
-
handleReturn(ctx, identId, profile, _tokens = undefined) {
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
//
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
session.oauth.state = undefined;
|
|
256
|
-
session.oauth.redirect = undefined;
|
|
257
|
-
});
|
|
216
|
+
async handleReturn(ctx, identId, profile, _tokens = undefined) {
|
|
217
|
+
// If no identId has been provided error
|
|
218
|
+
if (!identId) {
|
|
219
|
+
throw 403;
|
|
220
|
+
}
|
|
221
|
+
const session = ctx.getSession();
|
|
222
|
+
session.oauth ?? (session.oauth = {});
|
|
223
|
+
// If authentication service then create a User/Ident couple
|
|
224
|
+
if (this._authenticationService) {
|
|
225
|
+
// Should call the onIdentLogin()
|
|
226
|
+
await this._authenticationService.onIdentLogin(ctx, this.getName().toLowerCase(), identId, profile);
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
// Login in session
|
|
230
|
+
ctx.getSession().login(identId, identId);
|
|
231
|
+
// Store the profile retrieved
|
|
232
|
+
session.oauth.profile = profile;
|
|
233
|
+
}
|
|
234
|
+
// Redirect to our targets
|
|
235
|
+
if (session.oauth.redirect) {
|
|
236
|
+
ctx.redirect(session.oauth.redirect);
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
ctx.write("Your authentication is successful");
|
|
240
|
+
}
|
|
241
|
+
// Clean variables from session
|
|
242
|
+
session.oauth.state = undefined;
|
|
243
|
+
session.oauth.redirect = undefined;
|
|
258
244
|
}
|
|
259
245
|
}
|
|
260
|
-
exports.OAuthService = OAuthService;
|
|
261
246
|
//# sourceMappingURL=oauth.js.map
|
|
@@ -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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"}
|