@builder6/files 3.1.0-alpha.1 → 3.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,7 +7,7 @@ export declare class FilesController {
|
|
|
7
7
|
constructor(filesService: FilesService, authService: AuthService);
|
|
8
8
|
uploadFile(collectionName: string, file: Express.Multer.File, object_name: string, record_id: string, parent: string, req: Request): Promise<object>;
|
|
9
9
|
downloadFileDirect(collectionName: string, fileId: string, fileName: string, req: Request, res: Response): Promise<void>;
|
|
10
|
-
downloadFile(collectionName: string, fileId: string, req: Request, res: Response): Promise<void>;
|
|
10
|
+
downloadFile(collectionName: string, fileId: string, redirect: boolean, download: boolean, req: Request, res: Response): Promise<void>;
|
|
11
11
|
presignedUrls(collectionName: string, records: string[]): Promise<{
|
|
12
12
|
urls: string[];
|
|
13
13
|
}>;
|
|
@@ -42,7 +42,7 @@ let FilesController = class FilesController {
|
|
|
42
42
|
if (!file) {
|
|
43
43
|
throw new common_1.HttpException('File not found.', common_1.HttpStatus.NOT_FOUND);
|
|
44
44
|
}
|
|
45
|
-
res.setHeader('Content-Disposition', `filename*=UTF-8''${encodeURIComponent(fileName || file.original.name)}`);
|
|
45
|
+
res.setHeader('Content-Disposition', `attachment; filename*=UTF-8''${encodeURIComponent(fileName || file.original.name)}`);
|
|
46
46
|
res.setHeader('Content-Type', file.original.type || 'application/octet-stream');
|
|
47
47
|
if (file.original.size) {
|
|
48
48
|
res.setHeader('Content-Length', file.original.size.toString());
|
|
@@ -57,7 +57,7 @@ let FilesController = class FilesController {
|
|
|
57
57
|
throw new common_1.HttpException(error.message, common_1.HttpStatus.INTERNAL_SERVER_ERROR);
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
async downloadFile(collectionName, fileId, req, res) {
|
|
60
|
+
async downloadFile(collectionName, fileId, redirect = true, download = false, req, res) {
|
|
61
61
|
if (!this.filesService.canDownloadPublic(collectionName)) {
|
|
62
62
|
const user = await this.authService.getUserByRequest(req);
|
|
63
63
|
if (!user) {
|
|
@@ -65,7 +65,7 @@ let FilesController = class FilesController {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
try {
|
|
68
|
-
if (this.filesService.cfsStore === 'S3') {
|
|
68
|
+
if (redirect && this.filesService.cfsStore === 'S3') {
|
|
69
69
|
const s3SignedUrl = await this.filesService.getPreSignedUrl(collectionName, fileId);
|
|
70
70
|
if (s3SignedUrl) {
|
|
71
71
|
return res.redirect(s3SignedUrl);
|
|
@@ -75,7 +75,12 @@ let FilesController = class FilesController {
|
|
|
75
75
|
if (!file) {
|
|
76
76
|
throw new common_1.HttpException('File not found.', common_1.HttpStatus.NOT_FOUND);
|
|
77
77
|
}
|
|
78
|
-
|
|
78
|
+
if (download) {
|
|
79
|
+
res.setHeader('Content-Disposition', `attachment; filename*=UTF-8''${encodeURIComponent(file.original.name)}`);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
res.setHeader('Content-Disposition', `filename*=UTF-8''${encodeURIComponent(file.original.name)}`);
|
|
83
|
+
}
|
|
79
84
|
res.setHeader('Content-Type', file.original.type || 'application/octet-stream');
|
|
80
85
|
if (file.original.size) {
|
|
81
86
|
res.setHeader('Content-Length', file.original.size.toString());
|
|
@@ -194,10 +199,12 @@ __decorate([
|
|
|
194
199
|
}),
|
|
195
200
|
__param(0, (0, common_1.Param)('collectionName')),
|
|
196
201
|
__param(1, (0, common_1.Param)('fileId')),
|
|
197
|
-
__param(2, (0, common_1.
|
|
198
|
-
__param(3, (0, common_1.
|
|
202
|
+
__param(2, (0, common_1.Query)('redirect', new common_1.ParseBoolPipe({ optional: true }))),
|
|
203
|
+
__param(3, (0, common_1.Query)('download', new common_1.ParseBoolPipe({ optional: true }))),
|
|
204
|
+
__param(4, (0, common_1.Req)()),
|
|
205
|
+
__param(5, (0, common_1.Res)()),
|
|
199
206
|
__metadata("design:type", Function),
|
|
200
|
-
__metadata("design:paramtypes", [String, String, Object, Object]),
|
|
207
|
+
__metadata("design:paramtypes", [String, String, Boolean, Boolean, Object, Object]),
|
|
201
208
|
__metadata("design:returntype", Promise)
|
|
202
209
|
], FilesController.prototype, "downloadFile", null);
|
|
203
210
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.controller.js","sourceRoot":"","sources":["../../src/files/files.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"files.controller.js","sourceRoot":"","sources":["../../src/files/files.controller.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/files",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
],
|
|
9
9
|
"scripts": {
|
|
10
10
|
"format": "prettier --write \"src/**/*.ts\"",
|
|
11
|
-
"build": "rimraf dist && tsc",
|
|
12
|
-
"build:watch": "rimraf dist && tsc --watch"
|
|
11
|
+
"build": "npx rimraf dist && npx tsc",
|
|
12
|
+
"build:watch": "npx rimraf dist && npx tsc --watch"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"nodemailer": "^6.9.16"
|
|
@@ -24,5 +24,5 @@
|
|
|
24
24
|
"publishConfig": {
|
|
25
25
|
"access": "public"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "a499b9ae6130730703056038d97ecd255ac8a923"
|
|
28
28
|
}
|