@webda/core 2.0.0-beta.2 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/application.d.ts +5 -21
- 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 +44 -45
- package/lib/core.js +239 -320
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +326 -391
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +49 -45
- package/lib/index.js +54 -67
- 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 -151
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +39 -17
- 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 -166
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +2 -2
- package/lib/models/rolemodel.js +24 -40
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +44 -61
- 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 +4 -4
- package/lib/queues/queueservice.js +52 -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 +28 -19
- package/lib/services/authentication.js +542 -574
- 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 +9 -7
- package/lib/services/binary.js +213 -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 +6 -3
- package/lib/services/configuration.js +78 -103
- 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 +258 -0
- package/lib/services/cryptoservice.js +312 -0
- package/lib/services/cryptoservice.js.map +1 -0
- package/lib/services/cryptoservice.spec.d.ts +1 -0
- package/lib/services/cryptoservice.spec.js +137 -0
- package/lib/services/cryptoservice.spec.js.map +1 -0
- 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 +10 -5
- package/lib/services/filebinary.js +171 -205
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +2 -1
- package/lib/services/filebinary.spec.js +106 -117
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +2 -2
- package/lib/services/fileconfiguration.js +25 -43
- 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 +10 -10
- package/lib/services/invitationservice.js +275 -313
- 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 +2 -2
- package/lib/services/kubernetesconfiguration.js +41 -59
- 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 +4 -4
- package/lib/services/notificationservice.js +23 -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 +32 -6
- package/lib/services/oauth.js +73 -78
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +128 -148
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +74 -0
- package/lib/services/proxy.js +126 -0
- package/lib/services/proxy.js.map +1 -0
- package/lib/services/proxy.spec.d.ts +1 -0
- package/lib/services/proxy.spec.js +59 -0
- package/lib/services/proxy.spec.js.map +1 -0
- 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 +29 -6
- package/lib/services/service.js +69 -39
- 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 +3 -3
- package/lib/stores/aggregator.js +37 -57
- 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 +4 -4
- package/lib/stores/mapper.js +111 -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 +67 -6
- package/lib/stores/memory.js +155 -117
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -2
- package/lib/stores/memory.spec.js +127 -105
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +40 -16
- package/lib/stores/store.js +847 -830
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +6 -4
- package/lib/stores/store.spec.js +628 -647
- 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 +74 -94
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +1 -1
- package/lib/unpackedapplication.js +44 -38
- 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 +61 -29
- package/lib/utils/context.js +133 -127
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +144 -153
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +66 -45
- package/lib/utils/cookie.js +69 -158
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +220 -238
- 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 +120 -0
- package/lib/utils/session.js +155 -0
- package/lib/utils/session.js.map +1 -0
- package/lib/utils/session.spec.d.ts +1 -0
- package/lib/utils/session.spec.js +66 -0
- package/lib/utils/session.spec.js.map +1 -0
- 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 +22 -14
- package/test/config-invitation.json +1 -3
- package/test/config.json +3 -3
- 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 -189
|
@@ -1,25 +1,16 @@
|
|
|
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
|
-
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
-
const assert = require("assert");
|
|
20
|
-
const index_1 = require("../index");
|
|
21
|
-
const test_1 = require("../test");
|
|
22
|
-
class RolePolicyModel extends index_1.RoleModel {
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import { Core, HttpContext, RoleModel, User } from "../index.js";
|
|
10
|
+
import { TestApplication } from "../test.js";
|
|
11
|
+
import { getCommonJS } from "../utils/esm.js";
|
|
12
|
+
const { __dirname } = getCommonJS(import.meta.url);
|
|
13
|
+
class RolePolicyModel extends RoleModel {
|
|
23
14
|
getRolesMap() {
|
|
24
15
|
return {
|
|
25
16
|
get: "member",
|
|
@@ -28,7 +19,7 @@ class RolePolicyModel extends index_1.RoleModel {
|
|
|
28
19
|
};
|
|
29
20
|
}
|
|
30
21
|
}
|
|
31
|
-
class RolePolicyModelPermissive extends
|
|
22
|
+
class RolePolicyModelPermissive extends RoleModel {
|
|
32
23
|
getRolesMap() {
|
|
33
24
|
return {
|
|
34
25
|
get: "member",
|
|
@@ -40,64 +31,56 @@ class RolePolicyModelPermissive extends index_1.RoleModel {
|
|
|
40
31
|
}
|
|
41
32
|
}
|
|
42
33
|
let RolePolicyTest = class RolePolicyTest {
|
|
43
|
-
before() {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
34
|
+
async before() {
|
|
35
|
+
let app = new TestApplication(__dirname + "/../../test/config.json");
|
|
36
|
+
await app.load();
|
|
37
|
+
this._webda = new Core(app);
|
|
38
|
+
await this._webda.init();
|
|
39
|
+
this._ctx = await this._webda.newContext(new HttpContext("test.webda.io", "GET", "/"));
|
|
40
|
+
this._session = this._ctx.newSession();
|
|
41
|
+
this._session.login("none", "none");
|
|
42
|
+
// @ts-ignore
|
|
43
|
+
this._ctx.getCurrentUser = async () => {
|
|
44
|
+
return this._user;
|
|
45
|
+
};
|
|
46
|
+
this.nonPermissive = new RolePolicyModel();
|
|
47
|
+
this.permissive = new RolePolicyModelPermissive();
|
|
48
|
+
this._user = new User();
|
|
49
|
+
this._user.addRole("member");
|
|
59
50
|
}
|
|
60
|
-
noLogged() {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
assert.rejects(() => this.permissive.canAct(this._ctx, "get"), /403/g);
|
|
64
|
-
});
|
|
51
|
+
async noLogged() {
|
|
52
|
+
this._ctx.getSession().logout();
|
|
53
|
+
assert.rejects(() => this.permissive.canAct(this._ctx, "get"), /403/g);
|
|
65
54
|
}
|
|
66
|
-
get() {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
assert.strictEqual(yield this.nonPermissive.canAct(this._ctx, "get"), this.nonPermissive);
|
|
70
|
-
});
|
|
55
|
+
async get() {
|
|
56
|
+
assert.strictEqual(await this.permissive.canAct(this._ctx, "get"), this.permissive);
|
|
57
|
+
assert.strictEqual(await this.nonPermissive.canAct(this._ctx, "get"), this.nonPermissive);
|
|
71
58
|
}
|
|
72
|
-
action() {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
yield assert.rejects(this.nonPermissive.canAct.bind(this.nonPermissive, this._ctx, "action"));
|
|
76
|
-
});
|
|
59
|
+
async action() {
|
|
60
|
+
assert.strictEqual(await this.permissive.canAct(this._ctx, "action"), this.permissive);
|
|
61
|
+
await assert.rejects(this.nonPermissive.canAct.bind(this.nonPermissive, this._ctx, "action"));
|
|
77
62
|
}
|
|
78
|
-
delete() {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
assert.strictEqual(yield this.nonPermissive.canAct(this._ctx, "delete"), this.nonPermissive);
|
|
85
|
-
});
|
|
63
|
+
async delete() {
|
|
64
|
+
assert.strictEqual(await this.permissive.canAct(this._ctx, "delete"), this.permissive);
|
|
65
|
+
await assert.rejects(this.nonPermissive.canAct.bind(this.nonPermissive, this._ctx, "delete"));
|
|
66
|
+
this._user.addRole("admin");
|
|
67
|
+
this._session.roles = undefined;
|
|
68
|
+
assert.strictEqual(await this.nonPermissive.canAct(this._ctx, "delete"), this.nonPermissive);
|
|
86
69
|
}
|
|
87
70
|
};
|
|
88
71
|
__decorate([
|
|
89
|
-
|
|
72
|
+
test
|
|
90
73
|
], RolePolicyTest.prototype, "noLogged", null);
|
|
91
74
|
__decorate([
|
|
92
|
-
|
|
75
|
+
test
|
|
93
76
|
], RolePolicyTest.prototype, "get", null);
|
|
94
77
|
__decorate([
|
|
95
|
-
|
|
78
|
+
test
|
|
96
79
|
], RolePolicyTest.prototype, "action", null);
|
|
97
80
|
__decorate([
|
|
98
|
-
|
|
81
|
+
test
|
|
99
82
|
], RolePolicyTest.prototype, "delete", null);
|
|
100
83
|
RolePolicyTest = __decorate([
|
|
101
|
-
|
|
84
|
+
suite
|
|
102
85
|
], RolePolicyTest);
|
|
103
86
|
//# sourceMappingURL=rolemodel.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rolemodel.spec.js","sourceRoot":"","sources":["../../src/models/rolemodel.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rolemodel.spec.js","sourceRoot":"","sources":["../../src/models/rolemodel.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/models/user.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ModelMap } from "./coremodel";
|
|
2
|
-
import { Ident } from "./ident";
|
|
3
|
-
import { OwnerModel } from "./ownermodel";
|
|
1
|
+
import { ModelMap } from "./coremodel.js";
|
|
2
|
+
import { Ident } from "./ident.js";
|
|
3
|
+
import { OwnerModel } from "./ownermodel.js";
|
|
4
4
|
/**
|
|
5
5
|
* First basic model for User
|
|
6
6
|
* @class
|
|
@@ -10,24 +10,24 @@ export declare class User extends OwnerModel {
|
|
|
10
10
|
/**
|
|
11
11
|
* Password of the user if defined
|
|
12
12
|
*/
|
|
13
|
-
|
|
13
|
+
__password?: string;
|
|
14
14
|
/**
|
|
15
15
|
* Display name for this user
|
|
16
16
|
* @optional
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
displayName: string;
|
|
19
19
|
/**
|
|
20
20
|
* Last time the password was recovered
|
|
21
21
|
*/
|
|
22
|
-
|
|
22
|
+
_lastPasswordRecovery?: number;
|
|
23
23
|
/**
|
|
24
24
|
* Roles of the user
|
|
25
25
|
*/
|
|
26
|
-
|
|
26
|
+
_roles: string[];
|
|
27
27
|
/**
|
|
28
28
|
* Groups for a user
|
|
29
29
|
*/
|
|
30
|
-
|
|
30
|
+
_groups: string[];
|
|
31
31
|
/**
|
|
32
32
|
* Idents used by the user
|
|
33
33
|
*/
|
|
@@ -35,7 +35,7 @@ export declare class User extends OwnerModel {
|
|
|
35
35
|
/**
|
|
36
36
|
* Define the user avatar if exists
|
|
37
37
|
*/
|
|
38
|
-
|
|
38
|
+
_avatar?: string;
|
|
39
39
|
/**
|
|
40
40
|
* Contains the locale of the user if known
|
|
41
41
|
*/
|
package/lib/models/user.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.User = void 0;
|
|
4
|
-
const ownermodel_1 = require("./ownermodel");
|
|
1
|
+
import { OwnerModel } from "./ownermodel.js";
|
|
5
2
|
/**
|
|
6
3
|
* First basic model for User
|
|
7
4
|
* @class
|
|
8
5
|
* @WebdaModel
|
|
9
6
|
*/
|
|
10
|
-
class User extends
|
|
7
|
+
export class User extends OwnerModel {
|
|
11
8
|
constructor() {
|
|
12
9
|
super(...arguments);
|
|
13
10
|
/**
|
|
@@ -32,14 +29,13 @@ class User extends ownermodel_1.OwnerModel {
|
|
|
32
29
|
* @returns
|
|
33
30
|
*/
|
|
34
31
|
getEmail() {
|
|
35
|
-
var _a;
|
|
36
32
|
if (this.email === undefined) {
|
|
37
33
|
(this._idents || []).some(i => {
|
|
38
34
|
if (i.email) {
|
|
39
35
|
this.email = i.email;
|
|
40
36
|
}
|
|
41
37
|
});
|
|
42
|
-
|
|
38
|
+
this.email ?? (this.email = null);
|
|
43
39
|
}
|
|
44
40
|
return this.email;
|
|
45
41
|
}
|
|
@@ -111,5 +107,4 @@ class User extends ownermodel_1.OwnerModel {
|
|
|
111
107
|
this.__password = password;
|
|
112
108
|
}
|
|
113
109
|
}
|
|
114
|
-
exports.User = User;
|
|
115
110
|
//# sourceMappingURL=user.js.map
|
package/lib/models/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"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"}
|
package/lib/models/user.spec.js
CHANGED
|
@@ -1,17 +1,15 @@
|
|
|
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
|
-
const user_1 = require("./user");
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import { User } from "./user.js";
|
|
12
10
|
let UserTest = class UserTest {
|
|
13
11
|
groupManagement() {
|
|
14
|
-
let user = new
|
|
12
|
+
let user = new User();
|
|
15
13
|
user.addGroup("test");
|
|
16
14
|
assert.strictEqual(user.inGroup("test"), true);
|
|
17
15
|
user.addGroup("test");
|
|
@@ -22,7 +20,7 @@ let UserTest = class UserTest {
|
|
|
22
20
|
user.removeGroup("unknown");
|
|
23
21
|
}
|
|
24
22
|
roleManagement() {
|
|
25
|
-
let user = new
|
|
23
|
+
let user = new User();
|
|
26
24
|
user.addRole("test");
|
|
27
25
|
assert.strictEqual(user.hasRole("test"), true);
|
|
28
26
|
user.addRole("test");
|
|
@@ -32,15 +30,15 @@ let UserTest = class UserTest {
|
|
|
32
30
|
user.removeRole("unknown");
|
|
33
31
|
}
|
|
34
32
|
password() {
|
|
35
|
-
let user = new
|
|
33
|
+
let user = new User();
|
|
36
34
|
user.setPassword("bouzouf");
|
|
37
35
|
}
|
|
38
36
|
idents() {
|
|
39
|
-
let user = new
|
|
37
|
+
let user = new User();
|
|
40
38
|
assert.deepStrictEqual(user.getIdents(), []);
|
|
41
39
|
}
|
|
42
40
|
emailGetter() {
|
|
43
|
-
let user = new
|
|
41
|
+
let user = new User();
|
|
44
42
|
user.load({ _idents: [{}, { email: "testIdent@test.com" }] }, true);
|
|
45
43
|
assert.strictEqual(user.getEmail(), "testIdent@test.com");
|
|
46
44
|
user.load({ email: "test@test.com", displayName: "Top" });
|
|
@@ -49,21 +47,21 @@ let UserTest = class UserTest {
|
|
|
49
47
|
}
|
|
50
48
|
};
|
|
51
49
|
__decorate([
|
|
52
|
-
|
|
50
|
+
test("Verify groups in user")
|
|
53
51
|
], UserTest.prototype, "groupManagement", null);
|
|
54
52
|
__decorate([
|
|
55
|
-
|
|
53
|
+
test("Verify roles in user")
|
|
56
54
|
], UserTest.prototype, "roleManagement", null);
|
|
57
55
|
__decorate([
|
|
58
|
-
|
|
56
|
+
test
|
|
59
57
|
], UserTest.prototype, "password", null);
|
|
60
58
|
__decorate([
|
|
61
|
-
|
|
59
|
+
test
|
|
62
60
|
], UserTest.prototype, "idents", null);
|
|
63
61
|
__decorate([
|
|
64
|
-
|
|
62
|
+
test
|
|
65
63
|
], UserTest.prototype, "emailGetter", null);
|
|
66
64
|
UserTest = __decorate([
|
|
67
|
-
|
|
65
|
+
suite
|
|
68
66
|
], UserTest);
|
|
69
67
|
//# sourceMappingURL=user.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.spec.js","sourceRoot":"","sources":["../../src/models/user.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.spec.js","sourceRoot":"","sources":["../../src/models/user.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ServiceParameters } from "../services/service";
|
|
2
|
-
import { MessageReceipt, Queue, QueueParameters } from "./queueservice";
|
|
1
|
+
import { ServiceParameters } from "../services/service.js";
|
|
2
|
+
import { MessageReceipt, Queue, QueueParameters } from "./queueservice.js";
|
|
3
3
|
export declare class FileQueueParameters extends QueueParameters {
|
|
4
4
|
/**
|
|
5
5
|
* Number of seconds before droping message
|
package/lib/queues/filequeue.js
CHANGED
|
@@ -1,35 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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.FileQueue = exports.FileQueueParameters = void 0;
|
|
13
|
-
const fs = require("fs");
|
|
14
|
-
const path_1 = require("path");
|
|
15
|
-
const uuid = require("uuid");
|
|
16
|
-
const serializers_1 = require("../utils/serializers");
|
|
17
|
-
const queueservice_1 = require("./queueservice");
|
|
18
|
-
class FileQueueParameters extends queueservice_1.QueueParameters {
|
|
1
|
+
import * as fs from "fs";
|
|
2
|
+
import { join } from "path";
|
|
3
|
+
import * as uuid from "uuid";
|
|
4
|
+
import { JSONUtils } from "../utils/serializers.js";
|
|
5
|
+
import { Queue, QueueParameters } from "./queueservice.js";
|
|
6
|
+
export class FileQueueParameters extends QueueParameters {
|
|
19
7
|
constructor(params) {
|
|
20
|
-
var _a;
|
|
21
8
|
super(params);
|
|
22
|
-
this.expire =
|
|
9
|
+
this.expire = this.expire ?? 30;
|
|
23
10
|
this.expire *= 1000;
|
|
24
11
|
}
|
|
25
12
|
}
|
|
26
|
-
exports.FileQueueParameters = FileQueueParameters;
|
|
27
13
|
/**
|
|
28
14
|
* FIFO Queue on filesystem
|
|
29
15
|
* @category CoreServices
|
|
30
16
|
* @WebdaModda
|
|
31
17
|
*/
|
|
32
|
-
class FileQueue extends
|
|
18
|
+
export class FileQueue extends Queue {
|
|
33
19
|
/**
|
|
34
20
|
* @inheritdoc
|
|
35
21
|
*/
|
|
@@ -48,10 +34,8 @@ class FileQueue extends queueservice_1.Queue {
|
|
|
48
34
|
/**
|
|
49
35
|
* @inheritdoc
|
|
50
36
|
*/
|
|
51
|
-
size() {
|
|
52
|
-
return
|
|
53
|
-
return fs.readdirSync(this.parameters.folder).filter(f => f.endsWith(".json")).length;
|
|
54
|
-
});
|
|
37
|
+
async size() {
|
|
38
|
+
return fs.readdirSync(this.parameters.folder).filter(f => f.endsWith(".json")).length;
|
|
55
39
|
}
|
|
56
40
|
/**
|
|
57
41
|
* Return file
|
|
@@ -59,94 +43,89 @@ class FileQueue extends queueservice_1.Queue {
|
|
|
59
43
|
* @returns
|
|
60
44
|
*/
|
|
61
45
|
getFile(uid) {
|
|
62
|
-
return
|
|
46
|
+
return join(this.parameters.folder, `${uid}.json`);
|
|
63
47
|
}
|
|
64
48
|
/**
|
|
65
49
|
* @inheritdoc
|
|
66
50
|
*/
|
|
67
|
-
sendMessage(params) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
serializers_1.JSONUtils.saveFile(params, file);
|
|
77
|
-
});
|
|
51
|
+
async sendMessage(params) {
|
|
52
|
+
let uid = uuid.v4();
|
|
53
|
+
let file = this.getFile(uid);
|
|
54
|
+
// Avoid duplication
|
|
55
|
+
while (fs.existsSync(file)) {
|
|
56
|
+
uid = uuid.v4();
|
|
57
|
+
file = this.getFile(uid);
|
|
58
|
+
}
|
|
59
|
+
JSONUtils.saveFile(params, file);
|
|
78
60
|
}
|
|
79
61
|
/**
|
|
80
62
|
* @inheritdoc
|
|
81
63
|
*/
|
|
82
|
-
receiveMessage(proto) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
.filter(f => !f.hasLock)
|
|
100
|
-
.sort((a, b) => {
|
|
101
|
-
// It is not relevant as it is fs based
|
|
102
|
-
/* istanbul ignore if */
|
|
103
|
-
if (a.ctime > b.ctime) {
|
|
104
|
-
return 1;
|
|
64
|
+
async receiveMessage(proto) {
|
|
65
|
+
const files = fs
|
|
66
|
+
.readdirSync(this.parameters.folder)
|
|
67
|
+
.filter(f => f.endsWith(".json"))
|
|
68
|
+
.map(f => {
|
|
69
|
+
const lockFile = join(this.parameters.folder, f + ".lock");
|
|
70
|
+
let res = {
|
|
71
|
+
...fs.lstatSync(join(this.parameters.folder, f)),
|
|
72
|
+
path: join(this.parameters.folder, f),
|
|
73
|
+
hasLock: fs.existsSync(lockFile),
|
|
74
|
+
uid: f.substring(0, f.length - 5)
|
|
75
|
+
};
|
|
76
|
+
if (res.hasLock) {
|
|
77
|
+
const lock = fs.lstatSync(lockFile);
|
|
78
|
+
if (lock.ctimeMs < Date.now() - this.parameters.expire) {
|
|
79
|
+
res.hasLock = false;
|
|
80
|
+
fs.unlinkSync(lockFile);
|
|
105
81
|
}
|
|
106
|
-
/* istanbul ignore next */
|
|
107
|
-
return -1;
|
|
108
|
-
});
|
|
109
|
-
if (files.length) {
|
|
110
|
-
let el = files.shift();
|
|
111
|
-
// Create the lock
|
|
112
|
-
fs.writeFileSync(el.path + ".lock", "");
|
|
113
|
-
return [
|
|
114
|
-
{
|
|
115
|
-
ReceiptHandle: el.uid,
|
|
116
|
-
Message: this.unserialize(fs.readFileSync(el.path).toString(), proto)
|
|
117
|
-
}
|
|
118
|
-
];
|
|
119
82
|
}
|
|
120
|
-
|
|
121
|
-
|
|
83
|
+
return res;
|
|
84
|
+
})
|
|
85
|
+
.filter(f => !f.hasLock)
|
|
86
|
+
.sort((a, b) => {
|
|
87
|
+
// It is not relevant as it is fs based
|
|
88
|
+
/* c8 ignore next 4 */
|
|
89
|
+
if (a.ctime > b.ctime) {
|
|
90
|
+
return 1;
|
|
122
91
|
}
|
|
123
|
-
return
|
|
92
|
+
return -1;
|
|
124
93
|
});
|
|
94
|
+
if (files.length) {
|
|
95
|
+
let el = files.shift();
|
|
96
|
+
// Create the lock
|
|
97
|
+
fs.writeFileSync(el.path + ".lock", "");
|
|
98
|
+
return [
|
|
99
|
+
{
|
|
100
|
+
ReceiptHandle: el.uid,
|
|
101
|
+
Message: this.unserialize(fs.readFileSync(el.path).toString(), proto)
|
|
102
|
+
}
|
|
103
|
+
];
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
await new Promise(resolve => setTimeout(resolve, 10000));
|
|
107
|
+
}
|
|
108
|
+
return [];
|
|
125
109
|
}
|
|
126
110
|
/**
|
|
127
111
|
* @inheritdoc
|
|
128
112
|
*/
|
|
129
|
-
deleteMessage(receipt) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
fs.unlinkSync(file + ".lock");
|
|
136
|
-
}
|
|
113
|
+
async deleteMessage(receipt) {
|
|
114
|
+
const file = this.getFile(receipt);
|
|
115
|
+
if (fs.existsSync(file)) {
|
|
116
|
+
fs.unlinkSync(file);
|
|
117
|
+
if (fs.existsSync(file + ".lock")) {
|
|
118
|
+
fs.unlinkSync(file + ".lock");
|
|
137
119
|
}
|
|
138
|
-
}
|
|
120
|
+
}
|
|
139
121
|
}
|
|
140
122
|
/**
|
|
141
123
|
* @inheritdoc
|
|
142
124
|
*/
|
|
143
|
-
__clean() {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
require("fs-extra").emptyDirSync(this.parameters.folder);
|
|
148
|
-
});
|
|
125
|
+
async __clean() {
|
|
126
|
+
// Use require on purpose to avoid adding fs-extra as runtime dep
|
|
127
|
+
// The __clean method is only used by unit test
|
|
128
|
+
(await import("fs-extra")).emptyDirSync(this.parameters.folder);
|
|
149
129
|
}
|
|
150
130
|
}
|
|
151
|
-
exports.FileQueue = FileQueue;
|
|
152
131
|
//# sourceMappingURL=filequeue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filequeue.js","sourceRoot":"","sources":["../../src/queues/filequeue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"filequeue.js","sourceRoot":"","sources":["../../src/queues/filequeue.ts"],"names":[],"mappings":"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"}
|