@webda/core 3.0.1 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/models/coremodel.js +1 -1
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +1 -1
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/relations.js.map +1 -1
- package/lib/services/binary.js.map +1 -1
- package/lib/services/cloudbinary.spec.js +1 -2
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +102 -3
- package/lib/services/proxy.js +149 -22
- package/lib/services/proxy.js.map +1 -1
- package/lib/services/proxy.spec.js +104 -1
- package/lib/services/proxy.spec.js.map +1 -1
- package/lib/services/service.js +3 -0
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +3 -0
- package/lib/services/service.spec.js.map +1 -1
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/cookie.js +2 -0
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/serializers.d.ts +9 -5
- package/lib/utils/serializers.js +27 -13
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +7 -6
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.js +2 -2
- package/lib/utils/session.js.map +1 -1
- package/package.json +7 -6
- package/webda.module.json +12 -6
package/lib/utils/cookie.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/utils/cookie.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AAK9E;;;GAGG;AACH,MAAM,KAAK,GAAG,IAAI,CAAC;AAEnB;;GAEG;AACH,MAAM,OAAO,aAAa;IAgCxB;;;;OAIG;IACH,YAAY,OAA+B,EAAE,WAAyB;QACpE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,KAAb,IAAI,CAAC,QAAQ,GAAK,IAAI,EAAC;QACvB,IAAI,CAAC,IAAI,KAAT,IAAI,CAAC,IAAI,GAAK,GAAG,EAAC;QAClB,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,KAAK,GAAG,CAAC,EAAC;QAC1B,IAAI,CAAC,QAAQ,KAAb,IAAI,CAAC,QAAQ,GAAK,KAAK,EAAC;QACxB,IAAI,CAAC,IAAI,KAAT,IAAI,CAAC,IAAI,GAAK,OAAO,EAAC;QACtB,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,WAAW,CAAC,WAAW,EAAE,EAAC;YAC1C,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,WAAW,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAC;SACxD;IACH,CAAC;CACF;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,YAAY;IACvB;;;;;;;;;OASG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAAmB,EAAE,OAAoB;QACvE,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/utils/cookie.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,10 @@ type FinderOptionsType = WalkerOptionsType & {
|
|
|
9
9
|
filterPattern?: RegExp;
|
|
10
10
|
processor?: (filepath: string) => void;
|
|
11
11
|
};
|
|
12
|
+
/**
|
|
13
|
+
* Type of format managed
|
|
14
|
+
*/
|
|
15
|
+
type Format = "json" | "yaml";
|
|
12
16
|
/**
|
|
13
17
|
* Define a Finder that can be use
|
|
14
18
|
*/
|
|
@@ -36,8 +40,8 @@ export interface StorageFinder {
|
|
|
36
40
|
* Allow save/load of yaml or json file
|
|
37
41
|
*/
|
|
38
42
|
export declare const FileUtils: StorageFinder & {
|
|
39
|
-
save: (object: any, filename: string, publicAudience?: boolean) => void;
|
|
40
|
-
load: (filename: string) => any;
|
|
43
|
+
save: (object: any, filename: string, publicAudience?: boolean, format?: Format) => void;
|
|
44
|
+
load: (filename: string, format?: Format) => any;
|
|
41
45
|
clean: (...files: string[]) => void;
|
|
42
46
|
};
|
|
43
47
|
/**
|
|
@@ -96,11 +100,11 @@ export declare const YAMLUtils: {
|
|
|
96
100
|
/**
|
|
97
101
|
* Helper to FileUtils.save
|
|
98
102
|
*/
|
|
99
|
-
|
|
103
|
+
loadFile: (filename: string) => any;
|
|
100
104
|
/**
|
|
101
|
-
* Helper to FileUtils.
|
|
105
|
+
* Helper to FileUtils.save
|
|
102
106
|
*/
|
|
103
|
-
|
|
107
|
+
saveFile: (object: any, filename: string, publicAudience?: boolean) => void;
|
|
104
108
|
/**
|
|
105
109
|
* Duplicate an object using serializer
|
|
106
110
|
*/
|
package/lib/utils/serializers.js
CHANGED
|
@@ -3,6 +3,20 @@ import * as jsonc from "jsonc-parser";
|
|
|
3
3
|
import { join } from "path";
|
|
4
4
|
import * as yaml from "yaml";
|
|
5
5
|
import { Core } from "../core.js";
|
|
6
|
+
/**
|
|
7
|
+
* Guess format to use for a filename
|
|
8
|
+
* @param filename
|
|
9
|
+
* @returns
|
|
10
|
+
*/
|
|
11
|
+
function getFormatFromFilename(filename) {
|
|
12
|
+
if (filename.match(/\.ya?ml$/i)) {
|
|
13
|
+
return "yaml";
|
|
14
|
+
}
|
|
15
|
+
else if (filename.match(/\.jsonc?$/i)) {
|
|
16
|
+
return "json";
|
|
17
|
+
}
|
|
18
|
+
throw new Error("Unknown format: " + filename);
|
|
19
|
+
}
|
|
6
20
|
/**
|
|
7
21
|
* Allow save/load of yaml or json file
|
|
8
22
|
*/
|
|
@@ -101,25 +115,25 @@ export const FileUtils = {
|
|
|
101
115
|
* @param filename to load
|
|
102
116
|
* @returns
|
|
103
117
|
*/
|
|
104
|
-
load: filename => {
|
|
118
|
+
load: (filename, format) => {
|
|
105
119
|
if (!existsSync(filename)) {
|
|
106
120
|
throw new Error(`File '${filename}' does not exist.`);
|
|
107
121
|
}
|
|
108
122
|
let content = readFileSync(filename, "utf-8");
|
|
109
|
-
|
|
123
|
+
format ?? (format = getFormatFromFilename(filename));
|
|
124
|
+
if (format === "yaml") {
|
|
110
125
|
let res = yaml.parseAllDocuments(content);
|
|
111
126
|
if (res.length === 1) {
|
|
112
127
|
return res.pop().toJSON();
|
|
113
128
|
}
|
|
114
129
|
return res.map(d => d.toJSON());
|
|
115
130
|
}
|
|
116
|
-
else if (
|
|
131
|
+
else if (format === "json") {
|
|
117
132
|
if (filename.endsWith("c")) {
|
|
118
133
|
return jsonc.parse(content);
|
|
119
134
|
}
|
|
120
135
|
return JSON.parse(content);
|
|
121
136
|
}
|
|
122
|
-
throw new Error("Unknown format");
|
|
123
137
|
},
|
|
124
138
|
/**
|
|
125
139
|
* Save a YAML or JSON file based on its extension
|
|
@@ -128,14 +142,14 @@ export const FileUtils = {
|
|
|
128
142
|
* @param filename to save
|
|
129
143
|
* @returns
|
|
130
144
|
*/
|
|
131
|
-
save: (object, filename = "", publicAudience = false) => {
|
|
132
|
-
|
|
145
|
+
save: (object, filename = "", publicAudience = false, format) => {
|
|
146
|
+
format ?? (format = getFormatFromFilename(filename));
|
|
147
|
+
if (format === "yaml") {
|
|
133
148
|
return writeFileSync(filename, yaml.stringify(JSON.parse(JSONUtils.stringify(object, undefined, 0, publicAudience))));
|
|
134
149
|
}
|
|
135
|
-
else if (
|
|
150
|
+
else if (format === "json") {
|
|
136
151
|
return writeFileSync(filename, JSONUtils.stringify(object, undefined, 2, publicAudience));
|
|
137
152
|
}
|
|
138
|
-
throw new Error("Unknown format");
|
|
139
153
|
},
|
|
140
154
|
/**
|
|
141
155
|
* Delete files if exists
|
|
@@ -224,11 +238,11 @@ export const JSONUtils = {
|
|
|
224
238
|
/**
|
|
225
239
|
* Helper to FileUtils.save
|
|
226
240
|
*/
|
|
227
|
-
loadFile: FileUtils.load,
|
|
241
|
+
loadFile: (filename) => FileUtils.load(filename, "json"),
|
|
228
242
|
/**
|
|
229
243
|
* Helper to FileUtils.save
|
|
230
244
|
*/
|
|
231
|
-
saveFile: FileUtils.save,
|
|
245
|
+
saveFile: (object, filename, publicAudience) => FileUtils.save(object, filename, publicAudience, "json"),
|
|
232
246
|
/**
|
|
233
247
|
* Sort object keys
|
|
234
248
|
* @param unordered
|
|
@@ -254,11 +268,11 @@ export const YAMLUtils = {
|
|
|
254
268
|
/**
|
|
255
269
|
* Helper to FileUtils.save
|
|
256
270
|
*/
|
|
257
|
-
|
|
271
|
+
loadFile: (filename) => FileUtils.load(filename, "yaml"),
|
|
258
272
|
/**
|
|
259
|
-
* Helper to FileUtils.
|
|
273
|
+
* Helper to FileUtils.save
|
|
260
274
|
*/
|
|
261
|
-
|
|
275
|
+
saveFile: (object, filename, publicAudience) => FileUtils.save(object, filename, publicAudience, "yaml"),
|
|
262
276
|
/**
|
|
263
277
|
* Duplicate an object using serializer
|
|
264
278
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../../src/utils/serializers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,aAAa,EACd,MAAM,IAAI,CAAC;AACZ,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../../src/utils/serializers.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,16 +23,17 @@ let UtilsTest = class UtilsTest {
|
|
|
23
23
|
test: "ok"
|
|
24
24
|
});
|
|
25
25
|
assert.throws(() => JSONUtils.loadFile("/none"), /File '\/none' does not exist/);
|
|
26
|
-
assert.throws(() => JSONUtils.loadFile("./Dockerfile"), /
|
|
26
|
+
assert.throws(() => JSONUtils.loadFile("./Dockerfile"), /SyntaxError/);
|
|
27
|
+
assert.throws(() => FileUtils.load("./Dockerfile"), /Unknown format/);
|
|
27
28
|
}
|
|
28
29
|
fileYml() {
|
|
29
|
-
assert.deepStrictEqual(
|
|
30
|
+
assert.deepStrictEqual(YAMLUtils.loadFile(TEST_FOLDER + "test.yml"), {
|
|
30
31
|
test: { ok: "plop" },
|
|
31
32
|
tab: ["ok", "item2"]
|
|
32
33
|
});
|
|
33
34
|
}
|
|
34
35
|
fileYaml() {
|
|
35
|
-
assert.strictEqual(
|
|
36
|
+
assert.strictEqual(FileUtils.load(TEST_FOLDER + "mdocs.yaml").length, 2);
|
|
36
37
|
}
|
|
37
38
|
circularJSON() {
|
|
38
39
|
let a = {
|
|
@@ -76,17 +77,17 @@ let UtilsTest = class UtilsTest {
|
|
|
76
77
|
JSONUtils.saveFile({ test: "plop" }, file);
|
|
77
78
|
assert.strictEqual(readFileSync(file).toString(), '{\n "test": "plop"\n}');
|
|
78
79
|
file = path.join(TEST_FOLDER, "writeTest.yaml");
|
|
79
|
-
|
|
80
|
+
FileUtils.save({ test: "plop" }, file);
|
|
80
81
|
assert.strictEqual(readFileSync(file).toString(), `test: plop\n`);
|
|
81
82
|
// Yaml alias
|
|
82
83
|
file = path.join(TEST_FOLDER, "writeTest.json");
|
|
83
84
|
YAMLUtils.saveFile({ test: "plop" }, file);
|
|
84
|
-
assert.strictEqual(readFileSync(file).toString(),
|
|
85
|
+
assert.strictEqual(readFileSync(file).toString(), `test: plop\n`);
|
|
85
86
|
// True implem
|
|
86
87
|
file = path.join(TEST_FOLDER, "writeTest.json");
|
|
87
88
|
FileUtils.save({ test: "plop" }, file);
|
|
88
89
|
assert.strictEqual(readFileSync(file).toString(), '{\n "test": "plop"\n}');
|
|
89
|
-
assert.throws(() =>
|
|
90
|
+
assert.throws(() => FileUtils.save({}, "./Dockerfile.zzz"), /Unknown format/);
|
|
90
91
|
}
|
|
91
92
|
finally {
|
|
92
93
|
FileUtils.clean("test/jsonutils/writeTest.json", "test/jsonutils/writeTest.yaml");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializers.spec.js","sourceRoot":"","sources":["../../src/utils/serializers.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAC3D,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEhE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,wBAAwB,CAAC;AAE5F,IAAM,SAAS,GAAf,MAAM,SAAS;IAEb,QAAQ;QACN,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC,EAAE;YACpE,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC,EAAE;YACpE,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,EAAE;YAChE,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,8BAA8B,CAAC,CAAC;QACjF,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"serializers.spec.js","sourceRoot":"","sources":["../../src/utils/serializers.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/session.js
CHANGED
|
@@ -85,10 +85,10 @@ export class CookieSessionManager extends SessionManager {
|
|
|
85
85
|
session,
|
|
86
86
|
ttl: Date.now() + this.parameters.cookie.maxAge * 1000
|
|
87
87
|
});
|
|
88
|
-
SecureCookie.save(this.parameters.cookie.name, context, {}, { ...this.parameters.jwt, subject: session.uuid.toString() });
|
|
88
|
+
SecureCookie.save(this.parameters.cookie.name, context, {}, { ...this.parameters.jwt, subject: session.uuid.toString() }, this.parameters.cookie);
|
|
89
89
|
return;
|
|
90
90
|
}
|
|
91
|
-
SecureCookie.save(this.parameters.cookie.name, context, session, this.parameters.jwt);
|
|
91
|
+
SecureCookie.save(this.parameters.cookie.name, context, session, this.parameters.jwt, this.parameters.cookie);
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
__decorate([
|
package/lib/utils/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAe,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEtF,OAAO,EAAoB,UAAU,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEvD;;GAEG;AACH,MAAM,OAAgB,cAAgE,SAAQ,OAAU;CAgBvG;AAED,MAAM,OAAO,uBAAwB,SAAQ,iBAAiB;IAU5D,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,IAAI,aAAa,CAAC,EAAE,CAAC,EAAC;IACxC,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,oBAEX,SAAQ,cAAiB;IAOzB;;OAEG;IACH,cAAc,CAAC,MAAsB;QACnC,OAAO,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE;YACjE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,OAAyB;QAClC,IAAI,CAAC,CAAC,OAAO,YAAY,UAAU,CAAC,EAAE;YACpC,OAAO,IAAI,OAAO,EAAE,CAAC;SACtB;QACD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,IAAI,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAChG,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,MAAM,CAAC,GAAG,EAAE;gBACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC3E,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC;aAC3B;YACD,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC;SACvD;aAAM;YACL,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CAAC,OAAmC;QAClD,OAAO,IAAI,OAAO,EAAE,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,OAAyB,EAAE,OAAgB;QACpD,IAAI,CAAC,CAAC,OAAO,YAAY,UAAU,CAAC,EAAE;YACpC,OAAO;SACR;QACD,kDAAkD;QAClD,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC3B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO;gBACP,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI;aACvD,CAAC,CAAC;YACH,YAAY,CAAC,IAAI,CACf,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAC3B,OAAO,EACP,EAAE,EACF,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webda/core",
|
|
3
|
-
"version": "3.0
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"description": "Expose API with Lambda",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@types/json-schema": "^7.0.8",
|
|
27
|
-
"@webda/workout": "^3.0.
|
|
27
|
+
"@webda/workout": "^3.0.1",
|
|
28
28
|
"accept-language": "^3.0.18",
|
|
29
29
|
"ajv": "^8.6.2",
|
|
30
30
|
"ajv-formats": "^2.1.1",
|
|
@@ -60,17 +60,18 @@
|
|
|
60
60
|
"@testdeck/mocha": "^0.3.2",
|
|
61
61
|
"@types/node": "14.6.0",
|
|
62
62
|
"@types/nodemailer": "^6.4.4",
|
|
63
|
-
"@webda/tsc-esm": "^1.0.
|
|
63
|
+
"@webda/tsc-esm": "^1.0.4",
|
|
64
64
|
"antlr4ts-cli": "^0.5.0-alpha.4",
|
|
65
65
|
"axios": "^1.1.3",
|
|
66
|
-
"c8": "^
|
|
66
|
+
"c8": "^8.0.0",
|
|
67
67
|
"fs-extra": "^11.0.0",
|
|
68
68
|
"mocha": "^10.0.0",
|
|
69
69
|
"prettier": "^2.3.2",
|
|
70
70
|
"sinon": "^15.0.0",
|
|
71
71
|
"source-map-support": "^0.5.19",
|
|
72
72
|
"ts-node": "^10.1.0",
|
|
73
|
-
"typescript": "~
|
|
73
|
+
"typescript": "~5.1.3",
|
|
74
|
+
"ws": "^8.13.0"
|
|
74
75
|
},
|
|
75
76
|
"files": [
|
|
76
77
|
"lib",
|
|
@@ -110,5 +111,5 @@
|
|
|
110
111
|
"engines": {
|
|
111
112
|
"node": ">=16.0.0"
|
|
112
113
|
},
|
|
113
|
-
"gitHead": "
|
|
114
|
+
"gitHead": "c158d33827a30caa869ceff593a1f92aab7279f9"
|
|
114
115
|
}
|
package/webda.module.json
CHANGED
|
@@ -842,28 +842,28 @@
|
|
|
842
842
|
"properties": {
|
|
843
843
|
"domain": {
|
|
844
844
|
"type": "string",
|
|
845
|
-
"description": "Specifies the value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.
|
|
845
|
+
"description": "Specifies the value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.3Domain Set-Cookie attribute } . By default, no domain is set, and most clients will consider the cookie to apply to only the current domain.",
|
|
846
846
|
"default": "to request hostname"
|
|
847
847
|
},
|
|
848
848
|
"expires": {
|
|
849
849
|
"type": "string",
|
|
850
850
|
"format": "date-time",
|
|
851
|
-
"description": "Specifies the `Date` object to be the value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.1
|
|
851
|
+
"description": "Specifies the `Date` object to be the value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.1`Expires` `Set-Cookie` attribute } . By default, no expiration is set, and most clients will consider this a \"non-persistent cookie\" and will delete it on a condition like exiting a web browser application.\n\n*Note* the {@link https://tools.ietf.org/html/rfc6265#section-5.3cookie storage model specification } \nstates that if both `expires` and `maxAge` are set, then `maxAge` takes precedence, but it is possible not all clients by obey this, so if both are set, they should point to the same date and time."
|
|
852
852
|
},
|
|
853
853
|
"httpOnly": {
|
|
854
854
|
"type": "boolean",
|
|
855
|
-
"description": "Specifies the boolean value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.6
|
|
855
|
+
"description": "Specifies the boolean value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.6`HttpOnly` `Set-Cookie` attribute } . When truthy, the `HttpOnly` attribute is set, otherwise it is not. By default, the `HttpOnly` attribute is not set.\n\n*Note* be careful when setting this to true, as compliant clients will not allow client-side JavaScript to see the cookie in `document.cookie`.",
|
|
856
856
|
"default": true
|
|
857
857
|
},
|
|
858
858
|
"maxAge": {
|
|
859
859
|
"type": "number",
|
|
860
|
-
"description": "Specifies the number (in seconds) to be the value for the `Max-Age` `Set-Cookie` attribute. The given number will be converted to an integer by rounding down. By default, no maximum age is set.\n\n*Note* the {@link https://tools.ietf.org/html/rfc6265#section-5.
|
|
860
|
+
"description": "Specifies the number (in seconds) to be the value for the `Max-Age` `Set-Cookie` attribute. The given number will be converted to an integer by rounding down. By default, no maximum age is set.\n\n*Note* the {@link https://tools.ietf.org/html/rfc6265#section-5.3cookie storage model specification } \nstates that if both `expires` and `maxAge` are set, then `maxAge` takes precedence, but it is possible not all clients by obey this, so if both are set, they should point to the same date and time.",
|
|
861
861
|
"minimum": 1,
|
|
862
862
|
"default": "86400 * 7"
|
|
863
863
|
},
|
|
864
864
|
"path": {
|
|
865
865
|
"type": "string",
|
|
866
|
-
"description": "Specifies the value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.4
|
|
866
|
+
"description": "Specifies the value for the {@link https://tools.ietf.org/html/rfc6265#section-5.2.4`Path` `Set-Cookie` attribute } . By default, the path is considered the \"default path\".",
|
|
867
867
|
"default": "/"
|
|
868
868
|
},
|
|
869
869
|
"sameSite": {
|
|
@@ -873,7 +873,7 @@
|
|
|
873
873
|
"strict",
|
|
874
874
|
"lax"
|
|
875
875
|
],
|
|
876
|
-
"description": "Specifies the boolean or string to be the value for the {@link https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.2.7
|
|
876
|
+
"description": "Specifies the boolean or string to be the value for the {@link https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.2.7`SameSite` `Set-Cookie` attribute } .\n\n- `true` will set the `SameSite` attribute to `Strict` for strict same site enforcement.\n- `false` will not set the `SameSite` attribute.\n- `'lax'` will set the `SameSite` attribute to Lax for lax same site enforcement.\n- `'strict'` will set the `SameSite` attribute to Strict for strict same site enforcement. - `'none'` will set the SameSite attribute to None for an explicit cross-site cookie.\n\nMore information about the different enforcement levels can be found in {@link https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.2.7the specification } .\n\n*note* This is an attribute that has not yet been fully standardized, and may change in the future. This also means many clients may ignore this attribute until they understand it.",
|
|
877
877
|
"default": "lax"
|
|
878
878
|
},
|
|
879
879
|
"secure": {
|
|
@@ -2334,6 +2334,11 @@
|
|
|
2334
2334
|
"type": "boolean",
|
|
2335
2335
|
"description": "Helper to refuse any request if user is not auth"
|
|
2336
2336
|
},
|
|
2337
|
+
"proxyHeaders": {
|
|
2338
|
+
"type": "boolean",
|
|
2339
|
+
"description": "Add X-Forwarded-* headers",
|
|
2340
|
+
"default": true
|
|
2341
|
+
},
|
|
2337
2342
|
"openapi": {
|
|
2338
2343
|
"type": "object",
|
|
2339
2344
|
"additionalProperties": true
|
|
@@ -2341,6 +2346,7 @@
|
|
|
2341
2346
|
},
|
|
2342
2347
|
"required": [
|
|
2343
2348
|
"backend",
|
|
2349
|
+
"proxyHeaders",
|
|
2344
2350
|
"requireAuthentication",
|
|
2345
2351
|
"type"
|
|
2346
2352
|
],
|