From be9477238203d5616b943bee823ea65d3741ebca Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 22 Nov 2019 13:13:36 -0500 Subject: [PATCH] Fixed swagger2 importer tests --- .../fixtures/swagger2/dereferenced-output.json | 1 - .../insomnia-importers/src/importers/swagger2.js | 13 ++++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-output.json b/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-output.json index 87ef38f7bc..fa40045d4f 100644 --- a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-output.json +++ b/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-output.json @@ -57,7 +57,6 @@ "value": "application/json" } ], - "authentication": {}, "_type": "request", "_id": "addPet" }, diff --git a/packages/insomnia-importers/src/importers/swagger2.js b/packages/insomnia-importers/src/importers/swagger2.js index a350a3dc56..e4dee8c518 100644 --- a/packages/insomnia-importers/src/importers/swagger2.js +++ b/packages/insomnia-importers/src/importers/swagger2.js @@ -174,7 +174,7 @@ function importRequest(schema, endpointSchema, globalMimeTypes, id, parentId) { headers: prepareHeaders(endpointSchema), parameters: prepareQueryParams(endpointSchema), }; - + if (request.body.mimeType && !request.headers.find(header => header.name === 'Content-Type')) { request.headers = [ { @@ -183,19 +183,14 @@ function importRequest(schema, endpointSchema, globalMimeTypes, id, parentId) { value: request.body.mimeType, }, ].concat(request.headers); - body: prepareBody(endpointSchema, globalMimeTypes), - description: endpointSchema.description, - headers: prepareHeaders(endpointSchema), - parameters: prepareQueryParams(endpointSchema), - }; + } - return setupAuthentication(securityDefinitions, endpointSchema, request); + return setupAuthentication(schema.securityDefinitions, endpointSchema, request); } /** * Populate Insomnia request with authentication * - * * @param {Object} securityDefinitions - swagger 2.0 security definitions * @param {Object} endpointSchema - swagger 2.0 endpoint schema * @param {Object} request - insomnia request object @@ -211,7 +206,7 @@ function setupAuthentication(securityDefinitions, endpointSchema, request) { [], ); const scopes = endpointSchema.security.reduce((scopes, security) => { - for (const defname in security) { + for (const defname of Object.keys(security)) { if (security[defname].length === 0) { continue; }