@webda/core 2.0.0-beta.1 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/application.d.ts +9 -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 +86 -46
- package/lib/core.js +254 -316
- 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 +127 -151
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +84 -11
- package/lib/models/coremodel.js +104 -103
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +91 -91
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.js +1 -2
- package/lib/models/ident.d.ts +5 -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 +12 -2
- package/lib/models/ownermodel.js +54 -62
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +129 -152
- 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 +5 -5
- 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 +7 -3
- package/lib/router.js +49 -48
- 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 +539 -571
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +411 -447
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +8 -6
- package/lib/services/binary.js +212 -244
- 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 +46 -71
- 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 +15 -5
- package/lib/services/filebinary.js +171 -200
- 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 +9 -9
- package/lib/services/invitationservice.js +275 -313
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +442 -448
- 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 -147
- 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 +33 -7
- package/lib/services/service.js +74 -42
- 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 +261 -289
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +4 -4
- package/lib/stores/mapper.js +112 -137
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +131 -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 +35 -15
- package/lib/stores/store.js +839 -821
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +6 -4
- package/lib/stores/store.spec.js +627 -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 +25 -31
- 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 +147 -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 +37 -9
- package/lib/utils/httpcontext.js +86 -57
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +37 -48
- 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 +956 -188
package/lib/utils/cookie.js
CHANGED
|
@@ -1,23 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
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.SessionCookie = exports.SecureCookie = void 0;
|
|
13
|
-
const cookie_1 = require("cookie");
|
|
14
|
-
const jwt = require("jsonwebtoken");
|
|
15
|
-
const core_1 = require("../core");
|
|
1
|
+
import { serialize as cookieSerialize } from "cookie";
|
|
16
2
|
/**
|
|
17
3
|
* Cookie cannot be more than 4096, so we split them by this constant
|
|
18
4
|
* @hidden
|
|
19
5
|
*/
|
|
20
6
|
const SPLIT = 4096;
|
|
7
|
+
/**
|
|
8
|
+
* Cookie Options
|
|
9
|
+
*/
|
|
10
|
+
export class CookieOptions {
|
|
11
|
+
/**
|
|
12
|
+
* Load with default value
|
|
13
|
+
* @param options
|
|
14
|
+
* @param httpContext
|
|
15
|
+
*/
|
|
16
|
+
constructor(options, httpContext) {
|
|
17
|
+
Object.assign(this, options);
|
|
18
|
+
this.httpOnly ?? (this.httpOnly = true);
|
|
19
|
+
this.path ?? (this.path = "/");
|
|
20
|
+
this.maxAge ?? (this.maxAge = 86400 * 7);
|
|
21
|
+
this.sameSite ?? (this.sameSite = "lax");
|
|
22
|
+
this.name ?? (this.name = "webda");
|
|
23
|
+
if (httpContext) {
|
|
24
|
+
this.domain ?? (this.domain = httpContext.getHostName());
|
|
25
|
+
this.httpOnly ?? (this.httpOnly = httpContext.getProtocol() === "https:");
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
21
29
|
/**
|
|
22
30
|
* Object that handle the session
|
|
23
31
|
*
|
|
@@ -34,104 +42,58 @@ const SPLIT = 4096;
|
|
|
34
42
|
* @category CoreFeatures
|
|
35
43
|
* @WebdaModel
|
|
36
44
|
*/
|
|
37
|
-
class SecureCookie {
|
|
38
|
-
/**
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
export class SecureCookie {
|
|
46
|
+
/**
|
|
47
|
+
* Load cookie
|
|
48
|
+
*
|
|
49
|
+
* It manages the split of the cookie to 4096 if required
|
|
50
|
+
*
|
|
51
|
+
* @param name cookie name
|
|
52
|
+
* @param options
|
|
53
|
+
* @param context
|
|
54
|
+
* @returns
|
|
55
|
+
*/
|
|
56
|
+
static async load(name, context, options) {
|
|
46
57
|
let cookies = {};
|
|
47
|
-
|
|
48
|
-
|
|
58
|
+
let raw = "";
|
|
59
|
+
let session = context.newSession();
|
|
60
|
+
// No http context
|
|
61
|
+
if (!context.getHttpContext()) {
|
|
62
|
+
return session;
|
|
49
63
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
64
|
+
cookies = context.getHttpContext().getCookies();
|
|
65
|
+
if (cookies) {
|
|
66
|
+
raw = cookies[name] || "";
|
|
67
|
+
let j = 2;
|
|
68
|
+
let cookieName = `${name}${j++}`;
|
|
69
|
+
while (cookies[cookieName]) {
|
|
70
|
+
raw += cookies[cookieName];
|
|
71
|
+
cookieName = `${name}${j++}`;
|
|
55
72
|
}
|
|
56
|
-
catch (err) {
|
|
57
|
-
// We ignore bad cookies
|
|
58
|
-
ctx.log("WARN", "Ignoring bad cookie", this._raw, "from", ctx.getHttpContext());
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
// Set changed to false after initial modification
|
|
62
|
-
this._changed = false;
|
|
63
|
-
ctx.addListener("end", () => {
|
|
64
|
-
this.save(ctx);
|
|
65
|
-
});
|
|
66
|
-
}
|
|
67
|
-
getRaw(name, cookies) {
|
|
68
|
-
if (!cookies) {
|
|
69
|
-
return "";
|
|
70
73
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
while (cookies[cookieName]) {
|
|
75
|
-
res += cookies[cookieName];
|
|
76
|
-
cookieName = `${name}${j++}`;
|
|
74
|
+
// No cookie found or empty
|
|
75
|
+
if (raw === "") {
|
|
76
|
+
return session;
|
|
77
77
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
getProxy() {
|
|
81
|
-
// Should use Proxy if available
|
|
82
|
-
if (Proxy != undefined) {
|
|
83
|
-
// Proxy implementation
|
|
84
|
-
return new Proxy(this, {
|
|
85
|
-
set: (obj, prop, value) => {
|
|
86
|
-
// @ts-ignore
|
|
87
|
-
obj[prop] = value;
|
|
88
|
-
if (prop !== "_changed") {
|
|
89
|
-
this._changed = true;
|
|
90
|
-
}
|
|
91
|
-
return true;
|
|
92
|
-
}
|
|
93
|
-
});
|
|
78
|
+
try {
|
|
79
|
+
return Object.assign(session, await context.getWebda().getCrypto().jwtVerify(raw, options));
|
|
94
80
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
if (prop[0] === "_") {
|
|
99
|
-
continue;
|
|
100
|
-
}
|
|
101
|
-
delete this[prop];
|
|
81
|
+
catch (err) {
|
|
82
|
+
context.log("WARN", "Ignoring bad cookie", `'${raw}'`, "from", context.getHttpContext());
|
|
83
|
+
return session;
|
|
102
84
|
}
|
|
103
|
-
this._changed = true;
|
|
104
85
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
if (!this.needSave()) {
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
var params = {
|
|
120
|
-
path: "/",
|
|
121
|
-
domain: ctx.getHttpContext().getHostName(),
|
|
122
|
-
httpOnly: true,
|
|
123
|
-
secure: ctx.getHttpContext().getProtocol() === "https:",
|
|
124
|
-
maxAge: 86400 * 7,
|
|
125
|
-
sameSite: "Lax"
|
|
126
|
-
};
|
|
127
|
-
// Get default cookie value from config
|
|
128
|
-
let cookie = ctx.parameter("cookie");
|
|
129
|
-
if (cookie !== undefined) {
|
|
130
|
-
params = Object.assign(Object.assign({}, params), cookie);
|
|
131
|
-
}
|
|
132
|
-
let value = jwt.sign(JSON.stringify(this), this._secret);
|
|
133
|
-
this.sendCookie(ctx, this._name, value, params);
|
|
134
|
-
// Transform the cookie to a plain object
|
|
86
|
+
/**
|
|
87
|
+
* Send a cookie, split it if required
|
|
88
|
+
*
|
|
89
|
+
* @param name
|
|
90
|
+
* @param context
|
|
91
|
+
* @param data
|
|
92
|
+
* @param options
|
|
93
|
+
*/
|
|
94
|
+
static async save(name, context, data, options, cookieOptions) {
|
|
95
|
+
let value = await context.getWebda().getCrypto().jwtSign(Object.assign({}, data), options);
|
|
96
|
+
this.sendCookie(context, name, value, new CookieOptions(cookieOptions, context.getHttpContext()));
|
|
135
97
|
}
|
|
136
98
|
/**
|
|
137
99
|
* Will send the cookie to context and split it
|
|
@@ -143,11 +105,11 @@ class SecureCookie {
|
|
|
143
105
|
* @param value of the cookie
|
|
144
106
|
* @param params for the cookie
|
|
145
107
|
*/
|
|
146
|
-
sendCookie(ctx, name, value, params) {
|
|
108
|
+
static sendCookie(ctx, name, value, params) {
|
|
147
109
|
let j = 1;
|
|
148
110
|
let cookieName = name;
|
|
149
111
|
let limit;
|
|
150
|
-
const mapLength = (
|
|
112
|
+
const mapLength = cookieSerialize(name, "", params).length;
|
|
151
113
|
for (let i = 0; i < value.length;) {
|
|
152
114
|
limit = SPLIT - mapLength;
|
|
153
115
|
if (j > 1) {
|
|
@@ -159,56 +121,5 @@ class SecureCookie {
|
|
|
159
121
|
i += limit;
|
|
160
122
|
}
|
|
161
123
|
}
|
|
162
|
-
needSave() {
|
|
163
|
-
return this._changed;
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
exports.SecureCookie = SecureCookie;
|
|
167
|
-
/**
|
|
168
|
-
* @WebdaModel
|
|
169
|
-
*/
|
|
170
|
-
class SessionCookie extends SecureCookie {
|
|
171
|
-
constructor(ctx) {
|
|
172
|
-
super(ctx.getWebda().parameter("sessionName") || "webda", {
|
|
173
|
-
secret: ctx.getWebda().parameter("sessionSecret")
|
|
174
|
-
}, ctx);
|
|
175
|
-
}
|
|
176
|
-
getIdentUsed() {
|
|
177
|
-
return this.identUsed;
|
|
178
|
-
}
|
|
179
|
-
getUserId() {
|
|
180
|
-
return this.userId;
|
|
181
|
-
}
|
|
182
|
-
logout() {
|
|
183
|
-
delete this.userId;
|
|
184
|
-
}
|
|
185
|
-
/**
|
|
186
|
-
* Login a user
|
|
187
|
-
*
|
|
188
|
-
* If using an Authentication Service use the `login` method of the service instead
|
|
189
|
-
* It will keep the right event to be emitted
|
|
190
|
-
*
|
|
191
|
-
* @param userId
|
|
192
|
-
* @param identUsed
|
|
193
|
-
*/
|
|
194
|
-
login(userId, identUsed) {
|
|
195
|
-
this.userId = userId;
|
|
196
|
-
this.identUsed = identUsed;
|
|
197
|
-
}
|
|
198
|
-
/**
|
|
199
|
-
* @returns true if a user id is known
|
|
200
|
-
*/
|
|
201
|
-
isLogged() {
|
|
202
|
-
return this.userId !== undefined;
|
|
203
|
-
}
|
|
204
|
-
needSave() {
|
|
205
|
-
return true;
|
|
206
|
-
}
|
|
207
|
-
init() {
|
|
208
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
209
|
-
// For future use
|
|
210
|
-
});
|
|
211
|
-
}
|
|
212
124
|
}
|
|
213
|
-
exports.SessionCookie = SessionCookie;
|
|
214
125
|
//# sourceMappingURL=cookie.js.map
|
package/lib/utils/cookie.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/utils/cookie.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/utils/cookie.ts"],"names":[],"mappings":"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"}
|