@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,219 +1,179 @@
|
|
|
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
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import { HttpContext } from "../index.js";
|
|
10
|
+
import { WebdaTest } from "../test.js";
|
|
11
|
+
let OwnerModelTest = class OwnerModelTest extends WebdaTest {
|
|
12
|
+
async before() {
|
|
13
|
+
await super.before();
|
|
14
|
+
this._ctx = await this.webda.newContext(new HttpContext("test.webda.io", "GET", "/"));
|
|
15
|
+
this._session = await this._ctx.newSession();
|
|
16
|
+
this._session.login("none", "none");
|
|
17
|
+
// @ts-ignore
|
|
18
|
+
this._ctx.getCurrentUser = async () => {
|
|
19
|
+
return this._user;
|
|
20
|
+
};
|
|
21
|
+
this._taskStore = this.webda.getService("Tasks");
|
|
22
|
+
this._userStore = this.webda.getService("Users");
|
|
23
|
+
assert.notStrictEqual(this._taskStore, undefined);
|
|
24
|
+
assert.notStrictEqual(this._userStore, undefined);
|
|
25
|
+
}
|
|
26
|
+
async beforeEach() {
|
|
27
|
+
await this._taskStore.__clean();
|
|
28
|
+
await this._userStore.__clean();
|
|
29
|
+
this._ctx = await this.newContext({});
|
|
30
|
+
await this._ctx.init();
|
|
31
|
+
this._session = this._ctx.getSession();
|
|
32
|
+
await this._taskStore.save({
|
|
33
|
+
_user: "fake_user",
|
|
34
|
+
uuid: "task_user1",
|
|
35
|
+
name: "for_schema"
|
|
26
36
|
});
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
this._session = this._ctx.newSession();
|
|
31
|
-
this._session.login("none", "none");
|
|
32
|
-
this._ctx.getCurrentUser = () => __awaiter(this, void 0, void 0, function* () {
|
|
33
|
-
return this._user;
|
|
34
|
-
});
|
|
35
|
-
this._taskStore = this.webda.getService("Tasks");
|
|
36
|
-
this._userStore = this.webda.getService("Users");
|
|
37
|
-
assert.notStrictEqual(this._taskStore, undefined);
|
|
38
|
-
assert.notStrictEqual(this._userStore, undefined);
|
|
37
|
+
await this._taskStore.save({
|
|
38
|
+
_user: "fake_user2",
|
|
39
|
+
uuid: "task_user2"
|
|
39
40
|
});
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
yield this._userStore.__clean();
|
|
45
|
-
this._ctx = yield this.newContext({});
|
|
46
|
-
yield this._taskStore.save({
|
|
47
|
-
_user: "fake_user",
|
|
48
|
-
uuid: "task_user1",
|
|
49
|
-
name: "for_schema"
|
|
50
|
-
});
|
|
51
|
-
yield this._taskStore.save({
|
|
52
|
-
_user: "fake_user2",
|
|
53
|
-
uuid: "task_user2"
|
|
54
|
-
});
|
|
55
|
-
yield this._taskStore.save({
|
|
56
|
-
_user: "fake_user3",
|
|
57
|
-
uuid: "task_public",
|
|
58
|
-
public: true
|
|
59
|
-
});
|
|
41
|
+
await this._taskStore.save({
|
|
42
|
+
_user: "fake_user3",
|
|
43
|
+
uuid: "task_public",
|
|
44
|
+
public: true
|
|
60
45
|
});
|
|
61
46
|
}
|
|
62
|
-
postNotLogged() {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
name: "Task #1"
|
|
67
|
-
});
|
|
68
|
-
assert.notStrictEqual(executor, undefined);
|
|
69
|
-
yield assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
47
|
+
async postNotLogged() {
|
|
48
|
+
await this.beforeEach();
|
|
49
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "POST", "/tasks", {
|
|
50
|
+
name: "Task #1"
|
|
70
51
|
});
|
|
52
|
+
assert.notStrictEqual(executor, undefined);
|
|
53
|
+
await assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
71
54
|
}
|
|
72
|
-
post() {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
name: "Task #1"
|
|
76
|
-
});
|
|
77
|
-
this._ctx.session.login("fake_user", "fake_ident");
|
|
78
|
-
yield executor.execute(this._ctx);
|
|
79
|
-
let task = JSON.parse(this._ctx.getResponseBody());
|
|
80
|
-
assert.strictEqual(task.name, "Task #1");
|
|
55
|
+
async post() {
|
|
56
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "POST", "/tasks", {
|
|
57
|
+
name: "Task #1"
|
|
81
58
|
});
|
|
59
|
+
this._session.login("fake_user", "fake_ident");
|
|
60
|
+
await executor.execute(this._ctx);
|
|
61
|
+
let task = JSON.parse(this._ctx.getResponseBody());
|
|
62
|
+
assert.strictEqual(task.name, "Task #1");
|
|
82
63
|
}
|
|
83
|
-
getWrongOwner() {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
yield assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
89
|
-
});
|
|
64
|
+
async getWrongOwner() {
|
|
65
|
+
await this.beforeEach();
|
|
66
|
+
this._ctx.getSession().login("fake_user2", "fake_ident");
|
|
67
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "GET", "/tasks/task_user1", {});
|
|
68
|
+
await assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
90
69
|
}
|
|
91
|
-
putWrongOwner() {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
yield assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
97
|
-
});
|
|
70
|
+
async putWrongOwner() {
|
|
71
|
+
await this.beforeEach();
|
|
72
|
+
this._session.login("fake_user2", "fake_ident");
|
|
73
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "PUT", "/tasks/task_user1", {});
|
|
74
|
+
await assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
98
75
|
}
|
|
99
|
-
put() {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
name: "needed"
|
|
106
|
-
});
|
|
107
|
-
yield executor.execute(this._ctx);
|
|
108
|
-
let result = JSON.parse(this._ctx.getResponseBody());
|
|
109
|
-
assert.strictEqual(result.uuid, "task_user1");
|
|
110
|
-
assert.strictEqual(result.public, true);
|
|
76
|
+
async put() {
|
|
77
|
+
await this.beforeEach();
|
|
78
|
+
this._session.login("fake_user", "fake_ident");
|
|
79
|
+
await this.execute(this._ctx, "test.webda.io", "PUT", "/tasks/task_user1", {
|
|
80
|
+
public: true,
|
|
81
|
+
name: "needed"
|
|
111
82
|
});
|
|
83
|
+
let result = JSON.parse(this._ctx.getResponseBody());
|
|
84
|
+
assert.strictEqual(result.uuid, "task_user1");
|
|
85
|
+
assert.strictEqual(result.public, true);
|
|
112
86
|
}
|
|
113
|
-
getPublic() {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
assert.strictEqual(result.uuid, "task_public");
|
|
121
|
-
});
|
|
87
|
+
async getPublic() {
|
|
88
|
+
await this.beforeEach();
|
|
89
|
+
this._session.login("fake_user2", "fake_ident");
|
|
90
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "GET", "/tasks/task_public");
|
|
91
|
+
await executor.execute(this._ctx);
|
|
92
|
+
let result = JSON.parse(this._ctx.getResponseBody());
|
|
93
|
+
assert.strictEqual(result.uuid, "task_public");
|
|
122
94
|
}
|
|
123
|
-
queryPermission() {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
assert.deepStrictEqual(res.results.length, 1);
|
|
135
|
-
});
|
|
95
|
+
async queryPermission() {
|
|
96
|
+
await this.beforeEach();
|
|
97
|
+
this._session.login("fake_user2", "fake_ident");
|
|
98
|
+
let res = await this._taskStore.query("", this._ctx);
|
|
99
|
+
assert.deepStrictEqual(res.results.map(r => r.getUuid()).sort(), ["task_public", "task_user2"]);
|
|
100
|
+
res = await this._taskStore.query("");
|
|
101
|
+
assert.deepStrictEqual(res.results.length, 3);
|
|
102
|
+
res = await this._taskStore.query("uuid = 'task_user1'", this._ctx);
|
|
103
|
+
assert.deepStrictEqual(res.results.length, 0);
|
|
104
|
+
res = await this._taskStore.query("uuid = 'task_public'", this._ctx);
|
|
105
|
+
assert.deepStrictEqual(res.results.length, 1);
|
|
136
106
|
}
|
|
137
|
-
actioms() {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
yield assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
145
|
-
});
|
|
107
|
+
async actioms() {
|
|
108
|
+
await this.beforeEach();
|
|
109
|
+
this._session.login("fake_user2", "fake_ident");
|
|
110
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "GET", "/tasks/task_user1/actionable");
|
|
111
|
+
await executor.execute(this._ctx);
|
|
112
|
+
executor = this.getExecutor(this._ctx, "test.webda.io", "PUT", "/tasks/task_user1/impossible");
|
|
113
|
+
await assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
146
114
|
}
|
|
147
|
-
delete() {
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
yield executor.execute(this._ctx);
|
|
153
|
-
});
|
|
115
|
+
async delete() {
|
|
116
|
+
await this.beforeEach();
|
|
117
|
+
this._session.login("fake_user2", "fake_ident");
|
|
118
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "DELETE", "/tasks/task_user2");
|
|
119
|
+
await executor.execute(this._ctx);
|
|
154
120
|
}
|
|
155
|
-
deleteWrongOwner() {
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
yield assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
161
|
-
});
|
|
121
|
+
async deleteWrongOwner() {
|
|
122
|
+
await this.beforeEach();
|
|
123
|
+
this._session.login("fake_user2", "fake_ident");
|
|
124
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "DELETE", "/tasks/task_user1");
|
|
125
|
+
await assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
162
126
|
}
|
|
163
|
-
deleteWrongOwnerPublic() {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
yield assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
169
|
-
});
|
|
127
|
+
async deleteWrongOwnerPublic() {
|
|
128
|
+
await this.beforeEach();
|
|
129
|
+
this._session.login("fake_user2", "fake_ident");
|
|
130
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "DELETE", "/tasks/task_public");
|
|
131
|
+
await assert.rejects(() => executor.execute(this._ctx), /403/);
|
|
170
132
|
}
|
|
171
|
-
deleteUnknown() {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
yield assert.rejects(() => executor.execute(this._ctx), /404/);
|
|
177
|
-
});
|
|
133
|
+
async deleteUnknown() {
|
|
134
|
+
await this.beforeEach();
|
|
135
|
+
this._session.login("fake_user2", "fake_ident");
|
|
136
|
+
let executor = this.getExecutor(this._ctx, "test.webda.io", "DELETE", "/tasks/task_unknown");
|
|
137
|
+
await assert.rejects(() => executor.execute(this._ctx), /404/);
|
|
178
138
|
}
|
|
179
139
|
};
|
|
180
140
|
__decorate([
|
|
181
|
-
|
|
141
|
+
test("POST - not logged")
|
|
182
142
|
], OwnerModelTest.prototype, "postNotLogged", null);
|
|
183
143
|
__decorate([
|
|
184
|
-
|
|
144
|
+
test("POST")
|
|
185
145
|
], OwnerModelTest.prototype, "post", null);
|
|
186
146
|
__decorate([
|
|
187
|
-
|
|
147
|
+
test("GET - wrong owner")
|
|
188
148
|
], OwnerModelTest.prototype, "getWrongOwner", null);
|
|
189
149
|
__decorate([
|
|
190
|
-
|
|
150
|
+
test("PUT - wrong owner")
|
|
191
151
|
], OwnerModelTest.prototype, "putWrongOwner", null);
|
|
192
152
|
__decorate([
|
|
193
|
-
|
|
153
|
+
test("PUT")
|
|
194
154
|
], OwnerModelTest.prototype, "put", null);
|
|
195
155
|
__decorate([
|
|
196
|
-
|
|
156
|
+
test("GET - public")
|
|
197
157
|
], OwnerModelTest.prototype, "getPublic", null);
|
|
198
158
|
__decorate([
|
|
199
|
-
|
|
159
|
+
test("Query")
|
|
200
160
|
], OwnerModelTest.prototype, "queryPermission", null);
|
|
201
161
|
__decorate([
|
|
202
|
-
|
|
162
|
+
test("Actions")
|
|
203
163
|
], OwnerModelTest.prototype, "actioms", null);
|
|
204
164
|
__decorate([
|
|
205
|
-
|
|
165
|
+
test("DELETE")
|
|
206
166
|
], OwnerModelTest.prototype, "delete", null);
|
|
207
167
|
__decorate([
|
|
208
|
-
|
|
168
|
+
test("DELETE - wrong owner")
|
|
209
169
|
], OwnerModelTest.prototype, "deleteWrongOwner", null);
|
|
210
170
|
__decorate([
|
|
211
|
-
|
|
171
|
+
test("DELETE - wrong owner - public")
|
|
212
172
|
], OwnerModelTest.prototype, "deleteWrongOwnerPublic", null);
|
|
213
173
|
__decorate([
|
|
214
|
-
|
|
174
|
+
test("DELETE - unknown")
|
|
215
175
|
], OwnerModelTest.prototype, "deleteUnknown", null);
|
|
216
176
|
OwnerModelTest = __decorate([
|
|
217
|
-
|
|
177
|
+
suite
|
|
218
178
|
], OwnerModelTest);
|
|
219
179
|
//# sourceMappingURL=ownermodel.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownermodel.spec.js","sourceRoot":"","sources":["../../src/models/ownermodel.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ownermodel.spec.js","sourceRoot":"","sources":["../../src/models/ownermodel.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Context, CoreModel } from "../index";
|
|
1
|
+
import { Context, CoreModel } from "../index.js";
|
|
2
2
|
declare abstract class RoleModel extends CoreModel {
|
|
3
3
|
abstract getRolesMap(): {
|
|
4
4
|
[key: string]: string;
|
|
5
5
|
};
|
|
6
6
|
isPermissive(): boolean;
|
|
7
|
-
getRoles(ctx: Context): Promise<
|
|
7
|
+
getRoles(ctx: Context): Promise<string[]>;
|
|
8
8
|
canAct(ctx: Context, action: string): Promise<this>;
|
|
9
9
|
}
|
|
10
10
|
export { RoleModel };
|
package/lib/models/rolemodel.js
CHANGED
|
@@ -1,51 +1,35 @@
|
|
|
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.RoleModel = void 0;
|
|
13
|
-
const index_1 = require("../index");
|
|
14
|
-
class RoleModel extends index_1.CoreModel {
|
|
1
|
+
import { CoreModel } from "../index.js";
|
|
2
|
+
class RoleModel extends CoreModel {
|
|
15
3
|
isPermissive() {
|
|
16
4
|
return false;
|
|
17
5
|
}
|
|
18
|
-
getRoles(ctx) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
if (ctx.getSession().roles) {
|
|
25
|
-
return ctx.getSession().roles;
|
|
26
|
-
}
|
|
27
|
-
let user = yield ctx.getCurrentUser();
|
|
28
|
-
// Cache roles in session
|
|
29
|
-
ctx.getSession().roles = user.getRoles();
|
|
6
|
+
async getRoles(ctx) {
|
|
7
|
+
if (!ctx.getCurrentUserId()) {
|
|
8
|
+
throw 403;
|
|
9
|
+
}
|
|
10
|
+
// If roles are cached in session
|
|
11
|
+
if (ctx.getSession().roles) {
|
|
30
12
|
return ctx.getSession().roles;
|
|
31
|
-
}
|
|
13
|
+
}
|
|
14
|
+
let user = await ctx.getCurrentUser();
|
|
15
|
+
// Cache roles in session
|
|
16
|
+
ctx.getSession().roles = user.getRoles();
|
|
17
|
+
return ctx.getSession().roles;
|
|
32
18
|
}
|
|
33
|
-
canAct(ctx, action) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
if (
|
|
37
|
-
if (this.isPermissive()) {
|
|
38
|
-
return this;
|
|
39
|
-
}
|
|
40
|
-
throw 403;
|
|
41
|
-
}
|
|
42
|
-
let roles = yield this.getRoles(ctx);
|
|
43
|
-
if (roles.indexOf(this.getRolesMap()[action]) >= 0) {
|
|
19
|
+
async canAct(ctx, action) {
|
|
20
|
+
// If this action doesn't require role
|
|
21
|
+
if (!this.getRolesMap()[action]) {
|
|
22
|
+
if (this.isPermissive()) {
|
|
44
23
|
return this;
|
|
45
24
|
}
|
|
46
25
|
throw 403;
|
|
47
|
-
}
|
|
26
|
+
}
|
|
27
|
+
let roles = await this.getRoles(ctx);
|
|
28
|
+
if (roles.indexOf(this.getRolesMap()[action]) >= 0) {
|
|
29
|
+
return this;
|
|
30
|
+
}
|
|
31
|
+
throw 403;
|
|
48
32
|
}
|
|
49
33
|
}
|
|
50
|
-
|
|
34
|
+
export { RoleModel };
|
|
51
35
|
//# sourceMappingURL=rolemodel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rolemodel.js","sourceRoot":"","sources":["../../src/models/rolemodel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rolemodel.js","sourceRoot":"","sources":["../../src/models/rolemodel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,SAAS,EAAE,MAAM,UAAU,CAAC;AAC9C,MAAe,SAAU,SAAQ,SAAS;IAGxC,YAAY;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAY;QACzB,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE;YAC3B,MAAM,GAAG,CAAC;SACX;QACD,iCAAiC;QACjC,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE;YAC1B,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,IAAI,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,EAAE,CAAC;QACtC,yBAAyB;QACzB,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzC,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,MAAc;QACvC,sCAAsC;QACtC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE;YAC/B,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;gBACvB,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,CAAC;SACX;QACD,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE;YAClD,OAAO,IAAI,CAAC;SACb;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;CACF;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
|