prostgles-server 4.2.18 → 4.2.20
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAG/D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,iBAmLtE"}
|
|
@@ -5,6 +5,7 @@ const fs = require("fs");
|
|
|
5
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
6
|
const runSQL_1 = require("../DboBuilder/runSQL");
|
|
7
7
|
const FileManager_1 = require("./FileManager");
|
|
8
|
+
const runClientRequest_1 = require("../runClientRequest");
|
|
8
9
|
async function initFileManager(prg) {
|
|
9
10
|
this.prostgles = prg;
|
|
10
11
|
const { fileTable } = prg.opts;
|
|
@@ -85,14 +86,17 @@ async function initFileManager(prg) {
|
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
88
|
else {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
catch
|
|
94
|
-
|
|
95
|
-
}
|
|
89
|
+
const query = `ALTER TABLE ${(0, prostgles_types_1.asName)(refTable)} ADD COLUMN ${(0, prostgles_types_1.asName)(colName)} UUID REFERENCES ${(0, prostgles_types_1.asName)(tableName)} (id);`;
|
|
90
|
+
// const createColumn = async () => {
|
|
91
|
+
// try {
|
|
92
|
+
// const msg = `Create referenced file column ${refTable} (${colName})...\n${query}`;
|
|
93
|
+
// await runQuery(query, msg);
|
|
94
|
+
// } catch(e){
|
|
95
|
+
// console.error(`FAILED. Err: ${e instanceof Error? e.message : JSON.stringify(e)}`)
|
|
96
|
+
// }
|
|
97
|
+
// }
|
|
98
|
+
// await createColumn();
|
|
99
|
+
console.error(`Referenced file column ${refTable} (${colName}) does not exist. Create it using this query:\n${query}`);
|
|
96
100
|
}
|
|
97
101
|
}
|
|
98
102
|
await prg.refreshDBO();
|
|
@@ -116,7 +120,19 @@ async function initFileManager(prg) {
|
|
|
116
120
|
const { name } = req.params;
|
|
117
121
|
if (typeof name !== "string" || !name)
|
|
118
122
|
throw "Invalid media name";
|
|
119
|
-
|
|
123
|
+
if (!this.prostgles)
|
|
124
|
+
throw "Prostgles instance missing";
|
|
125
|
+
const id = name.slice(0, 36);
|
|
126
|
+
const selectParams = { select: { id: 1, name: 1, signed_url: 1, signed_url_expires: 1, content_type: 1 } };
|
|
127
|
+
const media = await runClientRequest_1.runClientRequest.bind(this.prostgles)({
|
|
128
|
+
type: "http",
|
|
129
|
+
httpReq: req,
|
|
130
|
+
command: "findOne",
|
|
131
|
+
tableName,
|
|
132
|
+
param1: { id },
|
|
133
|
+
param2: selectParams,
|
|
134
|
+
param3: undefined
|
|
135
|
+
});
|
|
120
136
|
if (!media) {
|
|
121
137
|
/**
|
|
122
138
|
* Redirect to login !??
|
|
@@ -149,7 +165,7 @@ async function initFileManager(prg) {
|
|
|
149
165
|
}
|
|
150
166
|
catch (e) {
|
|
151
167
|
console.log(e);
|
|
152
|
-
res.status(404).json({ err: "Invalid/
|
|
168
|
+
res.status(404).json({ err: "Invalid/disallowed file" });
|
|
153
169
|
}
|
|
154
170
|
});
|
|
155
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,qDAAmD;AAEnD,iDAAuD;AAEvD,+CAA+D;
|
|
1
|
+
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
|
|
|
4
4
|
import { canCreateTables } from "../DboBuilder/runSQL";
|
|
5
5
|
import { Prostgles } from "../Prostgles";
|
|
6
6
|
import { FileManager, HOUR, LocalConfig } from "./FileManager";
|
|
7
|
+
import { runClientRequest } from "../runClientRequest";
|
|
7
8
|
|
|
8
9
|
export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
9
10
|
this.prostgles = prg;
|
|
@@ -86,13 +87,17 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
89
|
} else {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}
|
|
90
|
+
const query = `ALTER TABLE ${asName(refTable)} ADD COLUMN ${asName(colName)} UUID REFERENCES ${asName(tableName)} (id);`
|
|
91
|
+
// const createColumn = async () => {
|
|
92
|
+
// try {
|
|
93
|
+
// const msg = `Create referenced file column ${refTable} (${colName})...\n${query}`;
|
|
94
|
+
// await runQuery(query, msg);
|
|
95
|
+
// } catch(e){
|
|
96
|
+
// console.error(`FAILED. Err: ${e instanceof Error? e.message : JSON.stringify(e)}`)
|
|
97
|
+
// }
|
|
98
|
+
// }
|
|
99
|
+
// await createColumn();
|
|
100
|
+
console.error(`Referenced file column ${refTable} (${colName}) does not exist. Create it using this query:\n${query}`);
|
|
96
101
|
}
|
|
97
102
|
|
|
98
103
|
}
|
|
@@ -127,9 +132,19 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
|
127
132
|
|
|
128
133
|
const { name } = req.params;
|
|
129
134
|
if(typeof name !== "string" || !name) throw "Invalid media name";
|
|
130
|
-
|
|
131
|
-
const
|
|
132
|
-
|
|
135
|
+
if(!this.prostgles) throw "Prostgles instance missing";
|
|
136
|
+
const id = name.slice(0, 36);
|
|
137
|
+
const selectParams = { select: { id: 1, name: 1, signed_url: 1, signed_url_expires: 1, content_type: 1 } }
|
|
138
|
+
const media = await runClientRequest.bind(this.prostgles)({
|
|
139
|
+
type: "http",
|
|
140
|
+
httpReq: req,
|
|
141
|
+
command: "findOne",
|
|
142
|
+
tableName,
|
|
143
|
+
param1: { id },
|
|
144
|
+
param2: selectParams,
|
|
145
|
+
param3: undefined
|
|
146
|
+
});
|
|
147
|
+
|
|
133
148
|
if(!media) {
|
|
134
149
|
/**
|
|
135
150
|
* Redirect to login !??
|
|
@@ -166,7 +181,7 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
|
|
|
166
181
|
|
|
167
182
|
} catch(e){
|
|
168
183
|
console.log(e)
|
|
169
|
-
res.status(404).json({ err: "Invalid/
|
|
184
|
+
res.status(404).json({ err: "Invalid/disallowed file" });
|
|
170
185
|
}
|
|
171
186
|
});
|
|
172
187
|
}
|
package/package.json
CHANGED