mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Less-strict URL parsing in openapi3 importer (Fixes #1782)

Browse Source
This commit is contained in:
Gregory Schier 2019-12-04 11:56:22 -05:00
parent 36059c8480
commit 81ef50cc6b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/insomnia-app/app/ui/redux/modules/global.js
View File

@ -208,7 +208,8 @@ export function importUri(workspaceId, uri) {
let importedWorkspaces = []; let importedWorkspaces = [];
try { try {
const result = await importUtils.importUri(askToImportIntoWorkspace(workspaceId), uri); const result = await importUtils.importUri(askToImportIntoWorkspace(workspaceId), uri);
importedWorkspaces = [...importedWorkspaces, ...result.summary[models.workspace.type]]; const workspaces = result.summary[models.workspace.type] || [];
importedWorkspaces = [...importedWorkspaces, ...workspaces];
} catch (err) { } catch (err) {
showModal(AlertModal, { title: 'Import Failed', message: err + '' }); showModal(AlertModal, { title: 'Import Failed', message: err + '' });
} finally { } finally {

10
packages/insomnia-importers/src/importers/openapi3.js
View File

@ -3,7 +3,7 @@
const crypto = require('crypto'); const crypto = require('crypto');
const SwaggerParser = require('swagger-parser'); const SwaggerParser = require('swagger-parser');
const URL = require('url').URL; const { parse: urlParse } = require('url');
const utils = require('../utils'); const utils = require('../utils');
const SUPPORTED_OPENAPI_VERSION = /^3\.\d+\.\d+$/; // 3.x.x const SUPPORTED_OPENAPI_VERSION = /^3\.\d+\.\d+$/; // 3.x.x
@ -60,20 +60,22 @@ module.exports.convert = async function(rawData) {
}, },
}; };
const servers = api.servers.map(s => new URL(s.url)); const servers = api.servers.map(s => urlParse(s.url));
const defaultServer = servers[0] || new URL('http://example.com/'); const defaultServer = servers[0] || urlParse('http://example.com/');
const securityVariables = getSecurityEnvVariables( const securityVariables = getSecurityEnvVariables(
api.components && api.components.securitySchemes, api.components && api.components.securitySchemes,
); );
const protocol = defaultServer.protocol || '';
const openapiEnv = { const openapiEnv = {
_type: 'environment', _type: 'environment',
_id: `env___BASE_ENVIRONMENT_ID___sub`, _id: `env___BASE_ENVIRONMENT_ID___sub`,
parentId: baseEnv._id, parentId: baseEnv._id,
name: 'OpenAPI env', name: 'OpenAPI env',
data: { data: {
// note: `URL.protocol` returns with trailing `:` (i.e. "https:")
scheme: protocol.replace(/:$/, '') || ['http'],
base_path: defaultServer.pathname || '', base_path: defaultServer.pathname || '',
scheme: defaultServer.protocol.replace(/:$/, '') || ['http'], // note: `URL.protocol` returns with trailing `:` (i.e. "https:")
host: defaultServer.host || '', host: defaultServer.host || '',
...securityVariables, ...securityVariables,
}, },