Skip to content

Commit 81cfca7

Browse files
committed
fix: general hardening
1 parent 16ef569 commit 81cfca7

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

adaptor.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ function convertOperation(op,verb,path,pathItem,obj,api) {
263263
}*/
264264
} // end of effective parameters
265265

266-
operation.operationId = op.operationId || Case.camel(op.tags[0] + (paramList ? '_' + paramList.join('_') + '_' : '') + verb);
266+
operation.operationId = op.operationId || Case.camel((op.tags ? op.tags[0] : '') + (paramList ? '_' + paramList.join('_') + '_' : '') + verb);
267267
operation.operationIdLowerCase = operation.operationId.toLowerCase();
268268
operation.operationIdSnakeCase = Case.snake(operation.operationId);
269269
operation.nickname = operation.operationId;
@@ -327,6 +327,7 @@ function convertOperation(op,verb,path,pathItem,obj,api) {
327327

328328
operation.responses = [];
329329
for (let r in op.responses) {
330+
if (!r.startsWith('x-')) {
330331
let response = op.responses[r];
331332
let entry = {};
332333
entry.code = r;
@@ -412,6 +413,7 @@ function convertOperation(op,verb,path,pathItem,obj,api) {
412413
return 0;
413414
});
414415
}
416+
}
415417
operation.queryParams = convertArray(operation.queryParams);
416418
operation.headerParams = convertArray(operation.headerParams);
417419
operation.pathParams = convertArray(operation.pathParams);

lib/orange/downconvert.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Converter.prototype.convertOperationParameters = function(operation) {
175175
Converter.prototype.convertParameters = function(obj) {
176176
var param;
177177

178-
if (obj.parameters === undefined) {
178+
if (!obj || obj.parameters === undefined) {
179179
return;
180180
}
181181

@@ -232,7 +232,7 @@ Converter.prototype.convertResponses = function(operation) {
232232
content = false;
233233
contentType = 'application/json';
234234
response = operation.responses[code] = this.resolveReference(this.spec, operation.responses[code]);
235-
if (response.content) {
235+
if (response && response.content) {
236236
if (response.content[contentType]) {
237237
content = response.content[contentType];
238238
}
@@ -258,7 +258,7 @@ Converter.prototype.convertResponses = function(operation) {
258258
this.copySchemaProperties(response, SCHEMA_PROPERTIES);
259259
}
260260

261-
headers = response.headers;
261+
headers = response && response.headers;
262262
if (headers) {
263263
for (var header in headers) {
264264
// Always resolve headers when converting to v2.
@@ -273,7 +273,7 @@ Converter.prototype.convertResponses = function(operation) {
273273
}
274274
}
275275

276-
delete response.content;
276+
if (response) delete response.content;
277277
}
278278
}
279279

remote.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,18 @@ async function main(obj, config, configName, callback) {
2828
headers: { 'Content-Type': 'application/json' }
2929
})
3030
.then(res => res.json())
31-
.then(json => json);
32-
if (response.link) {
31+
.then(json => json)
32+
.catch(ex => {
33+
console.warn(ex.message);
34+
});
35+
if (response && response.link) {
3336
const zipfile = await fetch(response.link)
3437
.then(res => res.buffer())
3538
.then(buffer => buffer);
3639
callback(null, zipfile);
3740
}
3841
else {
39-
console.warn(util.inspect(response));
42+
if (response) console.warn(util.inspect(response));
4043
}
4144
}
4245

0 commit comments

Comments
 (0)