@webda/core 2.0.0-beta.0 → 2.0.0-beta.3
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 +40 -18
- package/lib/application.js +20 -6
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +12 -0
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +69 -19
- package/lib/core.js +90 -38
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +42 -35
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +4 -0
- package/lib/index.js +5 -0
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.js +3 -2
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +7 -4
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +82 -9
- package/lib/models/coremodel.js +49 -0
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +21 -2
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +4 -2
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +1 -1
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +11 -1
- package/lib/models/ownermodel.js +16 -1
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +32 -13
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -1
- package/lib/models/rolemodel.spec.js +3 -1
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +3 -3
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +1 -1
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.js +2 -2
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +2 -2
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +1 -1
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/queue.spec.js +1 -1
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +2 -2
- package/lib/queues/queueservice.js +1 -0
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +6 -1
- package/lib/router.js +3 -12
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +5 -5
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.spec.js +2 -2
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +33 -14
- package/lib/services/authentication.js +24 -36
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +16 -16
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +3 -3
- package/lib/services/binary.js +24 -17
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +1 -1
- package/lib/services/binary.spec.js +5 -5
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +2 -2
- package/lib/services/cloudbinary.js +3 -3
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.js +8 -1
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +5 -2
- package/lib/services/configuration.js +4 -2
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +2 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +1 -1
- package/lib/services/cron.js +1 -1
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +3 -3
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +253 -0
- package/lib/services/cryptoservice.js +346 -0
- package/lib/services/cryptoservice.js.map +1 -0
- package/lib/services/cryptoservice.spec.d.ts +1 -0
- package/lib/services/cryptoservice.spec.js +164 -0
- package/lib/services/cryptoservice.spec.js.map +1 -0
- package/lib/services/debugmailer.spec.js +1 -1
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +1 -1
- package/lib/services/echo.spec.js +3 -3
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +16 -6
- package/lib/services/filebinary.js +45 -22
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.js +7 -11
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -1
- package/lib/services/fileconfiguration.js +3 -2
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +2 -2
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +28 -6
- package/lib/services/invitationservice.js +8 -5
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +4 -4
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -1
- package/lib/services/kubernetesconfiguration.js +3 -2
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +4 -4
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +3 -3
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +1 -1
- package/lib/services/notificationservice.js +2 -0
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +2 -2
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +30 -4
- package/lib/services/oauth.js +19 -10
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +30 -23
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +78 -0
- package/lib/services/proxy.js +139 -0
- package/lib/services/proxy.js.map +1 -0
- package/lib/services/proxy.spec.d.ts +1 -0
- package/lib/services/proxy.spec.js +78 -0
- package/lib/services/proxy.spec.js.map +1 -0
- package/lib/services/resource.d.ts +17 -0
- package/lib/services/resource.js +20 -6
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +4 -3
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +10 -7
- package/lib/services/service.js +7 -3
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +2 -2
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +1 -1
- package/lib/services/version.spec.js +1 -1
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +1 -1
- package/lib/stores/aggregator.js +1 -0
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +9 -1
- package/lib/stores/file.js +7 -4
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +30 -7
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +1 -1
- package/lib/stores/mapper.js +2 -0
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +1 -1
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +65 -4
- package/lib/stores/memory.js +85 -1
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -1
- package/lib/stores/memory.spec.js +47 -4
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +27 -5
- package/lib/stores/store.js +107 -22
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +4 -3
- package/lib/stores/store.spec.js +37 -14
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.js +2 -2
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.js +2 -2
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +1 -25
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +1 -1
- package/lib/stores/webdaql/WebdaQLParserParser.js +2 -2
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +1 -25
- package/lib/stores/webdaql/query.d.ts +3 -3
- package/lib/stores/webdaql/query.js +4 -4
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +1 -1
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +6 -8
- package/lib/test.js +12 -18
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.js +24 -7
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.spec.js +1 -1
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +61 -73
- package/lib/utils/context.js +81 -159
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +79 -40
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +65 -44
- package/lib/utils/cookie.js +75 -145
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +203 -199
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/httpcontext.d.ts +182 -0
- package/lib/utils/httpcontext.js +325 -0
- package/lib/utils/httpcontext.js.map +1 -0
- package/lib/utils/httpcontext.spec.d.ts +5 -0
- package/lib/utils/httpcontext.spec.js +90 -0
- package/lib/utils/httpcontext.spec.js.map +1 -0
- package/lib/utils/logger.d.ts +2 -2
- package/lib/utils/logger.js +1 -1
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +1 -1
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +3 -3
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +120 -0
- package/lib/utils/session.js +177 -0
- package/lib/utils/session.js.map +1 -0
- package/lib/utils/session.spec.d.ts +1 -0
- package/lib/utils/session.spec.js +79 -0
- package/lib/utils/session.spec.js.map +1 -0
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +2 -2
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +10 -7
- package/test/config.json +4 -2
- package/test/models/task.js +0 -1
- package/webda.module.json +3 -2
package/lib/index.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export * from "./services/binary";
|
|
|
22
22
|
export * from "./services/cloudbinary";
|
|
23
23
|
export * from "./services/configuration";
|
|
24
24
|
export * from "./services/cron";
|
|
25
|
+
export * from "./services/cryptoservice";
|
|
25
26
|
export * from "./services/debugmailer";
|
|
26
27
|
export * from "./services/echo";
|
|
27
28
|
export * from "./services/filebinary";
|
|
@@ -31,6 +32,7 @@ export * from "./services/kubernetesconfiguration";
|
|
|
31
32
|
export * from "./services/mailer";
|
|
32
33
|
export * from "./services/notificationservice";
|
|
33
34
|
export * from "./services/oauth";
|
|
35
|
+
export * from "./services/proxy";
|
|
34
36
|
export * from "./services/resource";
|
|
35
37
|
export * from "./services/service";
|
|
36
38
|
export * from "./services/version";
|
|
@@ -42,7 +44,9 @@ export * from "./stores/store";
|
|
|
42
44
|
export * from "./utils/abstractdeployer";
|
|
43
45
|
export * from "./utils/context";
|
|
44
46
|
export * from "./utils/cookie";
|
|
47
|
+
export * from "./utils/httpcontext";
|
|
45
48
|
export * from "./utils/logger";
|
|
46
49
|
export * from "./utils/serializers";
|
|
50
|
+
export * from "./utils/session";
|
|
47
51
|
export * from "./utils/waiter";
|
|
48
52
|
export * from "./stores/webdaql/query";
|
package/lib/index.js
CHANGED
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.CacheService = exports.Cache = void 0;
|
|
18
|
+
// organize-imports-ignore
|
|
18
19
|
// Export a default Cache - we might recode this to be able to specify custom provider
|
|
19
20
|
var ts_method_cache_1 = require("ts-method-cache");
|
|
20
21
|
Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return ts_method_cache_1.MemoryCache; } });
|
|
@@ -44,6 +45,7 @@ __exportStar(require("./services/binary"), exports);
|
|
|
44
45
|
__exportStar(require("./services/cloudbinary"), exports);
|
|
45
46
|
__exportStar(require("./services/configuration"), exports);
|
|
46
47
|
__exportStar(require("./services/cron"), exports);
|
|
48
|
+
__exportStar(require("./services/cryptoservice"), exports);
|
|
47
49
|
__exportStar(require("./services/debugmailer"), exports);
|
|
48
50
|
__exportStar(require("./services/echo"), exports);
|
|
49
51
|
__exportStar(require("./services/filebinary"), exports);
|
|
@@ -53,6 +55,7 @@ __exportStar(require("./services/kubernetesconfiguration"), exports);
|
|
|
53
55
|
__exportStar(require("./services/mailer"), exports);
|
|
54
56
|
__exportStar(require("./services/notificationservice"), exports);
|
|
55
57
|
__exportStar(require("./services/oauth"), exports);
|
|
58
|
+
__exportStar(require("./services/proxy"), exports);
|
|
56
59
|
__exportStar(require("./services/resource"), exports);
|
|
57
60
|
__exportStar(require("./services/service"), exports);
|
|
58
61
|
__exportStar(require("./services/version"), exports);
|
|
@@ -66,8 +69,10 @@ __exportStar(require("./stores/store"), exports);
|
|
|
66
69
|
__exportStar(require("./utils/abstractdeployer"), exports);
|
|
67
70
|
__exportStar(require("./utils/context"), exports);
|
|
68
71
|
__exportStar(require("./utils/cookie"), exports);
|
|
72
|
+
__exportStar(require("./utils/httpcontext"), exports);
|
|
69
73
|
__exportStar(require("./utils/logger"), exports);
|
|
70
74
|
__exportStar(require("./utils/serializers"), exports);
|
|
75
|
+
__exportStar(require("./utils/session"), exports);
|
|
71
76
|
__exportStar(require("./utils/waiter"), exports);
|
|
72
77
|
__exportStar(require("./stores/webdaql/query"), exports);
|
|
73
78
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,sFAAsF;AACtF,mDAAuD;AAA9C,wGAAA,WAAW,OAAS;AAC7B,qDAAqD;AACrD,MAAM,YAAY,GAAG,IAAI,oCAAkB,EAAE,CAAC;AACrC,oCAAY;AAErB,gDAA8B;AAC9B,wDAAsC;AACtC,yCAAuB;AAEvB,SAAS;AACT,oDAAkC;AAClC,qDAAmC;AACnC,sDAAoC;AACpC,iDAA+B;AAC/B,sDAAoC;AACpC,qDAAmC;AACnC,gDAA8B;AAE9B,SAAS;AACT,qDAAmC;AACnC,uDAAqC;AACrC,yDAAuC;AACvC,wDAAsC;AAEtC,WAAW;AACX,yDAAuC;AACvC,4DAA0C;AAC1C,oDAAkC;AAClC,yDAAuC;AACvC,2DAAyC;AACzC,kDAAgC;AAChC,yDAAuC;AACvC,kDAAgC;AAChC,wDAAsC;AACtC,+DAA6C;AAC7C,+DAA6C;AAC7C,qEAAmD;AACnD,oDAAkC;AAClC,iEAA+C;AAC/C,mDAAiC;AACjC,sDAAoC;AACpC,qDAAmC;AACnC,qDAAmC;AAEnC,SAAS;AACT,sDAAoC;AACpC,gDAA8B;AAC9B,kDAAgC;AAChC,kDAAgC;AAChC,iDAA+B;AAE/B,QAAQ;AACR,2DAAyC;AACzC,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,sDAAoC;AACpC,iDAA+B;AAE/B,yDAAuC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0BAA0B;AAC1B,sFAAsF;AACtF,mDAAuD;AAA9C,wGAAA,WAAW,OAAS;AAC7B,qDAAqD;AACrD,MAAM,YAAY,GAAG,IAAI,oCAAkB,EAAE,CAAC;AACrC,oCAAY;AAErB,gDAA8B;AAC9B,wDAAsC;AACtC,yCAAuB;AAEvB,SAAS;AACT,oDAAkC;AAClC,qDAAmC;AACnC,sDAAoC;AACpC,iDAA+B;AAC/B,sDAAoC;AACpC,qDAAmC;AACnC,gDAA8B;AAE9B,SAAS;AACT,qDAAmC;AACnC,uDAAqC;AACrC,yDAAuC;AACvC,wDAAsC;AAEtC,WAAW;AACX,yDAAuC;AACvC,4DAA0C;AAC1C,oDAAkC;AAClC,yDAAuC;AACvC,2DAAyC;AACzC,kDAAgC;AAChC,2DAAyC;AACzC,yDAAuC;AACvC,kDAAgC;AAChC,wDAAsC;AACtC,+DAA6C;AAC7C,+DAA6C;AAC7C,qEAAmD;AACnD,oDAAkC;AAClC,iEAA+C;AAC/C,mDAAiC;AACjC,mDAAiC;AACjC,sDAAoC;AACpC,qDAAmC;AACnC,qDAAmC;AAEnC,SAAS;AACT,sDAAoC;AACpC,gDAA8B;AAC9B,kDAAgC;AAChC,kDAAgC;AAChC,iDAA+B;AAE/B,QAAQ;AACR,2DAAyC;AACzC,kDAAgC;AAChC,iDAA+B;AAC/B,sDAAoC;AACpC,iDAA+B;AAC/B,sDAAoC;AACpC,kDAAgC;AAChC,iDAA+B;AAE/B,yDAAuC"}
|
package/lib/models/aclmodel.js
CHANGED
|
@@ -108,11 +108,12 @@ class AclModel extends coremodel_1.CoreModel {
|
|
|
108
108
|
*/
|
|
109
109
|
_httpPutAcls(ctx) {
|
|
110
110
|
return __awaiter(this, void 0, void 0, function* () {
|
|
111
|
+
let acl = yield ctx.getRequestBody();
|
|
111
112
|
// This looks like a bad request
|
|
112
|
-
if (
|
|
113
|
+
if (acl.raw) {
|
|
113
114
|
throw 400;
|
|
114
115
|
}
|
|
115
|
-
this.__acl =
|
|
116
|
+
this.__acl = acl;
|
|
116
117
|
yield this.save();
|
|
117
118
|
});
|
|
118
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aclmodel.js","sourceRoot":"","sources":["../../src/models/aclmodel.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AAEb,2CAAwC;AAIxC;;;;GAIG;AACH,MAAqB,QAAS,SAAQ,qBAAS;IAA/C;;QAKE;;WAEG;QACH,UAAK,GAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"aclmodel.js","sourceRoot":"","sources":["../../src/models/aclmodel.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
20
|
const index_1 = require("../index");
|
|
21
21
|
const test_1 = require("../test");
|
|
22
22
|
let AclPolicyTest = class AclPolicyTest {
|
|
@@ -25,6 +25,7 @@ let AclPolicyTest = class AclPolicyTest {
|
|
|
25
25
|
let app = new test_1.TestApplication(__dirname + "/../../test/config.json");
|
|
26
26
|
yield app.load();
|
|
27
27
|
this._webda = new index_1.Core(app);
|
|
28
|
+
yield this._webda.init();
|
|
28
29
|
this._ctx = yield this._webda.newContext(new index_1.HttpContext("test.webda.io", "GET", "/"));
|
|
29
30
|
this._session = this._ctx.getSession();
|
|
30
31
|
this._session.login("user-uid", "none");
|
|
@@ -126,13 +127,15 @@ let AclPolicyTest = class AclPolicyTest {
|
|
|
126
127
|
};
|
|
127
128
|
let actions = index_1.AclModel.getActions();
|
|
128
129
|
assert.notStrictEqual(actions.acl, undefined);
|
|
129
|
-
this._ctx.setHttpContext(new index_1.HttpContext("test.webda.io", "PUT", "/"
|
|
130
|
+
this._ctx.setHttpContext(new index_1.HttpContext("test.webda.io", "PUT", "/"));
|
|
131
|
+
this._ctx.getHttpContext().setBody({ acl: "mine" });
|
|
130
132
|
yield this.model._acl(this._ctx);
|
|
131
133
|
// @ts-ignore
|
|
132
134
|
assert.strictEqual(this.model.getAcl().acl, "mine");
|
|
133
|
-
this._ctx.
|
|
135
|
+
this._ctx.reinit();
|
|
136
|
+
this._ctx.getHttpContext().setBody({ raw: { acl: "mine" } });
|
|
134
137
|
yield assert.rejects(() => this.model._acl(this._ctx));
|
|
135
|
-
this._ctx.setHttpContext(new index_1.HttpContext("test.webda.io", "GET", "/"
|
|
138
|
+
this._ctx.setHttpContext(new index_1.HttpContext("test.webda.io", "GET", "/"));
|
|
136
139
|
yield this.model._acl(this._ctx);
|
|
137
140
|
assert.deepStrictEqual(JSON.parse(this._ctx.getResponseBody()), {
|
|
138
141
|
raw: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aclmodel.spec.js","sourceRoot":"","sources":["../../src/models/aclmodel.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"aclmodel.spec.js","sourceRoot":"","sources":["../../src/models/aclmodel.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,35 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Context, HttpMethodType } from "../utils/context";
|
|
1
|
+
import { Core } from "..";
|
|
3
2
|
import { Service } from "../services/service";
|
|
3
|
+
import { Store } from "../stores/store";
|
|
4
|
+
import { Context } from "../utils/context";
|
|
5
|
+
import { HttpMethodType } from "../utils/httpcontext";
|
|
6
|
+
declare type ModelLoader<T> = {
|
|
7
|
+
refresh: () => Promise<T>;
|
|
8
|
+
getUuid(): string;
|
|
9
|
+
};
|
|
10
|
+
declare type ModelLinker<T> = string & ModelLoader<T>;
|
|
11
|
+
/**
|
|
12
|
+
* Load related objects
|
|
13
|
+
*/
|
|
14
|
+
export declare type ModelLinked<T> = (query?: string) => Promise<T[]>;
|
|
15
|
+
/**
|
|
16
|
+
* Define a ModelMap attribute
|
|
17
|
+
*/
|
|
18
|
+
export declare type ModelMap<T, _FK extends keyof T, K extends keyof T> = (Pick<T, K> & ModelLoader<T>)[];
|
|
19
|
+
/**
|
|
20
|
+
* Define a link to 1:n relation
|
|
21
|
+
*/
|
|
22
|
+
export declare type ModelLink<T, _FK extends keyof T = any> = ModelLinker<T>;
|
|
23
|
+
/**
|
|
24
|
+
* Define several links for n:m relation
|
|
25
|
+
*/
|
|
26
|
+
export declare type ModelLinks<T, _FK extends keyof T> = ModelLinker<T>[] | {
|
|
27
|
+
[key: string]: ModelLinker<T>;
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* Define the parent of the model
|
|
31
|
+
*/
|
|
32
|
+
export declare type ModelParent<T> = ModelLink<T, any>;
|
|
4
33
|
/**
|
|
5
34
|
* Define an export of actions from Model
|
|
6
35
|
*/
|
|
@@ -26,14 +55,28 @@ export interface ModelAction {
|
|
|
26
55
|
*/
|
|
27
56
|
openapi?: any;
|
|
28
57
|
}
|
|
29
|
-
export interface CoreModelDefinition {
|
|
30
|
-
new ():
|
|
58
|
+
export interface CoreModelDefinition<T extends CoreModel = CoreModel> {
|
|
59
|
+
new (): T;
|
|
60
|
+
/**
|
|
61
|
+
* Create a CoreModel object loaded with the content of object
|
|
62
|
+
*
|
|
63
|
+
* It allows polymorphism from Store
|
|
64
|
+
*
|
|
65
|
+
* @param model to create by default
|
|
66
|
+
* @param object to load data from
|
|
67
|
+
* @param context if the data is unsafe from http
|
|
68
|
+
*/
|
|
69
|
+
factory(model: new () => T, object: any, context?: Context): T;
|
|
31
70
|
getActions(): {
|
|
32
71
|
[key: string]: ModelAction;
|
|
33
72
|
};
|
|
34
73
|
getUuidField(): string;
|
|
35
74
|
getLastUpdateField(): string;
|
|
36
75
|
getCreationField(): string;
|
|
76
|
+
getPermissionQuery(context?: Context): null | {
|
|
77
|
+
partial: boolean;
|
|
78
|
+
query: string;
|
|
79
|
+
};
|
|
37
80
|
}
|
|
38
81
|
/**
|
|
39
82
|
* Sent if action required attached CoreModel is trigger
|
|
@@ -98,13 +141,23 @@ declare class CoreModel {
|
|
|
98
141
|
* @param uuid
|
|
99
142
|
* @param target
|
|
100
143
|
*/
|
|
101
|
-
setUuid(uuid: string, target?:
|
|
144
|
+
setUuid(uuid: string, target?: this): this;
|
|
102
145
|
/**
|
|
103
146
|
* Get actions callable on an object
|
|
104
147
|
*
|
|
105
148
|
* This will expose them by the Store with /storeUrl/{uuid}/{action}
|
|
106
149
|
*/
|
|
107
150
|
static getActions(): ModelActions;
|
|
151
|
+
/**
|
|
152
|
+
* Return the expressable query for permission
|
|
153
|
+
*
|
|
154
|
+
* @param context of the query
|
|
155
|
+
* @returns
|
|
156
|
+
*/
|
|
157
|
+
static getPermissionQuery(_ctx: Context): null | {
|
|
158
|
+
partial: boolean;
|
|
159
|
+
query: string;
|
|
160
|
+
};
|
|
108
161
|
/**
|
|
109
162
|
* By default nothing is permitted on a CoreModel
|
|
110
163
|
* @returns
|
|
@@ -122,6 +175,11 @@ declare class CoreModel {
|
|
|
122
175
|
* Get the UUID property
|
|
123
176
|
*/
|
|
124
177
|
static getCreationField(): string;
|
|
178
|
+
/**
|
|
179
|
+
* Create an object
|
|
180
|
+
* @returns
|
|
181
|
+
*/
|
|
182
|
+
static factory(model: new () => CoreModel, object: any, context?: Context): CoreModel;
|
|
125
183
|
/**
|
|
126
184
|
* Return if an object is attached to its store
|
|
127
185
|
*/
|
|
@@ -129,7 +187,22 @@ declare class CoreModel {
|
|
|
129
187
|
/**
|
|
130
188
|
* Attach an object to a store instance
|
|
131
189
|
*/
|
|
132
|
-
attach(store: Store<CoreModel>):
|
|
190
|
+
attach(store: Store<CoreModel>): this;
|
|
191
|
+
/**
|
|
192
|
+
* Return a unique reference within the application to the object
|
|
193
|
+
*
|
|
194
|
+
* It contains the Store containing it
|
|
195
|
+
* @returns
|
|
196
|
+
*/
|
|
197
|
+
getFullUuid(): string;
|
|
198
|
+
/**
|
|
199
|
+
* Get an object from the full uuid
|
|
200
|
+
* @param core
|
|
201
|
+
* @param fullUuid
|
|
202
|
+
* @param partials
|
|
203
|
+
* @returns
|
|
204
|
+
*/
|
|
205
|
+
static fromFullUuid<T extends CoreModel = CoreModel>(core: Core, fullUuid: string, partials?: any): Promise<T>;
|
|
133
206
|
/**
|
|
134
207
|
* Load an object from RAW
|
|
135
208
|
*
|
|
@@ -140,7 +213,7 @@ declare class CoreModel {
|
|
|
140
213
|
/**
|
|
141
214
|
* Context of the request
|
|
142
215
|
*/
|
|
143
|
-
setContext(ctx: Context):
|
|
216
|
+
setContext(ctx: Context): this;
|
|
144
217
|
/**
|
|
145
218
|
* Get object context
|
|
146
219
|
*
|
|
@@ -150,7 +223,7 @@ declare class CoreModel {
|
|
|
150
223
|
/**
|
|
151
224
|
* Return the object registered store
|
|
152
225
|
*/
|
|
153
|
-
getStore(): Store<CoreModel, import("
|
|
226
|
+
getStore(): Store<CoreModel, import("..").StoreParameters, import("..").StoreEvents>;
|
|
154
227
|
/**
|
|
155
228
|
* Get the object again
|
|
156
229
|
*
|
|
@@ -174,7 +247,7 @@ declare class CoreModel {
|
|
|
174
247
|
*
|
|
175
248
|
* @throws Error if the object is not coming from a store
|
|
176
249
|
*/
|
|
177
|
-
update(changes: any): Promise<
|
|
250
|
+
update(changes: any): Promise<this>;
|
|
178
251
|
/**
|
|
179
252
|
* Validate objet modification
|
|
180
253
|
*
|
package/lib/models/coremodel.js
CHANGED
|
@@ -69,6 +69,7 @@ class CoreModel {
|
|
|
69
69
|
*/
|
|
70
70
|
setUuid(uuid, target = this) {
|
|
71
71
|
target[this.__class.getUuidField()] = uuid;
|
|
72
|
+
return target;
|
|
72
73
|
}
|
|
73
74
|
/**
|
|
74
75
|
* Get actions callable on an object
|
|
@@ -78,6 +79,15 @@ class CoreModel {
|
|
|
78
79
|
static getActions() {
|
|
79
80
|
return {};
|
|
80
81
|
}
|
|
82
|
+
/**
|
|
83
|
+
* Return the expressable query for permission
|
|
84
|
+
*
|
|
85
|
+
* @param context of the query
|
|
86
|
+
* @returns
|
|
87
|
+
*/
|
|
88
|
+
static getPermissionQuery(_ctx) {
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
81
91
|
/**
|
|
82
92
|
* By default nothing is permitted on a CoreModel
|
|
83
93
|
* @returns
|
|
@@ -105,6 +115,13 @@ class CoreModel {
|
|
|
105
115
|
static getCreationField() {
|
|
106
116
|
return "_creationDate";
|
|
107
117
|
}
|
|
118
|
+
/**
|
|
119
|
+
* Create an object
|
|
120
|
+
* @returns
|
|
121
|
+
*/
|
|
122
|
+
static factory(model, object, context) {
|
|
123
|
+
return new model().setContext(context).load(object, context === undefined);
|
|
124
|
+
}
|
|
108
125
|
/**
|
|
109
126
|
* Return if an object is attached to its store
|
|
110
127
|
*/
|
|
@@ -116,6 +133,36 @@ class CoreModel {
|
|
|
116
133
|
*/
|
|
117
134
|
attach(store) {
|
|
118
135
|
this.__store = store;
|
|
136
|
+
return this;
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Return a unique reference within the application to the object
|
|
140
|
+
*
|
|
141
|
+
* It contains the Store containing it
|
|
142
|
+
* @returns
|
|
143
|
+
*/
|
|
144
|
+
getFullUuid() {
|
|
145
|
+
if (!this.isAttached()) {
|
|
146
|
+
throw new Error("Cannot return full uuid of unattached object");
|
|
147
|
+
}
|
|
148
|
+
return `${this.__store.getName()}$${this.getUuid()}`;
|
|
149
|
+
}
|
|
150
|
+
/**
|
|
151
|
+
* Get an object from the full uuid
|
|
152
|
+
* @param core
|
|
153
|
+
* @param fullUuid
|
|
154
|
+
* @param partials
|
|
155
|
+
* @returns
|
|
156
|
+
*/
|
|
157
|
+
static fromFullUuid(core, fullUuid, partials) {
|
|
158
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
159
|
+
const [store, uuid] = fullUuid.split("$");
|
|
160
|
+
let service = core.getService(store);
|
|
161
|
+
if (partials) {
|
|
162
|
+
return service.initModel(partials).setUuid(uuid);
|
|
163
|
+
}
|
|
164
|
+
return service.get(uuid);
|
|
165
|
+
});
|
|
119
166
|
}
|
|
120
167
|
/**
|
|
121
168
|
* Load an object from RAW
|
|
@@ -142,6 +189,7 @@ class CoreModel {
|
|
|
142
189
|
*/
|
|
143
190
|
setContext(ctx) {
|
|
144
191
|
this.__ctx = ctx;
|
|
192
|
+
return this;
|
|
145
193
|
}
|
|
146
194
|
/**
|
|
147
195
|
* Get object context
|
|
@@ -227,6 +275,7 @@ class CoreModel {
|
|
|
227
275
|
for (var i in obj) {
|
|
228
276
|
this[i] = obj[i];
|
|
229
277
|
}
|
|
278
|
+
return this;
|
|
230
279
|
});
|
|
231
280
|
}
|
|
232
281
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coremodel.js","sourceRoot":"","sources":["../../src/models/coremodel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,+BAAoC;
|
|
1
|
+
{"version":3,"file":"coremodel.js","sourceRoot":"","sources":["../../src/models/coremodel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,+BAAoC;AAIpC,8CAA2C;AAwE3C;;GAEG;AACH,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC1C,CAAC;CACF;AAJD,4DAIC;AAED,SAAgB,aAAa,CAAC,MAAW,EAAE,WAAmB;IAC5D,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;QACzC,GAAG,CAAC,KAAK;YACP,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE;gBACvC,KAAK;gBACL,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;QACD,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAXD,sCAWC;AAED;;;;;;;;;GASG;AACH,MAAM,SAAS;IAyCb;QACE,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5B,CAAC;IACD;;;OAGG;IACH,OAAO;QACL,aAAa;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAY,EAAE,MAAM,GAAG,IAAI;QACjC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,IAAa;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACG,MAAM,CACV,IAAa,EACb,OASU;;YAEV,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,YAAY;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB;QACvB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB;QACrB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,KAA0B,EAAE,MAAW,EAAE,OAAiB;QACvE,OAAO,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC;IAC7E,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAuB;QAC5B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QACD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;IACvD,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAO,YAAY,CAAkC,IAAU,EAAE,QAAgB,EAAE,QAAc;;YACrG,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAW,KAAK,CAAC,CAAC;YAC/C,IAAI,QAAQ,EAAE;gBACZ,OAAO,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAClD;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;KAAA;IACD;;;;;OAKG;IACH,IAAI,CAAC,GAAQ,EAAE,SAAkB,KAAK;QACpC,4BAA4B;QAC5B,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE;YACpB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAC9B,SAAS;aACV;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;SACxB;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAEhC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,GAAY;QACrB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,KAAK,IAAI,iBAAO,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACG,OAAO;;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,GAAG,EAAE;gBACP,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;oBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;iBAClB;gBACD,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;oBAClB,aAAa;oBACb,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;wBACtB,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;qBACrB;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM;;YACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7C,CAAC;KAAA;IAED;;;;OAIG;IACG,IAAI;;YACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;gBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM,CAAC,OAAO;;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;aACtC;YACD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACzE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5C,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE;gBACjB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;OAKG;IACG,QAAQ,CAAC,GAAY,EAAE,UAAe,SAAS;;YACnD,GAAG,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;OAKG;IACH,WAAW,CAAC,UAAe,SAAS;QAClC,OAAO,IAAA,SAAM,GAAE,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;QACpB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACtD,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,SAAS,GAAG,KAAK;QAC5B,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/B,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAoB,OAAO;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,wBAAwB,EAAE,CAAC;SACtC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAI,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM;QACZ,IAAI,GAAG,GAAQ,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;YAClB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE;gBACX,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;YACD,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAS;YAClC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACG,SAAS;;YACb,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,MAAM;;YACV,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,OAAO;;YACX,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,QAAQ;;YACZ,wBAAwB;QAC1B,CAAC;KAAA;IAED;;;;OAIG;IACG,SAAS,CAAC,QAAa;;YAC3B,wBAAwB;QAC1B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;;YACd,wBAAwB;QAC1B,CAAC;KAAA;CACF;AA1aC;IADC,aAAa;0CACD;AAWb;IADC,aAAa;wCACC;AAOf;IADC,aAAa;0CACY;AA0ZnB,8BAAS"}
|
|
@@ -17,9 +17,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
19
|
const assert = require("assert");
|
|
20
|
-
const test_1 = require("../test");
|
|
21
|
-
const __1 = require("..");
|
|
22
20
|
const sinon = require("sinon");
|
|
21
|
+
const __1 = require("..");
|
|
22
|
+
const test_1 = require("../test");
|
|
23
23
|
const Task = require("../../test/models/task");
|
|
24
24
|
let CoreModelTest = class CoreModelTest extends test_1.WebdaTest {
|
|
25
25
|
unsecureLoad() {
|
|
@@ -116,6 +116,22 @@ let CoreModelTest = class CoreModelTest extends test_1.WebdaTest {
|
|
|
116
116
|
assert.strictEqual(this.getService("ResourceService"), task.getService("ResourceService"));
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
|
+
fullUuid() {
|
|
120
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
121
|
+
let task = new Task();
|
|
122
|
+
task.setUuid("task#1");
|
|
123
|
+
assert.throws(() => task.getFullUuid(), /Cannot return full uuid of unattached object/);
|
|
124
|
+
let memoryStore = this.getService("MemoryUsers");
|
|
125
|
+
task = yield memoryStore.save(Object.assign(Object.assign({}, task), { test: false }));
|
|
126
|
+
assert.strictEqual(task.getFullUuid(), "MemoryUsers$task#1");
|
|
127
|
+
let taskB = yield this.webda.getModelObject("MemoryUsers$task#1");
|
|
128
|
+
// @ts-ignore
|
|
129
|
+
assert.strictEqual(taskB.test, false);
|
|
130
|
+
taskB = yield this.webda.getModelObject(task.getFullUuid(), { test: true });
|
|
131
|
+
// @ts-ignore
|
|
132
|
+
assert.strictEqual(taskB.test, true);
|
|
133
|
+
});
|
|
134
|
+
}
|
|
119
135
|
refresh() {
|
|
120
136
|
return __awaiter(this, void 0, void 0, function* () {
|
|
121
137
|
let task = new Task();
|
|
@@ -152,6 +168,9 @@ __decorate([
|
|
|
152
168
|
__decorate([
|
|
153
169
|
mocha_1.test
|
|
154
170
|
], CoreModelTest.prototype, "cov", null);
|
|
171
|
+
__decorate([
|
|
172
|
+
mocha_1.test
|
|
173
|
+
], CoreModelTest.prototype, "fullUuid", null);
|
|
155
174
|
__decorate([
|
|
156
175
|
mocha_1.test
|
|
157
176
|
], CoreModelTest.prototype, "refresh", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coremodel.spec.js","sourceRoot":"","sources":["../../src/models/coremodel.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC
|
|
1
|
+
{"version":3,"file":"coremodel.spec.js","sourceRoot":"","sources":["../../src/models/coremodel.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/models/ident.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { ModelLink } from "./coremodel";
|
|
1
2
|
import { OwnerModel } from "./ownermodel";
|
|
3
|
+
import { User } from "./user";
|
|
2
4
|
export declare class IdentTokens {
|
|
3
5
|
refresh: string;
|
|
4
6
|
access: string;
|
|
@@ -14,7 +16,7 @@ export declare class Ident extends OwnerModel {
|
|
|
14
16
|
__profile: any;
|
|
15
17
|
__tokens: IdentTokens;
|
|
16
18
|
_lastUsed: Date;
|
|
17
|
-
_user:
|
|
19
|
+
_user: ModelLink<User, "_idents">;
|
|
18
20
|
__new: boolean;
|
|
19
21
|
_failedLogin: number;
|
|
20
22
|
/**
|
|
@@ -30,7 +32,7 @@ export declare class Ident extends OwnerModel {
|
|
|
30
32
|
*/
|
|
31
33
|
email?: string;
|
|
32
34
|
static init(type: string, uid: string, accessToken?: string, refreshToken?: string, profile?: object): Ident;
|
|
33
|
-
getUser():
|
|
35
|
+
getUser(): ModelLink<User, "_idents">;
|
|
34
36
|
getEmail(): string;
|
|
35
37
|
setUser(user: any): void;
|
|
36
38
|
getType(): string;
|
package/lib/models/ident.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/models/ident.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ident.js","sourceRoot":"","sources":["../../src/models/ident.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAG1C,MAAa,WAAW;CAGvB;AAHD,kCAGC;AACD;;;;GAIG;AACH,MAAa,KAAM,SAAQ,uBAAU;IAsBnC,MAAM,CAAC,IAAI,CACT,IAAY,EACZ,GAAW,EACX,cAAsB,EAAE,EACxB,eAAuB,EAAE,EACzB,UAAkB,EAAE;QAEpB,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE;YACzB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC;SACrB;QACD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,GAAG,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC;QACpC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC;QAClC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,IAAI;QACV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CACF;AA9DD,sBA8DC"}
|
package/lib/models/ident.spec.js
CHANGED
|
@@ -6,8 +6,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
const assert = require("assert");
|
|
10
9
|
const mocha_1 = require("@testdeck/mocha");
|
|
10
|
+
const assert = require("assert");
|
|
11
11
|
const ident_1 = require("./ident");
|
|
12
12
|
let IdentTest = class IdentTest {
|
|
13
13
|
getType() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ident.spec.js","sourceRoot":"","sources":["../../src/models/ident.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"ident.spec.js","sourceRoot":"","sources":["../../src/models/ident.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,mCAAgC;AAGhC,IAAM,SAAS,GAAf,MAAM,SAAS;IACP,OAAO;QACX,eAAe;QACf,IAAI,IAAI,GAAU,IAAI,aAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEK,IAAI;QACR,IAAI,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;QAChD,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC;QAC9B,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;CACF,CAAA;AAvBO;IAAL,YAAI;wCAKJ;AAEK;IAAL,YAAI;qCAeJ;AAvBG,SAAS;IADd,aAAK;GACA,SAAS,CAwBd"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { CoreModel } from "./coremodel";
|
|
2
1
|
import { Context } from "../utils/context";
|
|
2
|
+
import { CoreModel } from "./coremodel";
|
|
3
3
|
/**
|
|
4
4
|
* @WebdaModel
|
|
5
5
|
*/
|
|
@@ -35,6 +35,16 @@ export declare class OwnerModel extends CoreModel {
|
|
|
35
35
|
*/
|
|
36
36
|
getOwner(): string;
|
|
37
37
|
canAct(ctx: Context, action: "create" | "update" | "get" | "delete" | "get_binary" | "detach_binary" | "attach_binary" | "update_binary_metadata" | string): Promise<this>;
|
|
38
|
+
/**
|
|
39
|
+
* Return a query to filter OwnerModel
|
|
40
|
+
*
|
|
41
|
+
* @param context
|
|
42
|
+
* @returns
|
|
43
|
+
*/
|
|
44
|
+
static getPermissionQuery(context?: Context): null | {
|
|
45
|
+
partial: boolean;
|
|
46
|
+
query: string;
|
|
47
|
+
};
|
|
38
48
|
/**
|
|
39
49
|
* Return false if can't update
|
|
40
50
|
*/
|
package/lib/models/ownermodel.js
CHANGED
|
@@ -20,7 +20,7 @@ class OwnerModel extends coremodel_1.CoreModel {
|
|
|
20
20
|
*/
|
|
21
21
|
canCreate(ctx) {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const userId = ctx.getSession().
|
|
23
|
+
const userId = ctx.getSession().userId;
|
|
24
24
|
if (!userId) {
|
|
25
25
|
throw 403;
|
|
26
26
|
}
|
|
@@ -64,6 +64,21 @@ class OwnerModel extends coremodel_1.CoreModel {
|
|
|
64
64
|
throw 403;
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* Return a query to filter OwnerModel
|
|
69
|
+
*
|
|
70
|
+
* @param context
|
|
71
|
+
* @returns
|
|
72
|
+
*/
|
|
73
|
+
static getPermissionQuery(context) {
|
|
74
|
+
if (!context) {
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
query: `_user = '${context.getCurrentUserId()}' OR public = TRUE`,
|
|
79
|
+
partial: false
|
|
80
|
+
};
|
|
81
|
+
}
|
|
67
82
|
/**
|
|
68
83
|
* Return false if can't update
|
|
69
84
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownermodel.js","sourceRoot":"","sources":["../../src/models/ownermodel.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ownermodel.js","sourceRoot":"","sources":["../../src/models/ownermodel.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAwC;AAExC;;GAEG;AACH,MAAa,UAAW,SAAQ,qBAAS;IAgBvC;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC;YACvC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,GAAG,CAAC;aACX;YACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEtB,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;OAGG;IACH,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEK,MAAM,CACV,GAAY,EACZ,MASU;;YAEV,IAAI,MAAM,KAAK,QAAQ,EAAE;gBACvB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM,IACL,MAAM,KAAK,QAAQ;gBACnB,MAAM,KAAK,eAAe;gBAC1B,MAAM,KAAK,eAAe;gBAC1B,MAAM,KAAK,wBAAwB,EACnC;gBACA,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,YAAY,EAAE;gBACtD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACzB;iBAAM,IAAI,MAAM,KAAK,QAAQ,EAAE;gBAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aAC5B;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAiB;QACzC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,CAAC;SACb;QACD,OAAO;YACL,KAAK,EAAE,YAAY,OAAO,CAAC,gBAAgB,EAAE,oBAAoB;YACjE,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAED;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,oCAAoC;YACpC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,gBAAgB,EAAE,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,gBAAgB,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE;gBAC5G,MAAM,GAAG,CAAC;aACX;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;OAEG;IACG,MAAM,CAAC,GAAY;;YACvB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,GAAY;;YAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;CACF;AAxHD,gCAwHC"}
|