prostgles-server 4.2.19 → 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.
Files changed (6) hide show
  1. package/dist/FileManager/initFileManager.d.ts.map +1 -1
  2. package/dist/FileManager/initFileManager.js +21 -11
  3. package/dist/FileManager/initFileManager.js.map +1 -1
  4. package/lib/FileManager/initFileManager.ts +21 -10
  5. package/package.json +1 -1
  6. package/tests/server/package-lock.json +1 -1
package/dist/FileManager/initFileManager.d.ts.map CHANGED
@@ -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;AAG/D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,iBAwKtE"}
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"}
package/dist/FileManager/initFileManager.js CHANGED
@@ -86,14 +86,17 @@ async function initFileManager(prg) {
86
86
  }
87
87
  }
88
88
  else {
89
- try {
90
- 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);`;
91
- const msg = `Create referenced file column ${refTable} (${colName})...\n${query}`;
92
- await runQuery(query, msg);
93
- }
94
- catch (e) {
95
- console.error(`FAILED. Err: ${e instanceof Error ? e.message : JSON.stringify(e)}`);
96
- }
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}`);
97
100
  }
98
101
  }
99
102
  await prg.refreshDBO();
@@ -121,8 +124,15 @@ async function initFileManager(prg) {
121
124
  throw "Prostgles instance missing";
122
125
  const id = name.slice(0, 36);
123
126
  const selectParams = { select: { id: 1, name: 1, signed_url: 1, signed_url_expires: 1, content_type: 1 } };
124
- const media = await runClientRequest_1.runClientRequest.bind(this.prostgles)({ type: "http", httpReq: req, command: "findOne", tableName, param1: { id }, param2: selectParams, param3: undefined });
125
- // const media = await mediaTable.findOne({ id }, selectParams, { httpReq: req } as any);
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
+ });
126
136
  if (!media) {
127
137
  /**
128
138
  * Redirect to login !??
@@ -155,7 +165,7 @@ async function initFileManager(prg) {
155
165
  }
156
166
  catch (e) {
157
167
  console.log(e);
158
- res.status(404).json({ err: "Invalid/missing media" });
168
+ res.status(404).json({ err: "Invalid/disallowed file" });
159
169
  }
160
170
  });
161
171
  }
package/dist/FileManager/initFileManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"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"}
package/lib/FileManager/initFileManager.ts CHANGED
@@ -87,13 +87,17 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
87
87
  }
88
88
  }
89
89
  } else {
90
- try {
91
- const query = `ALTER TABLE ${asName(refTable)} ADD COLUMN ${asName(colName)} UUID REFERENCES ${asName(tableName)} (id);`
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
- }
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}`);
97
101
  }
98
102
 
99
103
  }
@@ -131,8 +135,15 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
131
135
  if(!this.prostgles) throw "Prostgles instance missing";
132
136
  const id = name.slice(0, 36);
133
137
  const selectParams = { select: { id: 1, name: 1, signed_url: 1, signed_url_expires: 1, content_type: 1 } }
134
- const media = await runClientRequest.bind(this.prostgles)({ type: "http", httpReq: req, command: "findOne", tableName, param1: { id }, param2: selectParams, param3: undefined });
135
- // const media = await mediaTable.findOne({ id }, selectParams, { httpReq: req } as any);
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
+ });
136
147
 
137
148
  if(!media) {
138
149
  /**
@@ -170,7 +181,7 @@ export async function initFileManager(this: FileManager, prg: Prostgles){
170
181
 
171
182
  } catch(e){
172
183
  console.log(e)
173
- res.status(404).json({ err: "Invalid/missing media" });
184
+ res.status(404).json({ err: "Invalid/disallowed file" });
174
185
  }
175
186
  });
176
187
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.2.19",
3
+ "version": "4.2.20",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/tests/server/package-lock.json CHANGED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "4.2.18",
24
+ "version": "4.2.19",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@types/express": "^4.17.13",