@scefira/dfw 1.0.10 → 1.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/DFWCore.js +17 -7
- package/lib/DFWCore.js.map +1 -1
- package/lib/controller/DFWFileController.d.ts +11 -10
- package/lib/controller/DFWFileController.d.ts.map +1 -1
- package/lib/controller/DFWSecurityController.d.ts +3 -6
- package/lib/controller/DFWSecurityController.d.ts.map +1 -1
- package/lib/controller/DFWSecurityController.js +9 -12
- package/lib/controller/DFWSecurityController.js.map +1 -1
- package/lib/controller/DFWUserController.d.ts +5 -5
- package/lib/controller/DFWUserController.d.ts.map +1 -1
- package/lib/controller/DFWUserController.js +2 -2
- package/lib/controller/DFWUserController.js.map +1 -1
- package/lib/index.d.ts +1 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -5
- package/lib/index.js.map +1 -1
- package/lib/lib/APIManager.d.ts.map +1 -1
- package/lib/lib/APIManager.js +7 -2
- package/lib/lib/APIManager.js.map +1 -1
- package/lib/lib/DFWSessionStore.d.ts +1 -0
- package/lib/lib/DFWSessionStore.d.ts.map +1 -1
- package/lib/lib/DFWSessionStore.js +15 -1
- package/lib/lib/DFWSessionStore.js.map +1 -1
- package/lib/listeners/StaticPathListener.d.ts +5 -0
- package/lib/listeners/StaticPathListener.d.ts.map +1 -0
- package/lib/listeners/{StaticDirectoryListener.js → StaticPathListener.js} +3 -3
- package/lib/listeners/StaticPathListener.js.map +1 -0
- package/lib/test.js +25 -14
- package/lib/test.js.map +1 -1
- package/lib/types/APIListener.d.ts +7 -2
- package/lib/types/APIListener.d.ts.map +1 -1
- package/lib/types/DFWConfig.d.ts +7 -0
- package/lib/types/DFWConfig.d.ts.map +1 -1
- package/lib/types/DFWRequest.d.ts +1 -1
- package/package.json +7 -5
- package/prisma/schema/dfw.prisma +11 -16
- package/prisma/schema/schema.prisma +1 -1
- package/lib/listeners/StaticDirectoryListener.d.ts +0 -5
- package/lib/listeners/StaticDirectoryListener.d.ts.map +0 -1
- package/lib/listeners/StaticDirectoryListener.js.map +0 -1
- package/lib/listeners/UploadListener.d.ts +0 -5
- package/lib/listeners/UploadListener.d.ts.map +0 -1
- package/lib/listeners/UploadListener.js +0 -17
- package/lib/listeners/UploadListener.js.map +0 -1
package/lib/DFWCore.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
package/lib/DFWCore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWCore.js","sourceRoot":"","sources":["../src/DFWCore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DFWCore.js","sourceRoot":"","sources":["../src/DFWCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,25 +4,26 @@ type SaveFileOptions = {
|
|
|
4
4
|
name?: string;
|
|
5
5
|
variant?: string;
|
|
6
6
|
expire?: Date;
|
|
7
|
-
idParent?:
|
|
7
|
+
idParent?: string;
|
|
8
8
|
makeUrl: (filePath: string) => string;
|
|
9
9
|
};
|
|
10
10
|
declare class DFWFileController extends DFWController {
|
|
11
11
|
saveUploadedFileAsync(file: UploadedFile, { name, expire, idParent, variant, makeUrl }: SaveFileOptions): Promise<{
|
|
12
|
-
|
|
12
|
+
variant: string | null;
|
|
13
13
|
name: string | null;
|
|
14
|
-
|
|
14
|
+
id: string;
|
|
15
15
|
url: string | null;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
checksum: string | null;
|
|
19
|
-
mimetype: string | null;
|
|
16
|
+
metadata: import("@prisma/client/runtime/library").JsonValue | null;
|
|
17
|
+
path: string | null;
|
|
20
18
|
storage: import(".prisma/client").$Enums.DFW_FILE_STORAGE;
|
|
21
|
-
|
|
22
|
-
idParent: number | null;
|
|
23
|
-
idUser: number | null;
|
|
19
|
+
size: number | null;
|
|
24
20
|
createdAt: Date;
|
|
25
21
|
updatedAt: Date;
|
|
22
|
+
expire: Date | null;
|
|
23
|
+
idUser: string | null;
|
|
24
|
+
checksum: string | null;
|
|
25
|
+
mimetype: string | null;
|
|
26
|
+
idParent: string | null;
|
|
26
27
|
}>;
|
|
27
28
|
generateTempFileName(posfix?: string): string;
|
|
28
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWFileController.d.ts","sourceRoot":"","sources":["../../src/controller/DFWFileController.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD,KAAK,eAAe,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CACxC,CAAA;AAED,cAAM,iBAAkB,SAAQ,aAAa;IAEnC,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,eAAe
|
|
1
|
+
{"version":3,"file":"DFWFileController.d.ts","sourceRoot":"","sources":["../../src/controller/DFWFileController.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD,KAAK,eAAe,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CACxC,CAAA;AAED,cAAM,iBAAkB,SAAQ,aAAa;IAEnC,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,eAAe;;;;;;;;;;;;;;;;;IA4BtG,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM;CAG9C;AAED,eAAe,iBAAiB,CAAA"}
|
|
@@ -2,28 +2,25 @@ import { dfw_access, dfw_credential, dfw_user } from "@prisma/client";
|
|
|
2
2
|
import DFWController from "./DFWController";
|
|
3
3
|
declare class DFWSecurityController extends DFWController {
|
|
4
4
|
createCredentiaAsync(name: string, description?: string): Promise<{
|
|
5
|
-
id: number;
|
|
6
5
|
name: string;
|
|
7
6
|
description: string | null;
|
|
8
7
|
createdAt: Date;
|
|
9
8
|
updatedAt: Date;
|
|
10
9
|
}>;
|
|
11
10
|
createAccessAsync(name: string, description?: string): Promise<{
|
|
12
|
-
id: number;
|
|
13
11
|
name: string;
|
|
14
12
|
description: string | null;
|
|
15
13
|
createdAt: Date;
|
|
16
14
|
updatedAt: Date;
|
|
17
15
|
}>;
|
|
18
|
-
attachUserToCredentialAsync(user:
|
|
19
|
-
attachAccessToCredentialAsync(access:
|
|
20
|
-
id: number;
|
|
16
|
+
attachUserToCredentialAsync(user: string | Partial<dfw_user>, credential: dfw_credential | string | (dfw_credential | string)[]): any;
|
|
17
|
+
attachAccessToCredentialAsync(access: string | Partial<dfw_access>, credential: Partial<dfw_credential> | string): Promise<{
|
|
21
18
|
name: string;
|
|
22
19
|
description: string | null;
|
|
23
20
|
createdAt: Date;
|
|
24
21
|
updatedAt: Date;
|
|
25
22
|
} | never[]>;
|
|
26
|
-
userHasCredentialAsync(userSource:
|
|
23
|
+
userHasCredentialAsync(userSource: string | Partial<dfw_user>, credential: string): Promise<boolean>;
|
|
27
24
|
}
|
|
28
25
|
export default DFWSecurityController;
|
|
29
26
|
//# sourceMappingURL=DFWSecurityController.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWSecurityController.d.ts","sourceRoot":"","sources":["../../src/controller/DFWSecurityController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,cAAM,qBAAsB,SAAQ,aAAa;IAChC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"DFWSecurityController.d.ts","sourceRoot":"","sources":["../../src/controller/DFWSecurityController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,cAAM,qBAAsB,SAAQ,aAAa;IAChC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;;IAIvD,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;;IAIpD,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,EAAE;IAgC/H,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM;;;;;;IAoBhH,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM;CAmBjG;AAED,eAAe,qBAAqB,CAAA"}
|
|
@@ -33,20 +33,17 @@ class DFWSecurityController extends DFWController_1.default {
|
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
let idCredential;
|
|
36
|
-
if (typeof credential == "
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
else if (typeof credential == "string") {
|
|
40
|
-
let credentialObj = (yield this.db.dfw_credential.findFirst({ select: { id: true }, where: { name: credential } }));
|
|
36
|
+
if (typeof credential == "string") {
|
|
37
|
+
let credentialObj = (yield this.db.dfw_credential.findFirst({ select: { name: true }, where: { name: credential } }));
|
|
41
38
|
if (credentialObj) {
|
|
42
|
-
idCredential = credentialObj.
|
|
39
|
+
idCredential = credentialObj.name;
|
|
43
40
|
}
|
|
44
41
|
else {
|
|
45
42
|
return [];
|
|
46
43
|
}
|
|
47
44
|
}
|
|
48
45
|
else {
|
|
49
|
-
idCredential = credential.
|
|
46
|
+
idCredential = credential.name;
|
|
50
47
|
}
|
|
51
48
|
const newCredential = yield this.db.dfw_credential.update({
|
|
52
49
|
data: {
|
|
@@ -57,7 +54,7 @@ class DFWSecurityController extends DFWController_1.default {
|
|
|
57
54
|
}
|
|
58
55
|
},
|
|
59
56
|
where: {
|
|
60
|
-
|
|
57
|
+
name: idCredential
|
|
61
58
|
}
|
|
62
59
|
}).catch((e) => []);
|
|
63
60
|
return Array.isArray(newCredential) ? newCredential : [newCredential];
|
|
@@ -66,18 +63,18 @@ class DFWSecurityController extends DFWController_1.default {
|
|
|
66
63
|
}
|
|
67
64
|
attachAccessToCredentialAsync(access, credential) {
|
|
68
65
|
return __awaiter(this, void 0, void 0, function* () {
|
|
69
|
-
const idAccess = typeof access === 'object' ? access.
|
|
70
|
-
const idCredential = typeof credential === 'object' ? credential.
|
|
66
|
+
const idAccess = typeof access === 'object' ? access.name : access;
|
|
67
|
+
const idCredential = typeof credential === 'object' ? credential.name : credential;
|
|
71
68
|
const newCredential = yield this.db.dfw_credential.update({
|
|
72
69
|
data: {
|
|
73
70
|
access: {
|
|
74
71
|
connect: {
|
|
75
|
-
|
|
72
|
+
name: idAccess
|
|
76
73
|
}
|
|
77
74
|
}
|
|
78
75
|
},
|
|
79
76
|
where: {
|
|
80
|
-
|
|
77
|
+
name: idCredential
|
|
81
78
|
}
|
|
82
79
|
}).catch(() => []);
|
|
83
80
|
return newCredential;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWSecurityController.js","sourceRoot":"","sources":["../../src/controller/DFWSecurityController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,oEAA4C;AAE5C,MAAM,qBAAsB,SAAQ,uBAAa;IAChC,oBAAoB,CAAC,IAAY,EAAE,WAAoB;;YAChE,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QAC1E,CAAC;KAAA;IAEY,iBAAiB,CAAC,IAAY,EAAE,WAAoB;;YAC7D,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QACtE,CAAC;KAAA;IAEY,2BAA2B,CAAC,IAAgC,EAAE,
|
|
1
|
+
{"version":3,"file":"DFWSecurityController.js","sourceRoot":"","sources":["../../src/controller/DFWSecurityController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import { dfw_credential, dfw_user } from "@prisma/client";
|
|
2
2
|
import DFWController from "./DFWController";
|
|
3
3
|
declare class DFWUserController extends DFWController {
|
|
4
|
-
validateUserPasswordAsync(identifier: string, password: any): Promise<
|
|
4
|
+
validateUserPasswordAsync(identifier: string, password: any): Promise<string | false | null>;
|
|
5
5
|
createUserAsync({ password, ...params }: {
|
|
6
6
|
[key: string]: any;
|
|
7
|
-
|
|
7
|
+
name?: string;
|
|
8
8
|
email?: string;
|
|
9
9
|
password: string;
|
|
10
10
|
}): Promise<{
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
name: string | null;
|
|
12
|
+
id: string;
|
|
13
13
|
email: string | null;
|
|
14
14
|
displayName: string | null;
|
|
15
15
|
encodedKey: string | null;
|
|
16
16
|
createdAt: Date;
|
|
17
17
|
updatedAt: Date;
|
|
18
18
|
}>;
|
|
19
|
-
assignCredentialAsync(user:
|
|
19
|
+
assignCredentialAsync(user: string | Partial<dfw_user>, credential: dfw_credential | string | (dfw_credential | string)[]): Promise<dfw_credential[]>;
|
|
20
20
|
}
|
|
21
21
|
export default DFWUserController;
|
|
22
22
|
//# sourceMappingURL=DFWUserController.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWUserController.d.ts","sourceRoot":"","sources":["../../src/controller/DFWUserController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAG5C,cAAM,iBAAkB,SAAQ,aAAa;IAE5B,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IAyB3D,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,EAAE,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;;;;;;;;;IAShH,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"DFWUserController.d.ts","sourceRoot":"","sources":["../../src/controller/DFWUserController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAG5C,cAAM,iBAAkB,SAAQ,aAAa;IAE5B,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IAyB3D,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,EAAE,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;;;;;;;;;IAShH,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAIrK;AAED,eAAe,iBAAiB,CAAA"}
|
|
@@ -30,7 +30,7 @@ class DFWUserController extends DFWController_1.default {
|
|
|
30
30
|
validateUserPasswordAsync(identifier, password) {
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
const isEmail = DFWUtils_1.default.isEmail(identifier);
|
|
33
|
-
const
|
|
33
|
+
const name = isEmail ? undefined : identifier;
|
|
34
34
|
const email = isEmail ? identifier : undefined;
|
|
35
35
|
const user = yield this.db.dfw_user.findUnique({
|
|
36
36
|
select: {
|
|
@@ -38,7 +38,7 @@ class DFWUserController extends DFWController_1.default {
|
|
|
38
38
|
encodedKey: true
|
|
39
39
|
},
|
|
40
40
|
where: {
|
|
41
|
-
|
|
41
|
+
name,
|
|
42
42
|
email
|
|
43
43
|
}
|
|
44
44
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWUserController.js","sourceRoot":"","sources":["../../src/controller/DFWUserController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,2DAAmC;AACnC,oEAA4C;AAC5C,oFAA4D;AAE5D,MAAM,iBAAkB,SAAQ,uBAAa;IAE5B,yBAAyB,CAAC,UAAkB,EAAE,QAAa;;YACpE,MAAM,OAAO,GAAG,kBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;YAE9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAC3C,MAAM,EAAE;oBACJ,EAAE,EAAE,IAAI;oBACR,UAAU,EAAE,IAAI;iBACnB;gBACD,KAAK,EAAE;oBACH,IAAI;oBACJ,KAAK;iBACR;aACJ,CAAC,CAAA;YAEF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;gBAAE,OAAO,IAAI,CAAA;YAE1C,MAAM,KAAK,GAAG,MAAM,kBAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YAEtE,IAAI,CAAC,KAAK;gBAAE,OAAO,KAAK,CAAA;YAExB,OAAO,IAAI,CAAC,EAAE,CAAA;QAClB,CAAC;KAAA;IAEY,eAAe,CAAC,EAAgG;;gBAAhG,EAAE,QAAQ,OAAsF,EAAjF,MAAM,cAArB,YAAuB,CAAF;YAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC3B,IAAI,kCACG,MAAM,KACT,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,kBAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,GAC9E;aACJ,CAAC,CAAA;QACN,CAAC;KAAA;IAEY,qBAAqB,CAAC,IAAgC,EAAE,
|
|
1
|
+
{"version":3,"file":"DFWUserController.js","sourceRoot":"","sources":["../../src/controller/DFWUserController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,2DAAmC;AACnC,oEAA4C;AAC5C,oFAA4D;AAE5D,MAAM,iBAAkB,SAAQ,uBAAa;IAE5B,yBAAyB,CAAC,UAAkB,EAAE,QAAa;;YACpE,MAAM,OAAO,GAAG,kBAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;YAE9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAC3C,MAAM,EAAE;oBACJ,EAAE,EAAE,IAAI;oBACR,UAAU,EAAE,IAAI;iBACnB;gBACD,KAAK,EAAE;oBACH,IAAI;oBACJ,KAAK;iBACR;aACJ,CAAC,CAAA;YAEF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;gBAAE,OAAO,IAAI,CAAA;YAE1C,MAAM,KAAK,GAAG,MAAM,kBAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YAEtE,IAAI,CAAC,KAAK;gBAAE,OAAO,KAAK,CAAA;YAExB,OAAO,IAAI,CAAC,EAAE,CAAA;QAClB,CAAC;KAAA;IAEY,eAAe,CAAC,EAAgG;;gBAAhG,EAAE,QAAQ,OAAsF,EAAjF,MAAM,cAArB,YAAuB,CAAF;YAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC3B,IAAI,kCACG,MAAM,KACT,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,kBAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,GAC9E;aACJ,CAAC,CAAA;QACN,CAAC;KAAA;IAEY,qBAAqB,CAAC,IAAgC,EAAE,UAAiE;;YAClI,MAAM,eAAe,GAAG,IAAI,+BAAqB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAChE,OAAO,eAAe,CAAC,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzE,CAAC;KAAA;CACJ;AAED,kBAAe,iBAAiB,CAAA"}
|
package/lib/index.d.ts
CHANGED
|
@@ -12,8 +12,7 @@ export { default as PATCHListener } from './listeners/PATCHListener';
|
|
|
12
12
|
export { default as POSTListener } from './listeners/POSTListener';
|
|
13
13
|
export { default as PUTListener } from './listeners/PUTListener';
|
|
14
14
|
export { default as RawListener } from './listeners/RawListener';
|
|
15
|
-
export { default as
|
|
16
|
-
export { default as StaticDirectoryListener } from './listeners/StaticDirectoryListener';
|
|
15
|
+
export { default as StaticPathListener } from './listeners/StaticPathListener';
|
|
17
16
|
export { default as DFWAuthListener } from './listeners/auth/DFWAuthListener';
|
|
18
17
|
export { default as DFWCore } from './DFWCore';
|
|
19
18
|
export { default as DFWUtils } from "./DFWUtils";
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AACrF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,mCAAmC,CAAA;AACnF,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAE7E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACvH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAEjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEhE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AACrF,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,mCAAmC,CAAA;AACnF,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAC7E,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAE7E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACvH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAEjE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEhE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAE7E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAA"}
|
package/lib/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DFWUtils = exports.DFWCore = exports.DFWAuthListener = exports.
|
|
6
|
+
exports.DFWUtils = exports.DFWCore = exports.DFWAuthListener = exports.StaticPathListener = exports.RawListener = exports.PUTListener = exports.POSTListener = exports.PATCHListener = exports.GETListener = exports.DELETEListener = exports.DFWFileController = exports.DFWUserController = exports.DFWSessionController = exports.DFWSecurityController = exports.DFWController = void 0;
|
|
7
7
|
var DFWController_1 = require("./controller/DFWController");
|
|
8
8
|
Object.defineProperty(exports, "DFWController", { enumerable: true, get: function () { return __importDefault(DFWController_1).default; } });
|
|
9
9
|
var DFWSecurityController_1 = require("./controller/DFWSecurityController");
|
|
@@ -26,10 +26,8 @@ var PUTListener_1 = require("./listeners/PUTListener");
|
|
|
26
26
|
Object.defineProperty(exports, "PUTListener", { enumerable: true, get: function () { return __importDefault(PUTListener_1).default; } });
|
|
27
27
|
var RawListener_1 = require("./listeners/RawListener");
|
|
28
28
|
Object.defineProperty(exports, "RawListener", { enumerable: true, get: function () { return __importDefault(RawListener_1).default; } });
|
|
29
|
-
var
|
|
30
|
-
Object.defineProperty(exports, "
|
|
31
|
-
var StaticDirectoryListener_1 = require("./listeners/StaticDirectoryListener");
|
|
32
|
-
Object.defineProperty(exports, "StaticDirectoryListener", { enumerable: true, get: function () { return __importDefault(StaticDirectoryListener_1).default; } });
|
|
29
|
+
var StaticPathListener_1 = require("./listeners/StaticPathListener");
|
|
30
|
+
Object.defineProperty(exports, "StaticPathListener", { enumerable: true, get: function () { return __importDefault(StaticPathListener_1).default; } });
|
|
33
31
|
var DFWAuthListener_1 = require("./listeners/auth/DFWAuthListener");
|
|
34
32
|
Object.defineProperty(exports, "DFWAuthListener", { enumerable: true, get: function () { return __importDefault(DFWAuthListener_1).default; } });
|
|
35
33
|
var DFWCore_1 = require("./DFWCore");
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAqE;AAA5D,+HAAA,OAAO,OAAiB;AACjC,4EAAqF;AAA5E,+IAAA,OAAO,OAAyB;AACzC,0EAAmF;AAA1E,6IAAA,OAAO,OAAwB;AACxC,oEAA6E;AAApE,uIAAA,OAAO,OAAqB;AACrC,oEAA6E;AAApE,uIAAA,OAAO,OAAqB;AAMrC,6DAAsE;AAA7D,iIAAA,OAAO,OAAkB;AAClC,uDAAgE;AAAvD,2HAAA,OAAO,OAAe;AAC/B,2DAAoE;AAA3D,+HAAA,OAAO,OAAiB;AACjC,yDAAkE;AAAzD,6HAAA,OAAO,OAAgB;AAChC,uDAAgE;AAAvD,2HAAA,OAAO,OAAe;AAE/B,uDAAgE;AAAvD,2HAAA,OAAO,OAAe;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAqE;AAA5D,+HAAA,OAAO,OAAiB;AACjC,4EAAqF;AAA5E,+IAAA,OAAO,OAAyB;AACzC,0EAAmF;AAA1E,6IAAA,OAAO,OAAwB;AACxC,oEAA6E;AAApE,uIAAA,OAAO,OAAqB;AACrC,oEAA6E;AAApE,uIAAA,OAAO,OAAqB;AAMrC,6DAAsE;AAA7D,iIAAA,OAAO,OAAkB;AAClC,uDAAgE;AAAvD,2HAAA,OAAO,OAAe;AAC/B,2DAAoE;AAA3D,+HAAA,OAAO,OAAiB;AACjC,yDAAkE;AAAzD,6HAAA,OAAO,OAAgB;AAChC,uDAAgE;AAAvD,2HAAA,OAAO,OAAe;AAE/B,uDAAgE;AAAvD,2HAAA,OAAO,OAAe;AAC/B,qEAA8E;AAArE,yIAAA,OAAO,OAAsB;AACtC,oEAA6E;AAApE,mIAAA,OAAO,OAAmB;AAEnC,qCAA8C;AAArC,mHAAA,OAAO,OAAW;AAC3B,uCAAgD;AAAvC,qHAAA,OAAO,OAAY"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW9E,MAAM,CAAC,OAAO,OAAO,UAAU;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,OAAO;IAIjB,eAAe;IAwEf,oBAAoB;IAIpB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,iBAAsB,EAAE,QAAQ,CAAC,EAAE,mBAAmB;CAuDlG"}
|
package/lib/lib/APIManager.js
CHANGED
|
@@ -19,6 +19,8 @@ const passport_1 = __importDefault(require("passport"));
|
|
|
19
19
|
const DFWPassportStrategy_1 = __importDefault(require("./strategies/DFWPassportStrategy"));
|
|
20
20
|
const express_session_1 = __importDefault(require("express-session"));
|
|
21
21
|
const DFWSessionStore_1 = __importDefault(require("./DFWSessionStore"));
|
|
22
|
+
const express_fileupload_1 = __importDefault(require("express-fileupload"));
|
|
23
|
+
const uuid_1 = require("uuid");
|
|
22
24
|
class APIManager {
|
|
23
25
|
constructor(DFW) {
|
|
24
26
|
this.DFW = DFW;
|
|
@@ -31,7 +33,7 @@ class APIManager {
|
|
|
31
33
|
APIRouter.use((0, express_session_1.default)({
|
|
32
34
|
name: 'stk',
|
|
33
35
|
secret: 'default',
|
|
34
|
-
genid: () =>
|
|
36
|
+
genid: () => (0, uuid_1.v7)(),
|
|
35
37
|
resave: false,
|
|
36
38
|
saveUninitialized: false,
|
|
37
39
|
store: new DFWSessionStore_1.default(this.DFW),
|
|
@@ -117,7 +119,10 @@ class APIManager {
|
|
|
117
119
|
// DFW middlewares
|
|
118
120
|
server[method](path, this.DFW.RouterAPILevel);
|
|
119
121
|
server[method](path, this.DFW.RouterAccessLevel);
|
|
120
|
-
//
|
|
122
|
+
// file upload middleware
|
|
123
|
+
if (params.upload)
|
|
124
|
+
server[method](path, (0, express_fileupload_1.default)(typeof params.upload === 'boolean' ? {} : params.upload));
|
|
125
|
+
// plugged middlewares and handlers
|
|
121
126
|
if (params.middleware)
|
|
122
127
|
server[method](path, params.middleware);
|
|
123
128
|
if (listener) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8DAAqC;AAKrC,2DAAmC;AACnC,kDAA0B;AAC1B,wDAAgC;AAChC,2FAAmE;AACnE,sEAAqC;AACrC,wEAAgD;
|
|
1
|
+
{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Store } from "express-session";
|
|
|
2
2
|
import DFWCore from "../DFWCore";
|
|
3
3
|
declare class DFWSessionStore extends Store {
|
|
4
4
|
private db;
|
|
5
|
+
private cache;
|
|
5
6
|
constructor(DFW: DFWCore);
|
|
6
7
|
get(sid: string, callback: (err: any, session?: any) => void): void;
|
|
7
8
|
set(sid: string, sessionData: any, callback?: (err?: any) => void): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,OAAO,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,OAAO,MAAM,YAAY,CAAC;AAIjC,cAAM,eAAgB,SAAQ,KAAK;IAE/B,OAAO,CAAC,EAAE,CAAc;IAExB,OAAO,CAAC,KAAK,CAA8B;gBAE/B,GAAG,EAAE,OAAO;IAMxB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAyBnE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAmBxE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CAc7D;AAED,eAAe,eAAe,CAAA"}
|
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const express_session_1 = require("express-session");
|
|
4
|
+
const lru_min_1 = require("lru.min");
|
|
4
5
|
class DFWSessionStore extends express_session_1.Store {
|
|
5
6
|
constructor(DFW) {
|
|
7
|
+
var _a, _b;
|
|
6
8
|
super();
|
|
7
9
|
this.db = DFW.db;
|
|
10
|
+
this.cache = (0, lru_min_1.createLRU)({ max: (_b = (_a = DFW.config.session) === null || _a === void 0 ? void 0 : _a.sessionCacheSize) !== null && _b !== void 0 ? _b : 300 });
|
|
8
11
|
}
|
|
9
12
|
get(sid, callback) {
|
|
13
|
+
if (this.cache.has(sid)) {
|
|
14
|
+
if (process.env.NODE_ENV === 'development')
|
|
15
|
+
console.log(`read session (cache) ${sid}`);
|
|
16
|
+
callback(null, this.cache.get(sid));
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
10
19
|
if (process.env.NODE_ENV === 'development')
|
|
11
20
|
console.log(`read session ${sid}`);
|
|
12
21
|
this.db.dfw_session.findUnique({
|
|
@@ -14,9 +23,12 @@ class DFWSessionStore extends express_session_1.Store {
|
|
|
14
23
|
where: { id: sid }
|
|
15
24
|
}).then((sessionObj) => {
|
|
16
25
|
if (sessionObj) {
|
|
17
|
-
|
|
26
|
+
const passportSession = { cookie: {}, passport: { user: sessionObj.idUser } };
|
|
27
|
+
this.cache.set(sid, passportSession);
|
|
28
|
+
callback(null, passportSession);
|
|
18
29
|
}
|
|
19
30
|
else {
|
|
31
|
+
this.cache.set(sid, null);
|
|
20
32
|
callback(null, null);
|
|
21
33
|
}
|
|
22
34
|
}).catch((e) => {
|
|
@@ -27,6 +39,7 @@ class DFWSessionStore extends express_session_1.Store {
|
|
|
27
39
|
var _a, _b;
|
|
28
40
|
if (process.env.NODE_ENV === 'development')
|
|
29
41
|
console.log(`setting session ${sid} ${JSON.stringify(sessionData)}`);
|
|
42
|
+
this.cache.set(sid, sessionData);
|
|
30
43
|
this.db.dfw_session.upsert({
|
|
31
44
|
create: {
|
|
32
45
|
id: sid,
|
|
@@ -45,6 +58,7 @@ class DFWSessionStore extends express_session_1.Store {
|
|
|
45
58
|
destroy(sid, callback) {
|
|
46
59
|
if (process.env.NODE_ENV === 'development')
|
|
47
60
|
console.log(`deleting session ${sid}`);
|
|
61
|
+
this.cache.delete(sid);
|
|
48
62
|
this.db.dfw_session.deleteMany({
|
|
49
63
|
where: {
|
|
50
64
|
id: sid
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWSessionStore.js","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":";;AAAA,qDAAwC;
|
|
1
|
+
{"version":3,"file":"DFWSessionStore.js","sourceRoot":"","sources":["../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { APIListener } from "../types/APIListener";
|
|
2
|
+
import { RequestHandler } from "express";
|
|
3
|
+
declare const StaticPathListener: (localPath: string, handlers?: RequestHandler[]) => APIListener;
|
|
4
|
+
export default StaticPathListener;
|
|
5
|
+
//# sourceMappingURL=StaticPathListener.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StaticPathListener.d.ts","sourceRoot":"","sources":["../../src/listeners/StaticPathListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAA2B,cAAc,EAAE,MAAM,SAAS,CAAC;AAElE,QAAA,MAAM,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,KAAK,WAO7E,CAAA;AAED,eAAe,kBAAkB,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const express_1 = require("express");
|
|
4
|
-
const
|
|
4
|
+
const StaticPathListener = (localPath, handlers) => {
|
|
5
5
|
return {
|
|
6
6
|
params: {
|
|
7
7
|
middleware: [...handlers !== null && handlers !== void 0 ? handlers : [], (0, express_1.static)(localPath, { maxAge: 2592000 })],
|
|
@@ -9,5 +9,5 @@ const StaticDirectoryListener = (localPath, handlers) => {
|
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
11
|
};
|
|
12
|
-
exports.default =
|
|
13
|
-
//# sourceMappingURL=
|
|
12
|
+
exports.default = StaticPathListener;
|
|
13
|
+
//# sourceMappingURL=StaticPathListener.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StaticPathListener.js","sourceRoot":"","sources":["../../src/listeners/StaticPathListener.ts"],"names":[],"mappings":";;AACA,qCAAkE;AAElE,MAAM,kBAAkB,GAAoE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;IAChH,OAAO;QACH,MAAM,EAAE;YACJ,UAAU,EAAE,CAAC,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAE,IAAA,gBAAa,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9E,MAAM,EAAE,KAAK;SAChB;KACJ,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,kBAAkB,CAAA"}
|
package/lib/test.js
CHANGED
|
@@ -16,9 +16,8 @@ const _1 = require(".");
|
|
|
16
16
|
const DFWSecurityController_1 = __importDefault(require("./controller/DFWSecurityController"));
|
|
17
17
|
const DFWSessionController_1 = __importDefault(require("./controller/DFWSessionController"));
|
|
18
18
|
const DFWUserController_1 = __importDefault(require("./controller/DFWUserController"));
|
|
19
|
-
const UploadListener_1 = __importDefault(require("./listeners/UploadListener"));
|
|
20
19
|
const DFWFileController_1 = __importDefault(require("./controller/DFWFileController"));
|
|
21
|
-
const
|
|
20
|
+
const StaticPathListener_1 = __importDefault(require("./listeners/StaticPathListener"));
|
|
22
21
|
var DFW = new _1.DFWCore({
|
|
23
22
|
server: {
|
|
24
23
|
port: 300,
|
|
@@ -36,7 +35,7 @@ DFW.register({
|
|
|
36
35
|
const SecurityControl = new DFWSecurityController_1.default().use(db);
|
|
37
36
|
const UserControl = new DFWUserController_1.default().use(db);
|
|
38
37
|
const conty = yield UserControl.createUserAsync({
|
|
39
|
-
|
|
38
|
+
name: 'conty',
|
|
40
39
|
password: 'test'
|
|
41
40
|
});
|
|
42
41
|
const adminCred = yield SecurityControl.createCredentiaAsync("ADMIN");
|
|
@@ -65,15 +64,25 @@ DFW.register({
|
|
|
65
64
|
};
|
|
66
65
|
})),
|
|
67
66
|
callback: (0, _1.GETListener)((_a) => __awaiter(void 0, [_a], void 0, function* ({ dfw }) {
|
|
68
|
-
dfw.addCallback(() => {
|
|
69
|
-
_1.DFWUtils.sleepAsync(2000).then(() => {
|
|
70
|
-
console.log("Pasando!!", dfw.isAuthenticated());
|
|
67
|
+
dfw.addCallback(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
68
|
+
yield _1.DFWUtils.sleepAsync(2000).then(() => {
|
|
69
|
+
console.log("Pasando!!1", dfw.isAuthenticated());
|
|
71
70
|
});
|
|
72
|
-
|
|
71
|
+
console.log("pasando!!1despues");
|
|
72
|
+
}));
|
|
73
73
|
return { response: true };
|
|
74
|
-
})
|
|
74
|
+
}), {
|
|
75
|
+
callback: (_a) => __awaiter(void 0, [_a], void 0, function* ({ dfw }) {
|
|
76
|
+
yield _1.DFWUtils.sleepAsync(2000).then(() => {
|
|
77
|
+
console.log("Pasando!!2", dfw.isAuthenticated());
|
|
78
|
+
});
|
|
79
|
+
})
|
|
80
|
+
}),
|
|
75
81
|
login: (0, _1.GETListener)((_a, res_1) => __awaiter(void 0, [_a, res_1], void 0, function* ({ dfw }, res) {
|
|
76
|
-
|
|
82
|
+
const user = yield dfw.db.dfw_user.findFirst();
|
|
83
|
+
if (!user)
|
|
84
|
+
throw "UNABLE_TO_FIND_USER";
|
|
85
|
+
yield dfw.session.login(user);
|
|
77
86
|
console.log(dfw.user);
|
|
78
87
|
return { user: dfw.user, isAuth: dfw.isAuthenticated() };
|
|
79
88
|
})),
|
|
@@ -90,11 +99,11 @@ DFW.register({
|
|
|
90
99
|
signup: (0, _1.POSTListener)((_a) => __awaiter(void 0, [_a], void 0, function* ({ dfw }) {
|
|
91
100
|
const UserControl = new DFWUserController_1.default();
|
|
92
101
|
return UserControl.createUserAsync({
|
|
93
|
-
|
|
102
|
+
name: 'zerozelta',
|
|
94
103
|
password: 'test'
|
|
95
104
|
}).catch(() => { throw "UNABLE_TO_CREATE"; });
|
|
96
105
|
})),
|
|
97
|
-
upload: (0,
|
|
106
|
+
upload: (0, _1.POSTListener)((_a) => __awaiter(void 0, [_a], void 0, function* ({ dfw, files }) {
|
|
98
107
|
const { file } = files;
|
|
99
108
|
const DFWFileControl = new DFWFileController_1.default();
|
|
100
109
|
yield DFWFileControl.saveUploadedFileAsync(file, {
|
|
@@ -102,10 +111,12 @@ DFW.register({
|
|
|
102
111
|
});
|
|
103
112
|
return files;
|
|
104
113
|
}), {
|
|
105
|
-
|
|
106
|
-
|
|
114
|
+
upload: {
|
|
115
|
+
useTempFiles: true,
|
|
116
|
+
tempFileDir: DFW.tmpDir
|
|
117
|
+
}
|
|
107
118
|
}),
|
|
108
|
-
files: (0,
|
|
119
|
+
files: (0, StaticPathListener_1.default)(_1.DFWCore.DFW_UPLOAD_DIR),
|
|
109
120
|
secured: [
|
|
110
121
|
(0, _1.POSTListener)(() => {
|
|
111
122
|
return { access: true };
|
package/lib/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,wBAMW;AACX,+FAAuE;AACvE,6FAAqE;AACrE,uFAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { RequestHandler } from "express";
|
|
2
2
|
import { DFWRequest } from "./DFWRequest";
|
|
3
|
+
import fileUpload from "express-fileupload";
|
|
3
4
|
export type APIMethod = 'get' | 'post' | 'put' | 'delete' | 'options' | 'patch' | 'use';
|
|
4
5
|
export type APIListenerFunction = (req: DFWRequest, res: Response) => (Promise<any> | any);
|
|
5
6
|
export type APIListener = {
|
|
@@ -12,13 +13,17 @@ export type APIListenerParams = {
|
|
|
12
13
|
*/
|
|
13
14
|
method?: APIMethod;
|
|
14
15
|
/**
|
|
15
|
-
* if true the listiner will be simple express function without any dfw middleware
|
|
16
|
+
* if true the listiner will be simple express function without any dfw middleware layer
|
|
16
17
|
*/
|
|
17
18
|
raw?: boolean;
|
|
18
19
|
/**
|
|
19
|
-
*
|
|
20
|
+
* Middleware (compatible with raw listeners)
|
|
20
21
|
*/
|
|
21
22
|
middleware?: RequestHandler | RequestHandler[];
|
|
23
|
+
/**
|
|
24
|
+
* File Upload middleware enabled receive a fileUpload.Options
|
|
25
|
+
*/
|
|
26
|
+
upload?: fileUpload.Options | boolean;
|
|
22
27
|
/**
|
|
23
28
|
*
|
|
24
29
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIListener.d.ts","sourceRoot":"","sources":["../../src/types/APIListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"APIListener.d.ts","sourceRoot":"","sources":["../../src/types/APIListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,CAAA;AACvF,MAAM,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;AAE1F,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,QAAQ,CAAC,EAAE,mBAAmB,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;IAEb;;OAEG;IACH,UAAU,CAAC,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC;IAG/C;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAA;IAErC;;OAEG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAClE,CAAA;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE;QACT,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,CAAA;IACD,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;CAChC"}
|
package/lib/types/DFWConfig.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DFWConfig.d.ts","sourceRoot":"","sources":["../../src/types/DFWConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,MAAM,SAAS,GAAG;IAEpB,MAAM,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,CAAA;QAEb,oCAAoC;QACpC,IAAI,CAAC,EAAE,WAAW,CAAA;QAElB,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;QAG7B,MAAM,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IAED;;OAEG;IACH,OAAO,CAAC,EAAE;QACN;;WAEG;QACH,cAAc,CAAC,EAAE;YACb,GAAG,CAAC,EAAE,KAAK,CAAA;SACd,CAAA;QAED;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAA;QAEzB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAA;QAEf;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAA;QAEnB,aAAa,CAAC,EAAE,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"DFWConfig.d.ts","sourceRoot":"","sources":["../../src/types/DFWConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,MAAM,SAAS,GAAG;IAEpB,MAAM,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,CAAA;QAEb,oCAAoC;QACpC,IAAI,CAAC,EAAE,WAAW,CAAA;QAElB,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;QAG7B,MAAM,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IAED;;OAEG;IACH,OAAO,CAAC,EAAE;QACN;;WAEG;QACH,cAAc,CAAC,EAAE;YACb,GAAG,CAAC,EAAE,KAAK,CAAA;SACd,CAAA;QAED;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAA;QAEzB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAA;QAEf;;;WAGG;QACH,UAAU,CAAC,EAAE,MAAM,CAAA;QAEnB;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAA;QAE7B;;WAEG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAC5B,CAAA;IAED;;OAEG;IACH,QAAQ,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,OAAO,CAAC;KACjB,CAAA;CACJ,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scefira/dfw",
|
|
3
|
-
"version": "1.0
|
|
4
|
-
"description": "NodeJS
|
|
3
|
+
"version": "1.1.0",
|
|
4
|
+
"description": "NodeJS fast prototype APIs",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@types/express": "^4.17.13",
|
|
27
|
-
"@types/express-session": "^1.18.0",
|
|
28
|
-
"@types/passport": "^1.0.16",
|
|
29
27
|
"@types/express-fileupload": "^1.2.2",
|
|
28
|
+
"@types/express-session": "^1.18.0",
|
|
30
29
|
"@types/luxon": "^2.0.9",
|
|
30
|
+
"@types/passport": "^1.0.16",
|
|
31
31
|
"bcrypt": "^5.1.1",
|
|
32
32
|
"body-parser": "^1.20.0",
|
|
33
33
|
"chalk": "^4.1.2",
|
|
@@ -35,10 +35,12 @@
|
|
|
35
35
|
"express": "^4.19.2",
|
|
36
36
|
"express-fileupload": "^1.5.1",
|
|
37
37
|
"express-session": "^1.18.0",
|
|
38
|
+
"lru.min": "^1.1.1",
|
|
38
39
|
"md5-file": "^5.0.0",
|
|
39
40
|
"mime-types": "^2.1.35",
|
|
40
41
|
"passport": "^0.7.0",
|
|
41
|
-
"passport-local": "^1.0.0"
|
|
42
|
+
"passport-local": "^1.0.0",
|
|
43
|
+
"uuid": "^11.0.3"
|
|
42
44
|
},
|
|
43
45
|
"devDependencies": {
|
|
44
46
|
"@types/bcrypt": "^5.0.2",
|
package/prisma/schema/dfw.prisma
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
model dfw_user {
|
|
2
|
-
id
|
|
3
|
-
|
|
2
|
+
id String @id @default(cuid())
|
|
3
|
+
name String? @unique @db.VarChar(255)
|
|
4
4
|
email String? @unique @db.VarChar(255)
|
|
5
5
|
displayName String?
|
|
6
6
|
encodedKey String? @db.VarChar(255)
|
|
@@ -11,17 +11,14 @@ model dfw_user {
|
|
|
11
11
|
credentials dfw_credential[]
|
|
12
12
|
files dfw_file[]
|
|
13
13
|
sessions dfw_session[]
|
|
14
|
-
|
|
15
|
-
@@index([email])
|
|
16
|
-
@@index([nick])
|
|
17
14
|
}
|
|
18
15
|
|
|
19
16
|
model dfw_session {
|
|
20
|
-
id String @id @db.
|
|
17
|
+
id String @id @default(uuid()) @db.Uuid
|
|
21
18
|
agent String? @db.VarChar(255)
|
|
22
19
|
ip String? @db.VarChar(255)
|
|
23
20
|
expire DateTime? @db.Date
|
|
24
|
-
idUser
|
|
21
|
+
idUser String?
|
|
25
22
|
|
|
26
23
|
createdAt DateTime @default(now())
|
|
27
24
|
updatedAt DateTime @updatedAt
|
|
@@ -32,8 +29,7 @@ model dfw_session {
|
|
|
32
29
|
}
|
|
33
30
|
|
|
34
31
|
model dfw_access {
|
|
35
|
-
|
|
36
|
-
name String @unique @db.VarChar(255)
|
|
32
|
+
name String @id @db.VarChar
|
|
37
33
|
description String?
|
|
38
34
|
|
|
39
35
|
createdAt DateTime @default(now())
|
|
@@ -45,8 +41,7 @@ model dfw_access {
|
|
|
45
41
|
}
|
|
46
42
|
|
|
47
43
|
model dfw_credential {
|
|
48
|
-
|
|
49
|
-
name String @unique @db.VarChar(255)
|
|
44
|
+
name String @id @db.VarChar(255)
|
|
50
45
|
description String?
|
|
51
46
|
|
|
52
47
|
createdAt DateTime @default(now())
|
|
@@ -59,18 +54,19 @@ model dfw_credential {
|
|
|
59
54
|
}
|
|
60
55
|
|
|
61
56
|
model dfw_file {
|
|
62
|
-
id
|
|
57
|
+
id String @id @default(cuid())
|
|
63
58
|
name String? @db.VarChar(255)
|
|
64
59
|
path String? @db.VarChar(255) // Path to resource
|
|
65
60
|
url String? @db.VarChar(255) // Public resource url
|
|
66
61
|
variant String? @db.VarChar(255)
|
|
67
|
-
size Int? @db.
|
|
62
|
+
size Int? @db.Integer
|
|
68
63
|
checksum String? @db.VarChar(255)
|
|
69
64
|
mimetype String? @db.VarChar(255)
|
|
70
65
|
storage DFW_FILE_STORAGE @default(LOCAL)
|
|
71
66
|
expire DateTime? @db.Date
|
|
72
|
-
|
|
73
|
-
|
|
67
|
+
metadata Json?
|
|
68
|
+
idParent String?
|
|
69
|
+
idUser String?
|
|
74
70
|
|
|
75
71
|
createdAt DateTime @default(now())
|
|
76
72
|
updatedAt DateTime @updatedAt
|
|
@@ -80,7 +76,6 @@ model dfw_file {
|
|
|
80
76
|
children dfw_file[] @relation("parent")
|
|
81
77
|
|
|
82
78
|
@@index([expire])
|
|
83
|
-
@@index([id])
|
|
84
79
|
@@index([idParent])
|
|
85
80
|
@@index([idUser])
|
|
86
81
|
}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { APIListener } from "../types/APIListener";
|
|
2
|
-
import { RequestHandler } from "express";
|
|
3
|
-
declare const StaticDirectoryListener: (localPath: string, handlers?: RequestHandler[]) => APIListener;
|
|
4
|
-
export default StaticDirectoryListener;
|
|
5
|
-
//# sourceMappingURL=StaticDirectoryListener.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"StaticDirectoryListener.d.ts","sourceRoot":"","sources":["../../src/listeners/StaticDirectoryListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAA2B,cAAc,EAAE,MAAM,SAAS,CAAC;AAElE,QAAA,MAAM,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,KAAK,WAOlF,CAAA;AAED,eAAe,uBAAuB,CAAA"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"StaticDirectoryListener.js","sourceRoot":"","sources":["../../src/listeners/StaticDirectoryListener.ts"],"names":[],"mappings":";;AACA,qCAAkE;AAElE,MAAM,uBAAuB,GAAoE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;IACrH,OAAO;QACH,MAAM,EAAE;YACJ,UAAU,EAAE,CAAC,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAE,IAAA,gBAAa,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9E,MAAM,EAAE,KAAK;SAChB;KACJ,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,uBAAuB,CAAA"}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import fileUpload from "express-fileupload";
|
|
2
|
-
import { APIListener, APIListenerFunction } from "../types/APIListener";
|
|
3
|
-
declare const UploadListener: (fn: APIListenerFunction, options?: fileUpload.Options) => APIListener;
|
|
4
|
-
export default UploadListener;
|
|
5
|
-
//# sourceMappingURL=UploadListener.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"UploadListener.d.ts","sourceRoot":"","sources":["../../src/listeners/UploadListener.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAExE,QAAA,MAAM,cAAc,EAAE,CAAC,EAAE,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,KAAK,WAQhF,CAAA;AAED,eAAe,cAAc,CAAA"}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const express_fileupload_1 = __importDefault(require("express-fileupload"));
|
|
7
|
-
const UploadListener = (fn, options) => {
|
|
8
|
-
return {
|
|
9
|
-
listener: fn,
|
|
10
|
-
params: {
|
|
11
|
-
middleware: [(0, express_fileupload_1.default)(options)],
|
|
12
|
-
method: 'post'
|
|
13
|
-
}
|
|
14
|
-
};
|
|
15
|
-
};
|
|
16
|
-
exports.default = UploadListener;
|
|
17
|
-
//# sourceMappingURL=UploadListener.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"UploadListener.js","sourceRoot":"","sources":["../../src/listeners/UploadListener.ts"],"names":[],"mappings":";;;;;AAAA,4EAA4C;AAG5C,MAAM,cAAc,GAA2E,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE;IAC3G,OAAO;QACH,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE;YACJ,UAAU,EAAE,CAAC,IAAA,4BAAU,EAAC,OAAO,CAAC,CAAC;YACjC,MAAM,EAAE,MAAM;SACjB;KACJ,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,cAAc,CAAA"}
|