From 99de4725fa036bf6268ce5921f2f3b7fcb41807f Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Wed, 17 Oct 2018 12:42:33 -0400 Subject: [PATCH] prettier entire project --- .../app/__mocks__/insomnia-libcurl.js | 5 +- .../app/__tests__/package.test.js | 4 +- .../app/common/__tests__/constants.test.js | 4 +- .../app/common/__tests__/database.test.js | 32 +--- .../app/common/__tests__/har.test.js | 9 +- .../app/common/__tests__/import.test.js | 8 +- .../common/__tests__/local-storage.test.js | 8 +- .../app/common/__tests__/misc.test.js | 18 +-- packages/insomnia-app/app/common/constants.js | 16 +- packages/insomnia-app/app/common/database.js | 47 ++---- packages/insomnia-app/app/common/fetch.js | 5 +- packages/insomnia-app/app/common/har.js | 51 ++---- packages/insomnia-app/app/common/hotkeys.js | 10 +- packages/insomnia-app/app/common/import.js | 44 ++--- packages/insomnia-app/app/main.development.js | 10 +- .../insomnia-app/app/main/local-storage.js | 4 +- packages/insomnia-app/app/main/updates.js | 26 +-- .../insomnia-app/app/main/window-utils.js | 14 +- .../app/models/__tests__/request.test.js | 69 ++------ .../app/models/__tests__/response.test.js | 5 +- .../app/models/__tests__/workspace.test.js | 9 +- .../app/models/client-certificate.js | 13 +- .../insomnia-app/app/models/cookie-jar.js | 4 +- .../insomnia-app/app/models/environment.js | 17 +- packages/insomnia-app/app/models/index.js | 9 +- .../insomnia-app/app/models/o-auth-2-token.js | 13 +- .../insomnia-app/app/models/plugin-data.js | 16 +- .../insomnia-app/app/models/request-group.js | 13 +- .../app/models/request-version.js | 4 +- packages/insomnia-app/app/models/request.js | 40 ++--- packages/insomnia-app/app/models/response.js | 42 +---- packages/insomnia-app/app/models/settings.js | 5 +- .../insomnia-app/app/models/workspace-meta.js | 17 +- packages/insomnia-app/app/models/workspace.js | 9 +- .../network/__tests__/authentication.test.js | 103 +++++------- .../__tests__/certificate-url-parse.test.js | 3 +- .../app/network/authentication.js | 35 ++-- .../app/network/basic-auth/get-header.js | 5 +- .../app/network/bearer-auth/get-header.js | 5 +- .../app/network/certificate-url-parse.js | 5 +- .../insomnia-app/app/network/multipart.js | 8 +- .../app/network/o-auth-1/constants.js | 9 +- .../grant-authorization-code.test.js | 4 +- .../o-auth-2/__tests__/grant-implicit.test.js | 13 +- .../o-auth-2/__tests__/grant-password.test.js | 4 +- .../o-auth-2/grant-authorization-code.js | 27 +--- .../app/network/o-auth-2/grant-implicit.js | 11 +- .../insomnia-app/app/network/o-auth-2/misc.js | 11 +- .../app/network/o-auth-2/refresh-token.js | 4 +- .../app/network/url-matches-cert-host.js | 4 +- .../plugins/context/__tests__/data.test.js | 10 +- .../plugins/context/__tests__/request.test.js | 24 +-- .../context/__tests__/response.test.js | 9 +- .../insomnia-app/app/plugins/context/app.js | 13 +- .../insomnia-app/app/plugins/context/data.js | 21 +-- .../app/plugins/context/request.js | 32 +--- .../app/plugins/context/response.js | 4 +- packages/insomnia-app/app/plugins/index.js | 25 +-- packages/insomnia-app/app/plugins/misc.js | 42 +---- .../app/sync/__tests__/crypt.test.js | 6 +- packages/insomnia-app/app/sync/crypt.js | 25 +-- packages/insomnia-app/app/sync/session.js | 28 +--- packages/insomnia-app/app/sync/storage.js | 19 +-- .../app/templating/__tests__/utils.test.js | 23 +-- .../app/templating/base-extension.js | 8 +- .../app/templating/extensions/index.js | 10 +- packages/insomnia-app/app/templating/index.js | 4 +- packages/insomnia-app/app/templating/utils.js | 13 +- .../app/ui/components/base/copy-button.js | 12 +- .../base/dropdown/dropdown-right.js | 4 +- .../ui/components/base/dropdown/dropdown.js | 37 ++--- .../ui/components/base/file-input-button.js | 8 +- .../app/ui/components/base/mailto.js | 5 +- .../app/ui/components/base/modal-footer.js | 8 +- .../app/ui/components/base/modal-header.js | 11 +- .../app/ui/components/base/modal.js | 10 +- .../app/ui/components/base/prompt-button.js | 12 +- .../ui/components/check-for-updates-button.js | 20 +-- .../ui/components/codemirror/code-editor.js | 4 +- .../codemirror/extensions/nunjucks-tags.js | 33 +--- .../components/codemirror/modes/nunjucks.js | 5 +- .../components/codemirror/one-line-editor.js | 18 +-- .../app/ui/components/cookie-list.js | 27 +--- .../ui/components/dropdowns/auth-dropdown.js | 22 +-- .../dropdowns/content-type-dropdown.js | 17 +- .../dropdowns/environments-dropdown.js | 4 +- .../components/dropdowns/method-dropdown.js | 22 +-- .../dropdowns/preview-mode-dropdown.js | 13 +- .../dropdowns/request-actions-dropdown.js | 5 +- .../request-group-actions-dropdown.js | 5 +- .../dropdowns/response-history-dropdown.js | 40 +---- .../dropdowns/workspace-dropdown.js | 16 +- .../ui/components/editors/auth/asap-auth.js | 59 ++----- .../components/editors/auth/auth-wrapper.js | 5 +- .../ui/components/editors/auth/aws-auth.js | 19 +-- .../ui/components/editors/auth/basic-auth.js | 22 +-- .../ui/components/editors/auth/bearer-auth.js | 25 +-- .../ui/components/editors/auth/digest-auth.js | 22 +-- .../ui/components/editors/auth/hawk-auth.js | 49 ++---- .../ui/components/editors/auth/ntlm-auth.js | 22 +-- .../components/editors/auth/o-auth-1-auth.js | 58 ++----- .../ui/components/editors/body/body-editor.js | 20 +-- .../editors/body/graph-ql-editor.js | 101 +++--------- .../components/editors/environment-editor.js | 3 +- .../app/ui/components/error-boundary.js | 18 +-- .../app/ui/components/help-tooltip.js | 10 +- .../insomnia-app/app/ui/components/hotkey.js | 9 +- .../ui/components/key-value-editor/editor.js | 17 +- .../app/ui/components/key-value-editor/row.js | 36 ++--- .../app/ui/components/keydown-binder.js | 6 +- .../app/ui/components/markdown-editor.js | 14 +- .../app/ui/components/markdown-preview.js | 10 +- .../app/ui/components/modals/alert-modal.js | 10 +- .../app/ui/components/modals/ask-modal.js | 5 +- .../ui/components/modals/code-prompt-modal.js | 17 +- .../components/modals/cookie-modify-modal.js | 20 +-- .../app/ui/components/modals/cookies-modal.js | 5 +- .../ui/components/modals/filter-help-modal.js | 8 +- .../components/modals/generate-code-modal.js | 42 ++--- .../app/ui/components/modals/login-modal.js | 15 +- .../modals/move-request-group-modal.js | 12 +- .../ui/components/modals/nunjucks-modal.js | 12 +- .../modals/payment-notification-modal.js | 9 +- .../app/ui/components/modals/prompt-modal.js | 4 +- .../components/modals/request-create-modal.js | 8 +- .../modals/request-render-error-modal.js | 8 +- .../modals/request-settings-modal.js | 45 ++---- .../modals/request-switcher-modal.js | 91 +++-------- .../app/ui/components/modals/select-modal.js | 5 +- .../ui/components/modals/settings-modal.js | 5 +- .../workspace-environments-edit-modal.js | 99 +++--------- .../modals/workspace-settings-modal.js | 39 +---- .../modals/workspace-share-settings-modal.js | 30 +--- .../ui/components/rendered-query-string.js | 10 +- .../app/ui/components/rendered-text.js | 4 +- .../app/ui/components/request-pane.js | 77 ++------- .../app/ui/components/request-url-bar.js | 6 +- .../app/ui/components/response-pane.js | 37 +---- .../app/ui/components/settings/about.js | 9 +- .../app/ui/components/settings/account.js | 17 +- .../app/ui/components/settings/general.js | 28 +--- .../ui/components/settings/import-export.js | 17 +- .../app/ui/components/settings/plugins.js | 29 +--- .../app/ui/components/settings/theme.js | 100 ++---------- .../ui/components/sidebar/sidebar-filter.js | 11 +- .../sidebar/sidebar-request-group-row.js | 21 +-- .../components/sidebar/sidebar-request-row.js | 19 +-- .../app/ui/components/sidebar/sidebar.js | 11 +- .../app/ui/components/tags/method-tag.js | 5 +- .../app/ui/components/tags/size-tag.js | 8 +- .../app/ui/components/tags/status-tag.js | 3 +- .../ui/components/templating/tag-editor.js | 127 ++++----------- .../components/templating/variable-editor.js | 19 +-- .../app/ui/components/time-from-now.js | 6 +- .../insomnia-app/app/ui/components/toast.js | 19 +-- .../insomnia-app/app/ui/components/tooltip.js | 17 +- .../viewers/response-cookies-viewer.js | 20 +-- .../components/viewers/response-csv-viewer.js | 4 +- .../ui/components/viewers/response-error.js | 21 +-- .../components/viewers/response-multipart.js | 33 +--- .../components/viewers/response-pdf-viewer.js | 4 +- .../ui/components/viewers/response-viewer.js | 41 ++--- .../insomnia-app/app/ui/components/wrapper.js | 91 +++-------- .../insomnia-app/app/ui/containers/app.js | 120 ++++---------- .../app/ui/redux/modules/global.js | 42 +---- .../app/ui/redux/modules/index.js | 5 +- .../insomnia-app/app/ui/redux/selectors.js | 93 ++++------- packages/insomnia-app/flow-typed/aws4.js | 5 +- packages/insomnia-app/flow-typed/fs-extra.js | 6 +- packages/insomnia-app/flow-typed/graphql.js | 5 +- packages/insomnia-app/scripts/build.js | 4 +- .../webpack/webpack.config.base.babel.js | 13 +- .../webpack/webpack.config.electron.babel.js | 4 +- .../insomnia-cookies/__tests__/index.test.js | 4 +- .../src/targets/c/libcurl.js | 23 +-- .../src/targets/csharp/restsharp.js | 5 +- .../src/targets/go/native.js | 26 +-- .../src/targets/java/okhttp.js | 5 +- .../src/targets/javascript/jquery.js | 7 +- .../src/targets/javascript/xhr.js | 10 +- .../src/targets/node/native.js | 10 +- .../src/targets/node/request.js | 13 +- .../src/targets/node/unirest.js | 34 +--- .../src/targets/objc/helpers.js | 14 +- .../src/targets/objc/nsurlsession.js | 42 +---- .../src/targets/ocaml/cohttp.js | 12 +- .../src/targets/php/curl.js | 9 +- .../src/targets/php/helpers.js | 22 +-- .../src/targets/php/http1.js | 40 +---- .../src/targets/php/http2.js | 16 +- .../src/targets/python/python3.js | 8 +- .../src/targets/ruby/native.js | 9 +- .../src/targets/shell/curl.js | 27 +--- .../src/targets/shell/httpie.js | 5 +- .../src/targets/shell/wget.js | 13 +- .../src/targets/swift/helpers.js | 23 +-- .../src/targets/swift/nsurlsession.js | 42 +---- packages/insomnia-httpsnippet/test/index.js | 20 +-- packages/insomnia-httpsnippet/test/reducer.js | 5 +- .../insomnia-httpsnippet/test/requests.js | 26 +-- packages/insomnia-httpsnippet/test/targets.js | 23 +-- .../test/targets/go/native.js | 40 ++--- .../test/targets/javascript/xhr.js | 10 +- .../test/targets/shell/curl.js | 40 ++--- .../test/targets/shell/httpie.js | 150 ++++++++---------- .../test/targets/shell/wget.js | 54 +++---- .../src/__tests__/fixtures.test.js | 4 +- .../insomnia-importers/src/importers/curl.js | 54 +++---- .../src/importers/insomnia-1.js | 4 +- .../src/importers/insomnia-2.js | 8 +- .../src/importers/postman.js | 14 +- packages/insomnia-libcurl/src/curl.js | 8 +- .../src/__tests__/json.test.js | 8 +- .../src/__tests__/querystring.test.js | 43 ++--- packages/insomnia-url/src/querystring.js | 19 +-- .../insomnia-xpath/__tests__/index.test.js | 9 +- .../__tests__/index.test.js | 15 +- plugins/insomnia-plugin-base64/index.js | 4 +- .../__tests__/index.js | 17 +- plugins/insomnia-plugin-cookie-jar/index.js | 8 +- .../src/default-headers.js | 4 +- .../__tests__/index.test.js | 40 +---- plugins/insomnia-plugin-hash/index.js | 10 +- plugins/insomnia-plugin-os/index.js | 3 +- .../__tests__/index.test.js | 4 +- plugins/insomnia-plugin-request/index.js | 26 +-- .../__tests__/index.test.js | 29 +--- plugins/insomnia-plugin-response/index.js | 18 +-- 228 files changed, 1161 insertions(+), 3625 deletions(-) diff --git a/packages/insomnia-app/app/__mocks__/insomnia-libcurl.js b/packages/insomnia-app/app/__mocks__/insomnia-libcurl.js index adce28aa95..fe5f436c87 100644 --- a/packages/insomnia-app/app/__mocks__/insomnia-libcurl.js +++ b/packages/insomnia-app/app/__mocks__/insomnia-libcurl.js @@ -63,10 +63,7 @@ class Curl extends EventEmitter { getInfo(name) { switch (name) { case Curl.info.COOKIELIST: - return [ - `#HttpOnly_.insomnia.rest\tTRUE\t/url/path\tTRUE\t${Date.now() / - 1000}\tfoo\tbar` - ]; + return [`#HttpOnly_.insomnia.rest\tTRUE\t/url/path\tTRUE\t${Date.now() / 1000}\tfoo\tbar`]; case Curl.info.EFFECTIVE_URL: return this._options[Curl.option.URL]; case Curl.info.TOTAL_TIME: diff --git a/packages/insomnia-app/app/__tests__/package.test.js b/packages/insomnia-app/app/__tests__/package.test.js index 6e102d4eef..9bd4cc9a78 100644 --- a/packages/insomnia-app/app/__tests__/package.test.js +++ b/packages/insomnia-app/app/__tests__/package.test.js @@ -24,9 +24,7 @@ describe('package.json', () => { it('packages must be included in webpack build or else errors happen', () => { // If this is built by Webpack it fails on multipart/form-data - expect(globalPackage.packedDependencies.includes('httpsnippet')).toBe( - false - ); + expect(globalPackage.packedDependencies.includes('httpsnippet')).toBe(false); }); it('packages must NOT be included in webpack build or else errors happen', () => { diff --git a/packages/insomnia-app/app/common/__tests__/constants.test.js b/packages/insomnia-app/app/common/__tests__/constants.test.js index cc5906ddb7..87929f1c3d 100644 --- a/packages/insomnia-app/app/common/__tests__/constants.test.js +++ b/packages/insomnia-app/app/common/__tests__/constants.test.js @@ -10,9 +10,7 @@ describe('URL Regex', () => { expect('https://google').toMatch(FLEXIBLE_URL_REGEX); expect('https://dash-domain.com').toMatch(FLEXIBLE_URL_REGEX); expect('http://localhost:8000').toMatch(FLEXIBLE_URL_REGEX); - expect('http://localhost:8000/foo/b@@r?hi=there#hello').toMatch( - FLEXIBLE_URL_REGEX - ); + expect('http://localhost:8000/foo/b@@r?hi=there#hello').toMatch(FLEXIBLE_URL_REGEX); }); it('does not match "stop" characters', () => { diff --git a/packages/insomnia-app/app/common/__tests__/database.test.js b/packages/insomnia-app/app/common/__tests__/database.test.js index 8117d585ad..e572f8e672 100644 --- a/packages/insomnia-app/app/common/__tests__/database.test.js +++ b/packages/insomnia-app/app/common/__tests__/database.test.js @@ -140,15 +140,9 @@ describe('requestGroupDuplicate()', () => { const allRequests = await models.request.all(); const allRequestGroups = await models.requestGroup.all(); const childRequests = await models.request.findByParentId(requestGroup._id); - const childRequestGroups = await models.requestGroup.findByParentId( - requestGroup._id - ); - const newChildRequests = await models.request.findByParentId( - newRequestGroup._id - ); - const newChildRequestGroups = await models.requestGroup.findByParentId( - newRequestGroup._id - ); + const childRequestGroups = await models.requestGroup.findByParentId(requestGroup._id); + const newChildRequests = await models.request.findByParentId(newRequestGroup._id); + const newChildRequestGroups = await models.requestGroup.findByParentId(newRequestGroup._id); // This asserting is pretty garbage but it at least checks // to see that the recursion worked (for the most part) expect(allRequests.length).toBe(8); @@ -253,19 +247,13 @@ describe('_fixThings()', () => { await models.cookieJar.create({ _id: 'j1', parentId: 'w1', - cookies: [ - { id: '1', key: 'foo', value: '1' }, - { id: 'j1_1', key: 'j1', value: '1' } - ] + cookies: [{ id: '1', key: 'foo', value: '1' }, { id: 'j1_1', key: 'j1', value: '1' }] }); await models.cookieJar.create({ _id: 'j2', parentId: 'w1', - cookies: [ - { id: '1', key: 'foo', value: '2' }, - { id: 'j2_1', key: 'j2', value: '2' } - ] + cookies: [{ id: '1', key: 'foo', value: '2' }, { id: 'j2_1', key: 'j2', value: '2' }] }); // Make sure we have everything @@ -280,18 +268,12 @@ describe('_fixThings()', () => { { _id: 'j1', parentId: 'w1', - cookies: [ - { id: '1', key: 'foo', value: '1' }, - { id: 'j1_1', key: 'j1', value: '1' } - ] + cookies: [{ id: '1', key: 'foo', value: '1' }, { id: 'j1_1', key: 'j1', value: '1' }] }, { _id: 'j2', parentId: 'w1', - cookies: [ - { id: '1', key: 'foo', value: '2' }, - { id: 'j2_1', key: 'j2', value: '2' } - ] + cookies: [{ id: '1', key: 'foo', value: '2' }, { id: 'j2_1', key: 'j2', value: '2' }] } ]); diff --git a/packages/insomnia-app/app/common/__tests__/har.test.js b/packages/insomnia-app/app/common/__tests__/har.test.js index 244f45ce91..7c45aecef3 100644 --- a/packages/insomnia-app/app/common/__tests__/har.test.js +++ b/packages/insomnia-app/app/common/__tests__/har.test.js @@ -197,10 +197,7 @@ describe('exportHar()', () => { entries: [ { request: { - headers: [ - { name: 'X-Environment', value: '' }, - { name: 'X-Request', value: '1' } - ] + headers: [{ name: 'X-Environment', value: '' }, { name: 'X-Request', value: '1' }] }, response: { status: 204 @@ -321,9 +318,7 @@ describe('exportHarWithRequest()', () => { } ]; - const cookieJar = await models.cookieJar.getOrCreateForParentId( - workspace._id - ); + const cookieJar = await models.cookieJar.getOrCreateForParentId(workspace._id); await models.cookieJar.update(cookieJar, { parentId: workspace._id, cookies diff --git a/packages/insomnia-app/app/common/__tests__/import.test.js b/packages/insomnia-app/app/common/__tests__/import.test.js index d36107e908..89b354ee88 100644 --- a/packages/insomnia-app/app/common/__tests__/import.test.js +++ b/packages/insomnia-app/app/common/__tests__/import.test.js @@ -181,12 +181,8 @@ describe('exportJSON()', () => { expect(data._type).toBe('export'); expect(data.__export_format).toBe(3); - expect(data.__export_date).toMatch( - /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/ - ); - expect(data.__export_source).toBe( - `insomnia.desktop.app:v${getAppVersion()}` - ); + expect(data.__export_date).toMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/); + expect(data.__export_source).toBe(`insomnia.desktop.app:v${getAppVersion()}`); expect(data.resources[0]._id).toBe(w._id); expect(data.resources[1]._id).toBe(eBase._id); expect(data.resources[2]._id).toBe(jar._id); diff --git a/packages/insomnia-app/app/common/__tests__/local-storage.test.js b/packages/insomnia-app/app/common/__tests__/local-storage.test.js index ee96368fa5..ac680b5d6e 100644 --- a/packages/insomnia-app/app/common/__tests__/local-storage.test.js +++ b/packages/insomnia-app/app/common/__tests__/local-storage.test.js @@ -108,11 +108,7 @@ describe('LocalStorage()', () => { // Make sure only one item exists expect(fs.readdirSync(basePath).length).toEqual(2); - expect(fs.readFileSync(path.join(basePath, 'foo'), 'utf8')).toEqual( - '"bar3"' - ); - expect(fs.readFileSync(path.join(basePath, 'another'), 'utf8')).toEqual( - '10' - ); + expect(fs.readFileSync(path.join(basePath, 'foo'), 'utf8')).toEqual('"bar3"'); + expect(fs.readFileSync(path.join(basePath, 'another'), 'utf8')).toEqual('10'); }); }); diff --git a/packages/insomnia-app/app/common/__tests__/misc.test.js b/packages/insomnia-app/app/common/__tests__/misc.test.js index 65e766c52e..affeef71fe 100644 --- a/packages/insomnia-app/app/common/__tests__/misc.test.js +++ b/packages/insomnia-app/app/common/__tests__/misc.test.js @@ -43,12 +43,10 @@ describe('filterHeaders()', () => { expect(misc.filterHeaders(['bad'], null)).toEqual([]); expect(misc.filterHeaders(['bad'], 'good')).toEqual([]); expect(misc.filterHeaders(null, 'good')).toEqual([]); - expect( - misc.filterHeaders([{ name: 'good', value: 'valid' }], null) - ).toEqual([]); - expect( - misc.filterHeaders([{ name: 'good', value: 'valid' }], 'good') - ).toEqual([{ name: 'good', value: 'valid' }]); + expect(misc.filterHeaders([{ name: 'good', value: 'valid' }], null)).toEqual([]); + expect(misc.filterHeaders([{ name: 'good', value: 'valid' }], 'good')).toEqual([ + { name: 'good', value: 'valid' } + ]); }); }); @@ -145,9 +143,7 @@ describe('fuzzyMatchAll()', () => { indexes: [0, 1, 2, 3], target: 'testing foo' }); - expect( - misc.fuzzyMatchAll('test foo', ['testing', 'foo'], { splitSpace: true }) - ).toEqual({ + expect(misc.fuzzyMatchAll('test foo', ['testing', 'foo'], { splitSpace: true })).toEqual({ score: 0, indexes: [0, 1, 2, 3, 0, 1, 2], target: 'testing foo' @@ -172,8 +168,6 @@ describe('fuzzyMatchAll()', () => { it('can get a negative fuzzy match on multiple fields', () => { expect(misc.fuzzyMatchAll('foo', [undefined])).toEqual(null); expect(misc.fuzzyMatchAll('foo', ['bar'])).toEqual(null); - expect( - misc.fuzzyMatchAll('wrong this ou', ['testing', 'this', 'out']) - ).toEqual(null); + expect(misc.fuzzyMatchAll('wrong this ou', ['testing', 'this', 'out'])).toEqual(null); }); }); diff --git a/packages/insomnia-app/app/common/constants.js b/packages/insomnia-app/app/common/constants.js index 1c1f930b8f..b379264c16 100644 --- a/packages/insomnia-app/app/common/constants.js +++ b/packages/insomnia-app/app/common/constants.js @@ -182,9 +182,7 @@ const authTypesMap = { export function getPreviewModeName(previewMode, useLong = false) { if (previewModeMap.hasOwnProperty(previewMode)) { - return useLong - ? previewModeMap[previewMode][1] - : previewModeMap[previewMode][0]; + return useLong ? previewModeMap[previewMode][1] : previewModeMap[previewMode][0]; } else { return ''; } @@ -196,14 +194,10 @@ export function getContentTypeName(contentType, useLong = false) { } if (contentTypesMap.hasOwnProperty(contentType)) { - return useLong - ? contentTypesMap[contentType][1] - : contentTypesMap[contentType][0]; + return useLong ? contentTypesMap[contentType][1] : contentTypesMap[contentType][0]; } - return useLong - ? contentTypesMap[CONTENT_TYPE_OTHER][1] - : contentTypesMap[CONTENT_TYPE_OTHER][0]; + return useLong ? contentTypesMap[CONTENT_TYPE_OTHER][1] : contentTypesMap[CONTENT_TYPE_OTHER][0]; } export function getAuthTypeName(authType, useLong = false) { @@ -219,9 +213,7 @@ export function getContentTypeFromHeaders(headers, defaultValue = null) { return null; } - const header = headers.find( - ({ name }) => name.toLowerCase() === 'content-type' - ); + const header = headers.find(({ name }) => name.toLowerCase() === 'content-type'); return header ? header.value : defaultValue; } diff --git a/packages/insomnia-app/app/common/database.js b/packages/insomnia-app/app/common/database.js index 92105bb793..9f72b44fe7 100644 --- a/packages/insomnia-app/app/common/database.js +++ b/packages/insomnia-app/app/common/database.js @@ -40,11 +40,7 @@ export async function initClient() { console.log('[db] Initialized DB client'); } -export async function init( - types: Array, - config: Object = {}, - forceReset: boolean = false -) { +export async function init(types: Array, config: Object = {}, forceReset: boolean = false) { if (forceReset) { changeListeners = []; for (const attr of Object.keys(db)) { @@ -111,9 +107,7 @@ export async function init( try { await m.hookRemove(doc); } catch (err) { - console.log( - `[db] Delete hook failed for ${type} ${doc._id}: ${err.message}` - ); + console.log(`[db] Delete hook failed for ${type} ${doc._id}: ${err.message}`); } } @@ -121,9 +115,7 @@ export async function init( try { await m.hookInsert(doc); } catch (err) { - console.log( - `[db] Insert hook failed for ${type} ${doc._id}: ${err.message}` - ); + console.log(`[db] Insert hook failed for ${type} ${doc._id}: ${err.message}`); } } @@ -131,9 +123,7 @@ export async function init( try { await m.hookUpdate(doc); } catch (err) { - console.log( - `[db] Update hook failed for ${type} ${doc._id}: ${err.message}` - ); + console.log(`[db] Update hook failed for ${type} ${doc._id}: ${err.message}`); } } } @@ -195,11 +185,7 @@ export const flushChanges = (database.flushChanges = async function() { } }); -async function notifyOfChange( - event: string, - doc: BaseModel, - fromSync: boolean -): Promise { +async function notifyOfChange(event: string, doc: BaseModel, fromSync: boolean): Promise { changeBuffer.push([event, doc, fromSync]); // Flush right away if we're not buffering @@ -277,9 +263,7 @@ export const find = (database.find = async function( }); }); -export const all = (database.all = async function( - type: string -): Promise> { +export const all = (database.all = async function(type: string): Promise> { if (db._empty) return _send('all', ...arguments); return database.find(type); @@ -445,10 +429,7 @@ export async function docUpdate( return database.update(doc); } -export async function docCreate( - type: string, - ...patches: Array -): Promise { +export async function docCreate(type: string, ...patches: Array): Promise { const doc = await models.initModel( type, ...patches, @@ -472,9 +453,7 @@ export const withDescendants = (database.withDescendants = async function( let docsToReturn = doc ? [doc] : []; - async function next( - docs: Array - ): Promise> { + async function next(docs: Array): Promise> { let foundDocs = []; for (const d of docs) { @@ -641,11 +620,7 @@ async function _repairBaseEnvironments(workspace) { // Update remaining base env await update(chosenBase); - console.log( - `[fix] Merged ${baseEnvironments.length} base environments under ${ - workspace.name - }` - ); + console.log(`[fix] Merged ${baseEnvironments.length} base environments under ${workspace.name}`); } /** @@ -684,7 +659,5 @@ async function _fixMultipleCookieJars(workspace) { // Update remaining jar await update(chosenJar); - console.log( - `[fix] Merged ${cookieJars.length} cookie jars under ${workspace.name}` - ); + console.log(`[fix] Merged ${cookieJars.length} cookie jars under ${workspace.name}`); } diff --git a/packages/insomnia-app/app/common/fetch.js b/packages/insomnia-app/app/common/fetch.js index 7ea0058f42..7737130113 100644 --- a/packages/insomnia-app/app/common/fetch.js +++ b/packages/insomnia-app/app/common/fetch.js @@ -65,10 +65,7 @@ async function _fetch(method, path, obj, sessionId = null) { throw err; } - if ( - response.headers.get('content-type') === 'application/json' || - path.match(/\.json$/) - ) { + if (response.headers.get('content-type') === 'application/json' || path.match(/\.json$/)) { return response.json(); } else { return response.text(); diff --git a/packages/insomnia-app/app/common/har.js b/packages/insomnia-app/app/common/har.js index 8892b6e09e..1fe23209e8 100644 --- a/packages/insomnia-app/app/common/har.js +++ b/packages/insomnia-app/app/common/har.js @@ -174,24 +174,17 @@ export type ExportRequest = { environmentId: string }; -export async function exportHar( - exportRequests: Array -): Promise { +export async function exportHar(exportRequests: Array): Promise { // Export HAR entries with the same start time in order to keep their workspace sort order. const startedDateTime = new Date().toISOString(); const entries: Array = []; for (let exportRequest of exportRequests) { - const request: Request | null = await models.request.getById( - exportRequest.requestId - ); + const request: Request | null = await models.request.getById(exportRequest.requestId); if (!request) { continue; } - const harRequest = await exportHarWithRequest( - request, - exportRequest.environmentId - ); + const harRequest = await exportHarWithRequest(request, exportRequest.environmentId); if (!harRequest) { continue; } @@ -237,9 +230,7 @@ export async function exportHar( }; } -export async function exportHarResponse( - response: ResponseModel | null -): Promise { +export async function exportHarResponse(response: ResponseModel | null): Promise { if (!response) { return { status: 0, @@ -289,10 +280,7 @@ export async function exportHarWithRequest( addContentLength: boolean = false ): Promise { try { - const renderResult = await getRenderedRequestAndContext( - request, - environmentId - ); + const renderResult = await getRenderedRequestAndContext(request, environmentId); const renderedRequest = await _applyRequestPluginHooks( renderResult.request, renderResult.context @@ -300,13 +288,9 @@ export async function exportHarWithRequest( return exportHarWithRenderedRequest(renderedRequest, addContentLength); } catch (err) { if (err instanceof RenderError) { - throw new Error( - `Failed to render "${request.name}:${err.path}"\n ${err.message}` - ); + throw new Error(`Failed to render "${request.name}:${err.path}"\n ${err.message}`); } else { - throw new Error( - `Failed to export request "${request.name}"\n ${err.message}` - ); + throw new Error(`Failed to export request "${request.name}"\n ${err.message}`); } } } @@ -340,10 +324,7 @@ export async function exportHarWithRenderedRequest( renderedRequest: RenderedRequest, addContentLength: boolean = false ): Promise { - const url = smartEncodeUrl( - renderedRequest.url, - renderedRequest.settingEncodeUrl - ); + const url = smartEncodeUrl(renderedRequest.url, renderedRequest.settingEncodeUrl); if (addContentLength) { const hasContentLengthHeader = @@ -351,9 +332,7 @@ export async function exportHarWithRenderedRequest( if (!hasContentLengthHeader) { const name = 'Content-Length'; - const value = Buffer.byteLength( - (renderedRequest.body || {}).text || '' - ).toString(); + const value = Buffer.byteLength((renderedRequest.body || {}).text || '').toString(); renderedRequest.headers.push({ name, value }); } } @@ -484,9 +463,7 @@ function getRequestHeaders(renderedRequest: RenderedRequest): Array { }); } -function getRequestQueryString( - renderedRequest: RenderedRequest -): Array { +function getRequestQueryString(renderedRequest: RenderedRequest): Array { return renderedRequest.parameters.map(parameter => { return { name: parameter.name, @@ -495,15 +472,11 @@ function getRequestQueryString( }); } -function getRequestPostData( - renderedRequest: RenderedRequest -): HarPostData | void { +function getRequestPostData(renderedRequest: RenderedRequest): HarPostData | void { let body; if (renderedRequest.body.fileName) { try { - body = newBodyRaw( - fs.readFileSync(renderedRequest.body.fileName, 'base64') - ); + body = newBodyRaw(fs.readFileSync(renderedRequest.body.fileName, 'base64')); } catch (e) { console.warn('[code gen] Failed to read file', e); return undefined; diff --git a/packages/insomnia-app/app/common/hotkeys.js b/packages/insomnia-app/app/common/hotkeys.js index c21443345d..4c28f5786f 100644 --- a/packages/insomnia-app/app/common/hotkeys.js +++ b/packages/insomnia-app/app/common/hotkeys.js @@ -243,20 +243,14 @@ export function pressedHotKey(e: KeyboardEvent, definition: Hotkey): boolean { return false; } -export function executeHotKey( - e: KeyboardEvent, - definition: Hotkey, - callback: Function -): void { +export function executeHotKey(e: KeyboardEvent, definition: Hotkey, callback: Function): void { if (pressedHotKey(e, definition)) { callback(); } } export function getChar(hotkey: Hotkey) { - const codes = Array.isArray(hotkey.keycode) - ? hotkey.keycode - : [hotkey.keycode]; + const codes = Array.isArray(hotkey.keycode) ? hotkey.keycode : [hotkey.keycode]; const chars = []; for (const keycode of codes) { diff --git a/packages/insomnia-app/app/common/import.js b/packages/insomnia-app/app/common/import.js index 866fc425ad..c3ceb76d9e 100644 --- a/packages/insomnia-app/app/common/import.js +++ b/packages/insomnia-app/app/common/import.js @@ -32,10 +32,7 @@ const MODELS = { [EXPORT_TYPE_ENVIRONMENT]: models.environment }; -export async function importUri( - workspaceId: string | null, - uri: string -): Promise { +export async function importUri(workspaceId: string | null, uri: string): Promise { let rawText; if (uri.match(/^(http|https):\/\//)) { const response = await fetch.rawFetch(uri); @@ -95,9 +92,7 @@ export async function importRaw( const { data } = results; - let workspace: Workspace | null = await models.workspace.getById( - workspaceId || 'n/a' - ); + let workspace: Workspace | null = await models.workspace.getById(workspaceId || 'n/a'); // Fetch the base environment in case we need it let baseEnvironment: Environment | null = await models.environment.getOrCreateForWorkspaceId( @@ -128,9 +123,7 @@ export async function importRaw( name: 'Imported Workspace' }); } - baseEnvironment = await models.environment.getOrCreateForWorkspace( - workspace - ); + baseEnvironment = await models.environment.getOrCreateForWorkspace(workspace); } return baseEnvironment._id; }; @@ -178,9 +171,7 @@ export async function importRaw( // Mark as not seen if we created a new workspace from sync if (newDoc.type === models.workspace.type) { - const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId( - newDoc._id - ); + const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(newDoc._id); await models.workspaceMeta.update(workspaceMeta, { hasSeen: false }); } } @@ -191,10 +182,7 @@ export async function importRaw( await db.flushChanges(); return { - source: - results.type && typeof results.type.id === 'string' - ? results.type.id - : 'unknown', + source: results.type && typeof results.type.id === 'string' ? results.type.id : 'unknown', summary: importedDocs, error: null }; @@ -213,15 +201,9 @@ export async function exportHAR( const workspaceEnvironmentLookup = {}; for (let workspace of workspaces) { - const workspaceMeta = await models.workspaceMeta.getByParentId( - workspace._id - ); - let environmentId = workspaceMeta - ? workspaceMeta.activeEnvironmentId - : null; - const environment = await models.environment.getById( - environmentId || 'n/a' - ); + const workspaceMeta = await models.workspaceMeta.getByParentId(workspace._id); + let environmentId = workspaceMeta ? workspaceMeta.activeEnvironmentId : null; + const environment = await models.environment.getById(environmentId || 'n/a'); if (!environment || (environment.isPrivate && !includePrivateDocs)) { environmentId = 'n/a'; } @@ -230,10 +212,7 @@ export async function exportHAR( const requests = []; for (let workspace of workspaces) { - const docs: Array = await getDocWithDescendants( - workspace, - includePrivateDocs - ); + const docs: Array = await getDocWithDescendants(workspace, includePrivateDocs); const workspaceRequests = docs .filter(d => d.type === models.request.type) .sort((a: Object, b: Object) => (a.metaSortKey < b.metaSortKey ? -1 : 1)) @@ -264,10 +243,7 @@ export async function exportJSON( resources: [] }; - const docs: Array = await getDocWithDescendants( - parentDoc, - includePrivateDocs - ); + const docs: Array = await getDocWithDescendants(parentDoc, includePrivateDocs); data.resources = docs .filter( diff --git a/packages/insomnia-app/app/main.development.js b/packages/insomnia-app/app/main.development.js index ded219079e..6be53574d3 100644 --- a/packages/insomnia-app/app/main.development.js +++ b/packages/insomnia-app/app/main.development.js @@ -6,12 +6,7 @@ import * as updates from './main/updates'; import * as windowUtils from './main/window-utils'; import * as models from './models/index'; import * as database from './common/database'; -import { - CHANGELOG_BASE_URL, - getAppVersion, - isDevelopment, - isMac -} from './common/constants'; +import { CHANGELOG_BASE_URL, getAppVersion, isDevelopment, isMac } from './common/constants'; import type { ToastNotification } from './ui/components/toast'; import type { Stats } from './models/stats'; @@ -119,8 +114,7 @@ async function _trackStats() { // Update Stats Object const firstLaunch = stats.launches === 1; - const justUpdated = - !firstLaunch && stats.currentVersion !== stats.lastVersion; + const justUpdated = !firstLaunch && stats.currentVersion !== stats.lastVersion; ipcMain.once('window-ready', () => { const { currentVersion } = stats; diff --git a/packages/insomnia-app/app/main/local-storage.js b/packages/insomnia-app/app/main/local-storage.js index 7b732911b0..adb19aa3c1 100644 --- a/packages/insomnia-app/app/main/local-storage.js +++ b/packages/insomnia-app/app/main/local-storage.js @@ -38,9 +38,7 @@ class LocalStorage { try { return JSON.parse(contents); } catch (e) { - console.error( - `[localstorage] Failed to parse item from LocalStorage: ${e}` - ); + console.error(`[localstorage] Failed to parse item from LocalStorage: ${e}`); return defaultObj; } } diff --git a/packages/insomnia-app/app/main/updates.js b/packages/insomnia-app/app/main/updates.js index 73bfea5c18..aa41bd1a45 100644 --- a/packages/insomnia-app/app/main/updates.js +++ b/packages/insomnia-app/app/main/updates.js @@ -8,10 +8,7 @@ import { UPDATE_URL_WINDOWS } from '../common/constants'; import * as models from '../models/index'; -import { - buildQueryStringFromParams, - joinUrlAndQueryString -} from 'insomnia-url'; +import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url'; import { delay } from '../common/misc'; const { autoUpdater, BrowserWindow, ipcMain } = electron; @@ -39,9 +36,7 @@ async function getUpdateUrl(force: boolean): Promise { console.log(`[updater] Using url ${fullUrl}`); if (process.env.INSOMNIA_DISABLE_AUTOMATIC_UPDATES) { - console.log( - `[updater] Disabled by INSOMNIA_DISABLE_AUTOMATIC_UPDATES environment variable` - ); + console.log(`[updater] Disabled by INSOMNIA_DISABLE_AUTOMATIC_UPDATES environment variable`); return null; } @@ -87,14 +82,11 @@ export async function init() { _sendUpdateStatus('Downloading...'); }); - autoUpdater.on( - 'update-downloaded', - (e, releaseNotes, releaseName, releaseDate, updateUrl) => { - console.log(`[updater] Downloaded ${releaseName}`); - _sendUpdateComplete(true, 'Updated (Restart Required)'); - _showUpdateNotification(); - } - ); + autoUpdater.on('update-downloaded', (e, releaseNotes, releaseName, releaseDate, updateUrl) => { + console.log(`[updater] Downloaded ${releaseName}`); + _sendUpdateComplete(true, 'Updated (Restart Required)'); + _showUpdateNotification(); + }); ipcMain.on('updater.check', async e => { await _checkForUpdates(true); @@ -139,9 +131,7 @@ async function _checkForUpdates(force: boolean) { if (updateUrl === null) { console.log( - `[updater] Updater not running platform=${ - process.platform - } dev=${isDevelopment()}` + `[updater] Updater not running platform=${process.platform} dev=${isDevelopment()}` ); _sendUpdateComplete(false, 'Updates Not Supported'); return; diff --git a/packages/insomnia-app/app/main/window-utils.js b/packages/insomnia-app/app/main/window-utils.js index 5cfa5990c3..d99041e8a0 100644 --- a/packages/insomnia-app/app/main/window-utils.js +++ b/packages/insomnia-app/app/main/window-utils.js @@ -97,10 +97,7 @@ export function createWindow() { label: 'Application', submenu: [ ...(isMac() - ? [ - { label: `About ${getAppName()}`, role: 'about' }, - { type: 'separator' } - ] + ? [{ label: `About ${getAppName()}`, role: 'about' }, { type: 'separator' }] : []), { label: 'Preferences', @@ -121,9 +118,7 @@ export function createWindow() { misc.clickLink(`${CHANGELOG_BASE_URL}/${getAppVersion()}/`); } }, - ...(isMac() - ? [{ type: 'separator' }, { role: 'hide' }, { role: 'hideothers' }] - : []), + ...(isMac() ? [{ type: 'separator' }, { role: 'hide' }, { role: 'hideothers' }] : []), { type: 'separator' }, { label: 'Quit', accelerator: 'CmdOrCtrl+Q', click: () => app.quit() } ] @@ -306,10 +301,7 @@ export function createWindow() { mainWindow.capturePage(image => { const buffer = image.toPNG(); const dir = app.getPath('desktop'); - fs.writeFileSync( - path.join(dir, `Screenshot-${new Date()}.png`), - buffer - ); + fs.writeFileSync(path.join(dir, `Screenshot-${new Date()}.png`), buffer); }); } } diff --git a/packages/insomnia-app/app/models/__tests__/request.test.js b/packages/insomnia-app/app/models/__tests__/request.test.js index de5b77dca0..062016944a 100644 --- a/packages/insomnia-app/app/models/__tests__/request.test.js +++ b/packages/insomnia-app/app/models/__tests__/request.test.js @@ -81,13 +81,8 @@ describe('updateMimeType()', async () => { }); expect(request).not.toBeNull(); - const newRequest = await models.request.updateMimeType( - request, - 'text/html' - ); - expect(newRequest.headers).toEqual([ - { name: 'Content-Type', value: 'text/html' } - ]); + const newRequest = await models.request.updateMimeType(request, 'text/html'); + expect(newRequest.headers).toEqual([{ name: 'Content-Type', value: 'text/html' }]); }); it('replaces header when exists', async () => { @@ -103,10 +98,7 @@ describe('updateMimeType()', async () => { }); expect(request).not.toBeNull(); - const newRequest = await models.request.updateMimeType( - request, - 'text/html' - ); + const newRequest = await models.request.updateMimeType(request, 'text/html'); expect(newRequest.headers).toEqual([ { name: 'content-tYPE', value: 'text/html' }, { name: 'foo', value: 'bar' }, @@ -123,13 +115,8 @@ describe('updateMimeType()', async () => { }); expect(request).not.toBeNull(); - const newRequest = await models.request.updateMimeType( - request, - 'text/html' - ); - expect(newRequest.headers).toEqual([ - { name: 'content-tYPE', value: 'text/html' } - ]); + const newRequest = await models.request.updateMimeType(request, 'text/html'); + expect(newRequest.headers).toEqual([{ name: 'content-tYPE', value: 'text/html' }]); }); it('keeps content-type', async () => { @@ -142,9 +129,7 @@ describe('updateMimeType()', async () => { const newRequest = await models.request.updateMimeType(request, null); expect(newRequest.body).toEqual({}); - expect(newRequest.headers).toEqual([ - { name: 'content-tYPE', value: 'application/json' } - ]); + expect(newRequest.headers).toEqual([{ name: 'content-tYPE', value: 'application/json' }]); }); it('uses saved body when provided', async () => { @@ -157,12 +142,9 @@ describe('updateMimeType()', async () => { }); expect(request).not.toBeNull(); - const newRequest = await models.request.updateMimeType( - request, - 'application/json', - false, - { text: 'Saved Data' } - ); + const newRequest = await models.request.updateMimeType(request, 'application/json', false, { + text: 'Saved Data' + }); expect(newRequest.body.text).toEqual('Saved Data'); }); @@ -176,12 +158,7 @@ describe('updateMimeType()', async () => { }); expect(request).not.toBeNull(); - const newRequest = await models.request.updateMimeType( - request, - 'application/json', - false, - {} - ); + const newRequest = await models.request.updateMimeType(request, 'application/json', false, {}); expect(newRequest.body.text).toEqual('My Data'); }); }); @@ -205,22 +182,15 @@ describe('migrate()', () => { it('migrates form-urlencoded', () => { const original = { - headers: [ - { name: 'content-type', value: 'application/x-www-form-urlencoded' } - ], + headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }], body: 'foo=bar&baz={{ hello }}' }; const expected = { - headers: [ - { name: 'content-type', value: 'application/x-www-form-urlencoded' } - ], + headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }], body: { mimeType: 'application/x-www-form-urlencoded', - params: [ - { name: 'foo', value: 'bar' }, - { name: 'baz', value: '{{ hello }}' } - ] + params: [{ name: 'foo', value: 'bar' }, { name: 'baz', value: '{{ hello }}' }] }, url: '' }; @@ -248,10 +218,7 @@ describe('migrate()', () => { ], body: { mimeType: 'application/x-www-form-urlencoded', - params: [ - { name: 'foo', value: 'bar' }, - { name: 'baz', value: '{{ hello }}' } - ] + params: [{ name: 'foo', value: 'bar' }, { name: 'baz', value: '{{ hello }}' }] }, url: '' }; @@ -261,16 +228,12 @@ describe('migrate()', () => { it('migrates form-urlencoded malformed', () => { const original = { - headers: [ - { name: 'content-type', value: 'application/x-www-form-urlencoded' } - ], + headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }], body: '{"foo": "bar"}' }; const expected = { - headers: [ - { name: 'content-type', value: 'application/x-www-form-urlencoded' } - ], + headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }], body: { mimeType: 'application/x-www-form-urlencoded', params: [{ name: '{"foo": "bar"}', value: '' }] diff --git a/packages/insomnia-app/app/models/__tests__/response.test.js b/packages/insomnia-app/app/models/__tests__/response.test.js index 99d9058498..9d3f1dfe51 100644 --- a/packages/insomnia-app/app/models/__tests__/response.test.js +++ b/packages/insomnia-app/app/models/__tests__/response.test.js @@ -87,10 +87,7 @@ describe('migrate()', () => { }); it('does it', async () => { - const bodyPath = path.join( - electron.remote.app.getPath('userData'), - 'foo.zip' - ); + const bodyPath = path.join(electron.remote.app.getPath('userData'), 'foo.zip'); fs.writeFileSync(bodyPath, zlib.gzipSync('Hello World!')); const response = await models.initModel(models.response.type, { bodyPath }); diff --git a/packages/insomnia-app/app/models/__tests__/workspace.test.js b/packages/insomnia-app/app/models/__tests__/workspace.test.js index 92812a3cc6..10441159b6 100644 --- a/packages/insomnia-app/app/models/__tests__/workspace.test.js +++ b/packages/insomnia-app/app/models/__tests__/workspace.test.js @@ -6,10 +6,7 @@ describe('migrate()', () => { it('migrates client certificates properly', async () => { const workspace = await models.workspace.create({ name: 'My Workspace', - certificates: [ - { key: 'key', passphrase: 'mypass' }, - { disabled: true, cert: 'cert' } - ] + certificates: [{ key: 'key', passphrase: 'mypass' }, { disabled: true, cert: 'cert' }] }); const migratedWorkspace = await models.workspace.migrate(workspace); @@ -55,9 +52,7 @@ describe('migrate()', () => { // Make sure we don't create new certs if we migrate again await models.workspace.migrate(migratedWorkspace); - const certsAgain = await models.clientCertificate.findByParentId( - workspace._id - ); + const certsAgain = await models.clientCertificate.findByParentId(workspace._id); expect(certsAgain.length).toBe(2); }); }); diff --git a/packages/insomnia-app/app/models/client-certificate.js b/packages/insomnia-app/app/models/client-certificate.js index af8ed660c9..5e8dfd1f7d 100644 --- a/packages/insomnia-app/app/models/client-certificate.js +++ b/packages/insomnia-app/app/models/client-certificate.js @@ -41,18 +41,13 @@ export async function migrate(doc: ClientCertificate) { export function create(patch: Object = {}): Promise { if (!patch.parentId) { - throw new Error( - 'New ClientCertificate missing `parentId`: ' + JSON.stringify(patch) - ); + throw new Error('New ClientCertificate missing `parentId`: ' + JSON.stringify(patch)); } return db.docCreate(type, patch); } -export function update( - cert: ClientCertificate, - patch: Object = {} -): Promise { +export function update(cert: ClientCertificate, patch: Object = {}): Promise { return db.docUpdate(cert, patch); } @@ -60,9 +55,7 @@ export function getById(id: string): Promise { return db.get(type, id); } -export function findByParentId( - parentId: string -): Promise> { +export function findByParentId(parentId: string): Promise> { return db.find(type, { parentId }); } diff --git a/packages/insomnia-app/app/models/cookie-jar.js b/packages/insomnia-app/app/models/cookie-jar.js index 1664b0ffde..5c74faaaa8 100644 --- a/packages/insomnia-app/app/models/cookie-jar.js +++ b/packages/insomnia-app/app/models/cookie-jar.js @@ -46,9 +46,7 @@ export function migrate(doc: CookieJar): CookieJar { export function create(patch: Object = {}) { if (!patch.parentId) { - throw new Error( - `New CookieJar missing \`parentId\`: ${JSON.stringify(patch)}` - ); + throw new Error(`New CookieJar missing \`parentId\`: ${JSON.stringify(patch)}`); } return db.docCreate(type, patch); diff --git a/packages/insomnia-app/app/models/environment.js b/packages/insomnia-app/app/models/environment.js index 058f1228fb..cd3128591d 100644 --- a/packages/insomnia-app/app/models/environment.js +++ b/packages/insomnia-app/app/models/environment.js @@ -36,18 +36,13 @@ export function migrate(doc: Environment): Environment { export function create(patch: Object = {}): Promise { if (!patch.parentId) { - throw new Error( - `New Environment missing \`parentId\`: ${JSON.stringify(patch)}` - ); + throw new Error(`New Environment missing \`parentId\`: ${JSON.stringify(patch)}`); } return db.docCreate(type, patch); } -export function update( - environment: Environment, - patch: Object -): Promise { +export function update(environment: Environment, patch: Object): Promise { return db.docUpdate(environment, patch); } @@ -55,9 +50,7 @@ export function findByParentId(parentId: string): Promise> { return db.find(type, { parentId }, { metaSortKey: 1 }); } -export async function getOrCreateForWorkspaceId( - workspaceId: string -): Promise { +export async function getOrCreateForWorkspaceId(workspaceId: string): Promise { const environments = await db.find(type, { parentId: workspaceId }); if (!environments.length) { @@ -70,9 +63,7 @@ export async function getOrCreateForWorkspaceId( return environments[environments.length - 1]; } -export async function getOrCreateForWorkspace( - workspace: Workspace -): Promise { +export async function getOrCreateForWorkspace(workspace: Workspace): Promise { return getOrCreateForWorkspaceId(workspace._id); } diff --git a/packages/insomnia-app/app/models/index.js b/packages/insomnia-app/app/models/index.js index a3c30584ef..3f88ec211f 100644 --- a/packages/insomnia-app/app/models/index.js +++ b/packages/insomnia-app/app/models/index.js @@ -88,19 +88,14 @@ export function getModelName(type: string, count: number = 1) { } } -export async function initModel( - type: string, - ...sources: Array -): Promise { +export async function initModel(type: string, ...sources: Array): Promise { const model = getModel(type); if (!model) { const choices = all() .map(m => m.type) .join(', '); - throw new Error( - `Tried to init invalid model "${type}". Choices are ${choices}` - ); + throw new Error(`Tried to init invalid model "${type}". Choices are ${choices}`); } // Define global default fields diff --git a/packages/insomnia-app/app/models/o-auth-2-token.js b/packages/insomnia-app/app/models/o-auth-2-token.js index 24521bf0ca..61fba31443 100644 --- a/packages/insomnia-app/app/models/o-auth-2-token.js +++ b/packages/insomnia-app/app/models/o-auth-2-token.js @@ -48,18 +48,13 @@ export function migrate(doc: T): T { export function create(patch: Object = {}): Promise { if (!patch.parentId) { - throw new Error( - `New OAuth2Token missing \`parentId\` ${JSON.stringify(patch)}` - ); + throw new Error(`New OAuth2Token missing \`parentId\` ${JSON.stringify(patch)}`); } return db.docCreate(type, patch); } -export function update( - token: OAuth2Token, - patch: Object -): Promise { +export function update(token: OAuth2Token, patch: Object): Promise { return db.docUpdate(token, patch); } @@ -71,9 +66,7 @@ export function getByParentId(parentId: string): Promise { return db.getWhere(type, { parentId }); } -export async function getOrCreateByParentId( - parentId: string -): Promise { +export async function getOrCreateByParentId(parentId: string): Promise { let token = await db.getWhere(type, { parentId }); if (!token) { diff --git a/packages/insomnia-app/app/models/plugin-data.js b/packages/insomnia-app/app/models/plugin-data.js index 0320d48fd9..3f7461c75c 100644 --- a/packages/insomnia-app/app/models/plugin-data.js +++ b/packages/insomnia-app/app/models/plugin-data.js @@ -31,18 +31,11 @@ export function create(patch: Object = {}): Promise { return db.docCreate(type, patch); } -export async function update( - doc: PluginData, - patch: Object -): Promise { +export async function update(doc: PluginData, patch: Object): Promise { return db.docUpdate(doc, patch); } -export async function upsertByKey( - plugin: string, - key: string, - value: string -): Promise { +export async function upsertByKey(plugin: string, key: string, value: string): Promise { const doc = await getByKey(plugin, key); return doc ? update(doc, { value }) : create({ plugin, key, value }); } @@ -55,9 +48,6 @@ export async function removeAll(plugin: string): Promise { return db.removeWhere(type, { plugin }); } -export async function getByKey( - plugin: string, - key: string -): Promise { +export async function getByKey(plugin: string, key: string): Promise { return db.getWhere(type, { plugin, key }); } diff --git a/packages/insomnia-app/app/models/request-group.js b/packages/insomnia-app/app/models/request-group.js index f2730554e9..3a0af18891 100644 --- a/packages/insomnia-app/app/models/request-group.js +++ b/packages/insomnia-app/app/models/request-group.js @@ -31,18 +31,13 @@ export function migrate(doc: RequestGroup) { export function create(patch: Object = {}): Promise { if (!patch.parentId) { - throw new Error( - 'New RequestGroup missing `parentId`: ' + JSON.stringify(patch) - ); + throw new Error('New RequestGroup missing `parentId`: ' + JSON.stringify(patch)); } return db.docCreate(type, patch); } -export function update( - requestGroup: RequestGroup, - patch: Object = {} -): Promise { +export function update(requestGroup: RequestGroup, patch: Object = {}): Promise { return db.docUpdate(requestGroup, patch); } @@ -62,9 +57,7 @@ export function all(): Promise> { return db.all(type); } -export async function duplicate( - requestGroup: RequestGroup -): Promise { +export async function duplicate(requestGroup: RequestGroup): Promise { const name = `${requestGroup.name} (Copy)`; // Get sort key of next request diff --git a/packages/insomnia-app/app/models/request-version.js b/packages/insomnia-app/app/models/request-version.js index b9d9d27921..5c5a2bbcc4 100644 --- a/packages/insomnia-app/app/models/request-version.js +++ b/packages/insomnia-app/app/models/request-version.js @@ -34,9 +34,7 @@ export function getById(id) { export async function create(request) { if (!request.type === models.request.type) { - throw new Error( - `New ${type} was not given a valid ${models.request.type} instance` - ); + throw new Error(`New ${type} was not given a valid ${models.request.type} instance`); } const parentId = request._id; diff --git a/packages/insomnia-app/app/models/request.js b/packages/insomnia-app/app/models/request.js index 2f321bc147..d0d8a28f5b 100644 --- a/packages/insomnia-app/app/models/request.js +++ b/packages/insomnia-app/app/models/request.js @@ -24,10 +24,7 @@ import { } from '../common/constants'; import * as db from '../common/database'; import { getContentTypeHeader } from '../common/misc'; -import { - buildQueryStringFromParams, - deconstructQueryStringToParams -} from 'insomnia-url'; +import { buildQueryStringFromParams, deconstructQueryStringToParams } from 'insomnia-url'; import { GRANT_TYPE_AUTHORIZATION_CODE } from '../network/o-auth-2/constants'; import { SIGNATURE_METHOD_HMAC_SHA1 } from '../network/o-auth-1/constants'; @@ -115,10 +112,7 @@ export function init(): BaseRequest { }; } -export function newAuth( - type: string, - oldAuth: RequestAuthentication = {} -): RequestAuthentication { +export function newAuth(type: string, oldAuth: RequestAuthentication = {}): RequestAuthentication { switch (type) { // No Auth case AUTH_NONE: @@ -207,9 +201,7 @@ export function newBodyRaw(rawBody: string, contentType?: string): RequestBody { return { mimeType, text: rawBody }; } -export function newBodyFormUrlEncoded( - parameters: Array | null -): RequestBody { +export function newBodyFormUrlEncoded(parameters: Array | null): RequestBody { return { mimeType: CONTENT_TYPE_FORM_URLENCODED, params: parameters || [] @@ -223,9 +215,7 @@ export function newBodyFile(path: string): RequestBody { }; } -export function newBodyForm( - parameters: Array -): RequestBody { +export function newBodyForm(parameters: Array): RequestBody { return { mimeType: CONTENT_TYPE_FORM_DATA, params: parameters || [] @@ -241,9 +231,7 @@ export function migrate(doc: Request): Request { export function create(patch: Object = {}): Promise { if (!patch.parentId) { - throw new Error( - `New Requests missing \`parentId\`: ${JSON.stringify(patch)}` - ); + throw new Error(`New Requests missing \`parentId\`: ${JSON.stringify(patch)}`); } return db.docCreate(type, patch); @@ -271,8 +259,7 @@ export function updateMimeType( const contentTypeHeader = getContentTypeHeader(headers); // GraphQL uses JSON content-type - const contentTypeHeaderValue = - mimeType === CONTENT_TYPE_GRAPHQL ? CONTENT_TYPE_JSON : mimeType; + const contentTypeHeaderValue = mimeType === CONTENT_TYPE_GRAPHQL ? CONTENT_TYPE_JSON : mimeType; // GraphQL must be POST if (mimeType === CONTENT_TYPE_GRAPHQL) { @@ -309,8 +296,7 @@ export function updateMimeType( let body; - const oldBody = - Object.keys(savedBody).length === 0 ? request.body : savedBody; + const oldBody = Object.keys(savedBody).length === 0 ? request.body : savedBody; if (mimeType === CONTENT_TYPE_FORM_URLENCODED) { // Urlencoded @@ -358,9 +344,7 @@ export async function duplicate(request: Request): Promise { // Get sort key of next request const q = { metaSortKey: { $gt: request.metaSortKey } }; const [nextRequest] = await db.find(type, q, { metaSortKey: 1 }); - const nextSortKey = nextRequest - ? nextRequest.metaSortKey - : request.metaSortKey + 100; + const nextSortKey = nextRequest ? nextRequest.metaSortKey : request.metaSortKey + 100; // Calculate new sort key const sortKeyIncrement = (nextSortKey - request.metaSortKey) / 2; @@ -393,16 +377,12 @@ function migrateBody(request: Request): Request { // Second, convert all existing urlencoded bodies to new format const contentType = getContentTypeFromHeaders(request.headers) || ''; - const wasFormUrlEncoded = !!contentType.match( - /^application\/x-www-form-urlencoded/i - ); + const wasFormUrlEncoded = !!contentType.match(/^application\/x-www-form-urlencoded/i); if (wasFormUrlEncoded) { // Convert old-style form-encoded request bodies to new style const body = typeof request.body === 'string' ? request.body : ''; - request.body = newBodyFormUrlEncoded( - deconstructQueryStringToParams(body, false) - ); + request.body = newBodyFormUrlEncoded(deconstructQueryStringToParams(body, false)); } else if (!request.body && !contentType) { request.body = {}; } else { diff --git a/packages/insomnia-app/app/models/response.js b/packages/insomnia-app/app/models/response.js index 2ef5b41ff1..1e90adfb87 100644 --- a/packages/insomnia-app/app/models/response.js +++ b/packages/insomnia-app/app/models/response.js @@ -107,17 +107,11 @@ export async function findRecentForRequest( requestId: string, limit: number ): Promise> { - const responses = await db.findMostRecentlyModified( - type, - { parentId: requestId }, - limit - ); + const responses = await db.findMostRecentlyModified(type, { parentId: requestId }, limit); return responses; } -export async function getLatestForRequest( - requestId: string -): Promise { +export async function getLatestForRequest(requestId: string): Promise { const responses = await findRecentForRequest(requestId, 1); const response = (responses[0]: ?Response); return response || null; @@ -132,17 +126,11 @@ export async function create(patch: Object = {}) { // Create request version snapshot const request = await models.request.getById(parentId); - const requestVersion = request - ? await models.requestVersion.create(request) - : null; + const requestVersion = request ? await models.requestVersion.create(request) : null; patch.requestVersionId = requestVersion ? requestVersion._id : null; // Delete all other responses before creating the new one - const allResponses = await db.findMostRecentlyModified( - type, - { parentId }, - MAX_RESPONSES - ); + const allResponses = await db.findMostRecentlyModified(type, { parentId }, MAX_RESPONSES); const recentIds = allResponses.map(r => r._id); await db.removeWhere(type, { parentId, _id: { $nin: recentIds } }); @@ -154,26 +142,12 @@ export function getLatestByParentId(parentId: string) { return db.getMostRecentlyModified(type, { parentId }); } -export function getBodyStream( - response: Object, - readFailureValue: ?T -): Readable | null | T { - return getBodyStreamFromPath( - response.bodyPath || '', - response.bodyCompression, - readFailureValue - ); +export function getBodyStream(response: Object, readFailureValue: ?T): Readable | null | T { + return getBodyStreamFromPath(response.bodyPath || '', response.bodyCompression, readFailureValue); } -export function getBodyBuffer( - response: Object, - readFailureValue: ?T -): Buffer | T | null { - return getBodyBufferFromPath( - response.bodyPath || '', - response.bodyCompression, - readFailureValue - ); +export function getBodyBuffer(response: Object, readFailureValue: ?T): Buffer | T | null { + return getBodyBufferFromPath(response.bodyPath || '', response.bodyCompression, readFailureValue); } function getBodyStreamFromPath( diff --git a/packages/insomnia-app/app/models/settings.js b/packages/insomnia-app/app/models/settings.js index 3a330fbf6f..c60d7ecc61 100644 --- a/packages/insomnia-app/app/models/settings.js +++ b/packages/insomnia-app/app/models/settings.js @@ -83,10 +83,7 @@ export async function create(patch: Object = {}): Promise { return db.docCreate(type, patch); } -export async function update( - settings: Settings, - patch: Object -): Promise { +export async function update(settings: Settings, patch: Object): Promise { return db.docUpdate(settings, patch); } diff --git a/packages/insomnia-app/app/models/workspace-meta.js b/packages/insomnia-app/app/models/workspace-meta.js index 63fb342913..c6d2ab80eb 100644 --- a/packages/insomnia-app/app/models/workspace-meta.js +++ b/packages/insomnia-app/app/models/workspace-meta.js @@ -45,30 +45,21 @@ export function migrate(doc: WorkspaceMeta): WorkspaceMeta { export function create(patch: Object = {}): Promise { if (!patch.parentId) { - throw new Error( - `New WorkspaceMeta missing parentId ${JSON.stringify(patch)}` - ); + throw new Error(`New WorkspaceMeta missing parentId ${JSON.stringify(patch)}`); } return db.docCreate(type, patch); } -export function update( - workspaceMeta: WorkspaceMeta, - patch: Object = {} -): Promise { +export function update(workspaceMeta: WorkspaceMeta, patch: Object = {}): Promise { return db.docUpdate(workspaceMeta, patch); } -export async function getByParentId( - parentId: string -): Promise { +export async function getByParentId(parentId: string): Promise { return db.getWhere(type, { parentId }); } -export async function getOrCreateByParentId( - parentId: string -): Promise { +export async function getOrCreateByParentId(parentId: string): Promise { const doc = await getByParentId(parentId); return doc || this.create({ parentId }); } diff --git a/packages/insomnia-app/app/models/workspace.js b/packages/insomnia-app/app/models/workspace.js index 056036a4db..c737a4a36e 100644 --- a/packages/insomnia-app/app/models/workspace.js +++ b/packages/insomnia-app/app/models/workspace.js @@ -49,10 +49,7 @@ export function count() { return db.count(type); } -export function update( - workspace: Workspace, - patch: Object -): Promise { +export function update(workspace: Workspace, patch: Object): Promise { return db.docUpdate(workspace, patch); } @@ -60,9 +57,7 @@ export function remove(workspace: Workspace): Promise { return db.remove(workspace); } -async function _migrateExtractClientCertificates( - workspace: Workspace -): Promise { +async function _migrateExtractClientCertificates(workspace: Workspace): Promise { const certificates = (workspace: Object).certificates || null; if (!Array.isArray(certificates)) { // Already migrated diff --git a/packages/insomnia-app/app/network/__tests__/authentication.test.js b/packages/insomnia-app/app/network/__tests__/authentication.test.js index d9f2aef3b2..7bb8205c2e 100644 --- a/packages/insomnia-app/app/network/__tests__/authentication.test.js +++ b/packages/insomnia-app/app/network/__tests__/authentication.test.js @@ -3,22 +3,17 @@ import { AUTH_OAUTH_1 } from '../../common/constants'; describe('OAuth 1.0', () => { it('Does OAuth 1.0', async () => { - const header = await getAuthHeader( - 'req_123', - 'https://insomnia.rest/', - 'GET', - { - type: AUTH_OAUTH_1, - consumerKey: 'consumerKey', - consumerSecret: 'consumerSecret', - callback: 'https://insomnia.rest/callback/', - tokenKey: 'tokenKey', - tokenSecret: 'tokenSecret', - signatureMethod: 'HMAC-SHA1', - nonce: 'nonce', - timestamp: '1234567890' - } - ); + const header = await getAuthHeader('req_123', 'https://insomnia.rest/', 'GET', { + type: AUTH_OAUTH_1, + consumerKey: 'consumerKey', + consumerSecret: 'consumerSecret', + callback: 'https://insomnia.rest/callback/', + tokenKey: 'tokenKey', + tokenSecret: 'tokenSecret', + signatureMethod: 'HMAC-SHA1', + nonce: 'nonce', + timestamp: '1234567890' + }); expect(header).toEqual({ name: 'Authorization', @@ -36,38 +31,33 @@ describe('OAuth 1.0', () => { }); it('Does OAuth 1.0 with RSA-SHA1', async () => { - const header = await getAuthHeader( - 'req_123', - 'https://insomnia.rest/', - 'GET', - { - type: AUTH_OAUTH_1, - consumerKey: 'consumerKey', - consumerSecret: 'consumerSecret', - callback: 'https://insomnia.rest/callback/', - tokenKey: 'tokenKey', - tokenSecret: 'tokenSecret', - signatureMethod: 'RSA-SHA1', - privateKey: - '-----BEGIN RSA PRIVATE KEY-----\n' + - 'MIICXgIBAAKBgQC6jwJjt/KywX4N4ZA3YOLcNFrS9S2+TcArdMyo89yqLZWzC9x9\n' + - 'MY4gA+1+iOpG+S/jlDM3WuJSCnEzQhzDo9UGtNODC+Qr8nStRcKdjSOhywRXPd4d\n' + - '+u6TOae/Flukwqzl0Pw3fsMWqwp0dni6OIc7E2gm2jj4MTLsd4oq/0igCQIDAQAB\n' + - 'AoGBAJCdHusRwo6SsxYrjdF/xxuPcgApkmX8e0S0a5lkP9+jKnH6ddaOPW/P25/E\n' + - 'nmaZ72dokDMOvnV+JrXnP8jgDNatJsBqS2aLBNpSI4TsOQDfhB3rPoafc5s2bNVY\n' + - '5SRp2kr3QL74BZzLzAsIJzGDpRyKQGRPzMFiPzkQcfJuO7rpAkEA3gZq2v2OUzcV\n' + - 'iQIoCy7bkvxaKZUlkj6xT0msExqrAt9mtVE6XW3GsHUSyB2ePOzDz6zcKeX90nTq\n' + - '79PAGTAm1wJBANcbO+xt9By9Omq8K51RuKkvlESHH8j+meAWW6DoKJvHdy2/+xnA\n' + - 'XEcDcWb9cV9V5FNWmJ+mMF1jfu/GxTMp9B8CQQDazaQ80KiUZbK5ZQCllLYbcspA\n' + - 'NJXkPBhtNQN5iEyD9jm38qb8MBUhDR9HS7kH/aUzYv1N5TRxVXu6ggnMSOHdAkBI\n' + - 'Gojrp6+8MnHydUDpawtLKve4QNMWvME3rEbqmOeD0EjSvReeeix0YWMR8sKeAlyW\n' + - '0uA2I67ynvddyHMxw05hAkEAyXuG1xpqs3VYQeHRC67dQjkKw0YbcOeeWHpo1+cn\n' + - 'F29dI2yG3Ti+28/WlSdfYGe9P9SfeYM7RQbNbUp1MHWrkg==\n' + - '-----END RSA PRIVATE KEY-----', - nonce: 'nonce', - timestamp: '1234567890' - } - ); + const header = await getAuthHeader('req_123', 'https://insomnia.rest/', 'GET', { + type: AUTH_OAUTH_1, + consumerKey: 'consumerKey', + consumerSecret: 'consumerSecret', + callback: 'https://insomnia.rest/callback/', + tokenKey: 'tokenKey', + tokenSecret: 'tokenSecret', + signatureMethod: 'RSA-SHA1', + privateKey: + '-----BEGIN RSA PRIVATE KEY-----\n' + + 'MIICXgIBAAKBgQC6jwJjt/KywX4N4ZA3YOLcNFrS9S2+TcArdMyo89yqLZWzC9x9\n' + + 'MY4gA+1+iOpG+S/jlDM3WuJSCnEzQhzDo9UGtNODC+Qr8nStRcKdjSOhywRXPd4d\n' + + '+u6TOae/Flukwqzl0Pw3fsMWqwp0dni6OIc7E2gm2jj4MTLsd4oq/0igCQIDAQAB\n' + + 'AoGBAJCdHusRwo6SsxYrjdF/xxuPcgApkmX8e0S0a5lkP9+jKnH6ddaOPW/P25/E\n' + + 'nmaZ72dokDMOvnV+JrXnP8jgDNatJsBqS2aLBNpSI4TsOQDfhB3rPoafc5s2bNVY\n' + + '5SRp2kr3QL74BZzLzAsIJzGDpRyKQGRPzMFiPzkQcfJuO7rpAkEA3gZq2v2OUzcV\n' + + 'iQIoCy7bkvxaKZUlkj6xT0msExqrAt9mtVE6XW3GsHUSyB2ePOzDz6zcKeX90nTq\n' + + '79PAGTAm1wJBANcbO+xt9By9Omq8K51RuKkvlESHH8j+meAWW6DoKJvHdy2/+xnA\n' + + 'XEcDcWb9cV9V5FNWmJ+mMF1jfu/GxTMp9B8CQQDazaQ80KiUZbK5ZQCllLYbcspA\n' + + 'NJXkPBhtNQN5iEyD9jm38qb8MBUhDR9HS7kH/aUzYv1N5TRxVXu6ggnMSOHdAkBI\n' + + 'Gojrp6+8MnHydUDpawtLKve4QNMWvME3rEbqmOeD0EjSvReeeix0YWMR8sKeAlyW\n' + + '0uA2I67ynvddyHMxw05hAkEAyXuG1xpqs3VYQeHRC67dQjkKw0YbcOeeWHpo1+cn\n' + + 'F29dI2yG3Ti+28/WlSdfYGe9P9SfeYM7RQbNbUp1MHWrkg==\n' + + '-----END RSA PRIVATE KEY-----', + nonce: 'nonce', + timestamp: '1234567890' + }); expect(header).toEqual({ name: 'Authorization', @@ -85,17 +75,12 @@ describe('OAuth 1.0', () => { }); it('Does OAuth 1.0 with defaults', async () => { - const header = await getAuthHeader( - 'req_123', - 'https://insomnia.rest/', - 'GET', - { - type: AUTH_OAUTH_1, - consumerKey: 'consumerKey', - consumerSecret: 'consumerSecret', - signatureMethod: 'HMAC-SHA1' - } - ); + const header = await getAuthHeader('req_123', 'https://insomnia.rest/', 'GET', { + type: AUTH_OAUTH_1, + consumerKey: 'consumerKey', + consumerSecret: 'consumerSecret', + signatureMethod: 'HMAC-SHA1' + }); expect(header.name).toBe('Authorization'); expect(header.value).toMatch( diff --git a/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js b/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js index 22ccc1eac2..b69dfd229e 100644 --- a/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js +++ b/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js @@ -5,8 +5,7 @@ import { globalBeforeEach } from '../../__jest__/before-each'; describe('certificateUrlParse', () => { beforeEach(globalBeforeEach); it('should return the result of url.parse if no wildcard paths are supplied', () => { - const url = - 'https://www.example.org:80/some/resources?query=1&other=2#myfragment'; + const url = 'https://www.example.org:80/some/resources?query=1&other=2#myfragment'; const expected = urlParse(url); expect(certificateUrlParse(url)).toEqual(expected); }); diff --git a/packages/insomnia-app/app/network/authentication.js b/packages/insomnia-app/app/network/authentication.js index 3ca7c70720..46358af0c7 100644 --- a/packages/insomnia-app/app/network/authentication.js +++ b/packages/insomnia-app/app/network/authentication.js @@ -45,9 +45,7 @@ export async function getAuthHeader( // ID of "{{request_id}}.graphql". Here we are removing the .graphql suffix and // pretending we are fetching a token for the original request. This makes sure // the same tokens are used for schema fetching. See issue #835 on GitHub. - const tokenId = requestId.match(/\.graphql$/) - ? requestId.replace(/\.graphql$/, '') - : requestId; + const tokenId = requestId.match(/\.graphql$/) ? requestId.replace(/\.graphql$/, '') : requestId; const oAuth2Token = await getOAuth2Token(tokenId, authentication); if (oAuth2Token) { @@ -82,14 +80,7 @@ export async function getAuthHeader( } if (authentication.type === AUTH_ASAP) { - const { - issuer, - subject, - audience, - keyId, - additionalClaims, - privateKey - } = authentication; + const { issuer, subject, audience, keyId, additionalClaims, privateKey } = authentication; const generator = jwtAuthentication.client.create(); let claims = { iss: issuer, sub: subject, aud: audience }; @@ -118,20 +109,16 @@ export async function getAuthHeader( }; return new Promise((resolve, reject) => { - generator.generateAuthorizationHeader( - claims, - options, - (error, headerValue) => { - if (error) { - reject(error); - } else { - resolve({ - name: 'Authorization', - value: headerValue - }); - } + generator.generateAuthorizationHeader(claims, options, (error, headerValue) => { + if (error) { + reject(error); + } else { + resolve({ + name: 'Authorization', + value: headerValue + }); } - ); + }); }); } diff --git a/packages/insomnia-app/app/network/basic-auth/get-header.js b/packages/insomnia-app/app/network/basic-auth/get-header.js index e3144b69d2..07e9f83948 100644 --- a/packages/insomnia-app/app/network/basic-auth/get-header.js +++ b/packages/insomnia-app/app/network/basic-auth/get-header.js @@ -2,10 +2,7 @@ import type { RequestHeader } from '../../models/request'; -export function getBasicAuthHeader( - username: ?string, - password: ?string -): RequestHeader { +export function getBasicAuthHeader(username: ?string, password: ?string): RequestHeader { const name = 'Authorization'; const header = `${username || ''}:${password || ''}`; const authString = Buffer.from(header, 'utf8').toString('base64'); diff --git a/packages/insomnia-app/app/network/bearer-auth/get-header.js b/packages/insomnia-app/app/network/bearer-auth/get-header.js index bc177869d3..2f111f5da4 100644 --- a/packages/insomnia-app/app/network/bearer-auth/get-header.js +++ b/packages/insomnia-app/app/network/bearer-auth/get-header.js @@ -1,10 +1,7 @@ // @flow import type { RequestHeader } from '../../models/request'; -export function getBearerAuthHeader( - token: string, - prefix: string -): RequestHeader { +export function getBearerAuthHeader(token: string, prefix: string): RequestHeader { const name = 'Authorization'; const value = `${prefix || 'Bearer'} ${token}`; return { name, value }; diff --git a/packages/insomnia-app/app/network/certificate-url-parse.js b/packages/insomnia-app/app/network/certificate-url-parse.js index dafb49a1c5..4da7584ed7 100644 --- a/packages/insomnia-app/app/network/certificate-url-parse.js +++ b/packages/insomnia-app/app/network/certificate-url-parse.js @@ -4,10 +4,7 @@ const WILDCARD_CHARACTER = '*'; const WILDCARD_SUBSTITUTION = Math.random() .toString() .split('.')[1]; -const WILDCARD_SUBSTITUTION_PATTERN = new RegExp( - `${WILDCARD_SUBSTITUTION}`, - 'g' -); +const WILDCARD_SUBSTITUTION_PATTERN = new RegExp(`${WILDCARD_SUBSTITUTION}`, 'g'); export default function certificateUrlParse(url) { if (url.indexOf(WILDCARD_CHARACTER) === -1) { diff --git a/packages/insomnia-app/app/network/multipart.js b/packages/insomnia-app/app/network/multipart.js index 699a079e1b..209e3da29d 100644 --- a/packages/insomnia-app/app/network/multipart.js +++ b/packages/insomnia-app/app/network/multipart.js @@ -9,10 +9,7 @@ export const DEFAULT_BOUNDARY = 'X-INSOMNIA-BOUNDARY'; export async function buildMultipart(params: Array) { return new Promise(async (resolve: Function, reject: Function) => { - const filePath = path.join( - electron.remote.app.getPath('temp'), - Math.random() + '.body' - ); + const filePath = path.join(electron.remote.app.getPath('temp'), Math.random() + '.body'); const writeStream = fs.createWriteStream(filePath); const lineBreak = '\r\n'; let totalSize = 0; @@ -57,8 +54,7 @@ export async function buildMultipart(params: Array) { if (param.type === 'file' && param.fileName) { const name = param.name || ''; const fileName = param.fileName; - const contentType = - mimes.lookup(fileName) || 'application/octet-stream'; + const contentType = mimes.lookup(fileName) || 'application/octet-stream'; addString( 'Content-Disposition: form-data; ' + `name="${name.replace(/"/g, '\\"')}"; ` + diff --git a/packages/insomnia-app/app/network/o-auth-1/constants.js b/packages/insomnia-app/app/network/o-auth-1/constants.js index 05c8603278..7741afe1d1 100644 --- a/packages/insomnia-app/app/network/o-auth-1/constants.js +++ b/packages/insomnia-app/app/network/o-auth-1/constants.js @@ -1,11 +1,6 @@ // @flow -export type OAuth1SignatureMethod = - | 'HMAC-SHA1' - | 'RSA-SHA1' - | 'HMAC-SHA256' - | 'PLAINTEXT'; +export type OAuth1SignatureMethod = 'HMAC-SHA1' | 'RSA-SHA1' | 'HMAC-SHA256' | 'PLAINTEXT'; export const SIGNATURE_METHOD_HMAC_SHA1: OAuth1SignatureMethod = 'HMAC-SHA1'; -export const SIGNATURE_METHOD_HMAC_SHA256: OAuth1SignatureMethod = - 'HMAC-SHA256'; +export const SIGNATURE_METHOD_HMAC_SHA256: OAuth1SignatureMethod = 'HMAC-SHA256'; export const SIGNATURE_METHOD_RSA_SHA1: OAuth1SignatureMethod = 'RSA-SHA1'; export const SIGNATURE_METHOD_PLAINTEXT: OAuth1SignatureMethod = 'PLAINTEXT'; diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js index b8229d73cd..5b4c2d8c5a 100644 --- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js +++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js @@ -116,9 +116,7 @@ describe('authorization_code', () => { bodyCompression: '', parentId: 'req_1', statusCode: 200, - headers: [ - { name: 'Content-Type', value: 'application/x-www-form-urlencoded' } - ] + headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }] })); const result = await getToken( diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js index a1ea0613bf..90b084f546 100644 --- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js +++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js @@ -13,18 +13,9 @@ const STATE = 'state_123'; describe('implicit', () => { beforeEach(globalBeforeEach); it('works in default case', async () => { - createBWRedirectMock( - `${REDIRECT_URI}#access_token=token_123&state=${STATE}&foo=bar` - ); + createBWRedirectMock(`${REDIRECT_URI}#access_token=token_123&state=${STATE}&foo=bar`); - const result = await getToken( - AUTHORIZE_URL, - CLIENT_ID, - REDIRECT_URI, - SCOPE, - STATE, - AUDIENCE - ); + const result = await getToken(AUTHORIZE_URL, CLIENT_ID, REDIRECT_URI, SCOPE, STATE, AUDIENCE); expect(result).toEqual({ access_token: 'token_123', diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js index 28c5034cc2..30680f0e87 100644 --- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js +++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js @@ -111,9 +111,7 @@ describe('password', () => { bodyCompression: '', parentId: 'req_1', statusCode: 200, - headers: [ - { name: 'Content-Type', value: 'application/x-www-form-urlencoded' } - ] + headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }] })); const result = await getToken( diff --git a/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js b/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js index ef7e144c22..744af4a75b 100644 --- a/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js +++ b/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js @@ -1,10 +1,7 @@ // @flow import { parse as urlParse } from 'url'; import * as c from './constants'; -import { - buildQueryStringFromParams, - joinUrlAndQueryString -} from 'insomnia-url'; +import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url'; import { authorizeUserInWindow, responseToObject } from './misc'; import { escapeRegex } from '../../common/misc'; import * as models from '../../models/index'; @@ -30,13 +27,7 @@ export default async function( throw new Error('Invalid access token URL'); } - const authorizeResults = await _authorize( - authorizeUrl, - clientId, - redirectUri, - scope, - state - ); + const authorizeResults = await _authorize(authorizeUrl, clientId, redirectUri, scope, state); // Handle the error if (authorizeResults[c.P_ERROR]) { @@ -58,13 +49,7 @@ export default async function( ); } -async function _authorize( - url, - clientId, - redirectUri = '', - scope = '', - state = '' -) { +async function _authorize(url, clientId, redirectUri = '', scope = '', state = '') { const params = [ { name: c.P_RESPONSE_TYPE, value: c.RESPONSE_TYPE_CODE }, { name: c.P_CLIENT_ID, value: clientId } @@ -81,11 +66,7 @@ async function _authorize( const successRegex = new RegExp(`${escapeRegex(redirectUri)}.*(code=)`, 'i'); const failureRegex = new RegExp(`${escapeRegex(redirectUri)}.*(error=)`, 'i'); - const redirectedTo = await authorizeUserInWindow( - finalUrl, - successRegex, - failureRegex - ); + const redirectedTo = await authorizeUserInWindow(finalUrl, successRegex, failureRegex); console.log('[oauth2] Detected redirect ' + redirectedTo); diff --git a/packages/insomnia-app/app/network/o-auth-2/grant-implicit.js b/packages/insomnia-app/app/network/o-auth-2/grant-implicit.js index 86568912ec..91d34c440f 100644 --- a/packages/insomnia-app/app/network/o-auth-2/grant-implicit.js +++ b/packages/insomnia-app/app/network/o-auth-2/grant-implicit.js @@ -1,9 +1,6 @@ // @flow import * as c from './constants'; -import { - buildQueryStringFromParams, - joinUrlAndQueryString -} from 'insomnia-url'; +import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url'; import { responseToObject, authorizeUserInWindow } from './misc'; export default async function( @@ -39,11 +36,7 @@ export default async function( const qs = buildQueryStringFromParams(params); const finalUrl = joinUrlAndQueryString(authorizationUrl, qs); - const redirectedTo = await authorizeUserInWindow( - finalUrl, - /(access_token=)/, - /(error=)/ - ); + const redirectedTo = await authorizeUserInWindow(finalUrl, /(access_token=)/, /(error=)/); const fragment = redirectedTo.split('#')[1]; if (fragment) { diff --git a/packages/insomnia-app/app/network/o-auth-2/misc.js b/packages/insomnia-app/app/network/o-auth-2/misc.js index 878481a6de..6220403ae0 100644 --- a/packages/insomnia-app/app/network/o-auth-2/misc.js +++ b/packages/insomnia-app/app/network/o-auth-2/misc.js @@ -81,13 +81,10 @@ export function authorizeUserInWindow( _parseUrl(currentUrl); }); - child.webContents.on( - 'did-fail-load', - (e, errorCode, errorDescription, url) => { - // Listen for did-fail-load to be able to parse the URL even when the callback server is unreachable - _parseUrl(url); - } - ); + child.webContents.on('did-fail-load', (e, errorCode, errorDescription, url) => { + // Listen for did-fail-load to be able to parse the URL even when the callback server is unreachable + _parseUrl(url); + }); // Show the window to the user after it loads child.on('ready-to-show', child.show.bind(child)); diff --git a/packages/insomnia-app/app/network/o-auth-2/refresh-token.js b/packages/insomnia-app/app/network/o-auth-2/refresh-token.js index da46580e4c..34ca0608e3 100644 --- a/packages/insomnia-app/app/network/o-auth-2/refresh-token.js +++ b/packages/insomnia-app/app/network/o-auth-2/refresh-token.js @@ -49,9 +49,7 @@ export default async function( const statusCode = response.statusCode || 0; if (statusCode < 200 || statusCode >= 300) { - throw new Error( - `[oauth2] Failed to refresh token url=${url} status=${statusCode}` - ); + throw new Error(`[oauth2] Failed to refresh token url=${url} status=${statusCode}`); } const bodyBuffer = models.response.getBodyBuffer(response); diff --git a/packages/insomnia-app/app/network/url-matches-cert-host.js b/packages/insomnia-app/app/network/url-matches-cert-host.js index ac0cd5931a..74f1b30780 100644 --- a/packages/insomnia-app/app/network/url-matches-cert-host.js +++ b/packages/insomnia-app/app/network/url-matches-cert-host.js @@ -8,9 +8,7 @@ const DEFAULT_PORT = 443; export function urlMatchesCertHost(certificateHost, requestUrl) { const cHostWithProtocol = setDefaultProtocol(certificateHost, 'https:'); const { hostname, port } = urlParse(requestUrl); - const { hostname: cHostname, port: cPort } = certificateUrlParse( - cHostWithProtocol - ); + const { hostname: cHostname, port: cPort } = certificateUrlParse(cHostWithProtocol); const assumedPort = parseInt(port) || DEFAULT_PORT; const assumedCPort = parseInt(cPort) || DEFAULT_PORT; diff --git a/packages/insomnia-app/app/plugins/context/__tests__/data.test.js b/packages/insomnia-app/app/plugins/context/__tests__/data.test.js index a9188a0fb3..e0d463aac4 100644 --- a/packages/insomnia-app/app/plugins/context/__tests__/data.test.js +++ b/packages/insomnia-app/app/plugins/context/__tests__/data.test.js @@ -40,10 +40,7 @@ describe('app.import.*', () => { expect(await db.count(models.request.type)).toBe(0); const result = plugin.init(PLUGIN); - const filename = path.resolve( - __dirname, - '../__fixtures__/basic-import.json' - ); + const filename = path.resolve(__dirname, '../__fixtures__/basic-import.json'); await result.import.uri(`file://${filename}`); const allWorkspaces = await db.all(models.workspace.type); @@ -93,10 +90,7 @@ describe('app.import.*', () => { expect(await db.count(models.request.type)).toBe(0); const result = plugin.init(PLUGIN); - const filename = path.resolve( - __dirname, - '../__fixtures__/basic-import.json' - ); + const filename = path.resolve(__dirname, '../__fixtures__/basic-import.json'); await result.import.raw(fs.readFileSync(filename, 'utf8')); const allWorkspaces = await db.all(models.workspace.type); diff --git a/packages/insomnia-app/app/plugins/context/__tests__/request.test.js b/packages/insomnia-app/app/plugins/context/__tests__/request.test.js index 95d4370819..f9f9c23343 100644 --- a/packages/insomnia-app/app/plugins/context/__tests__/request.test.js +++ b/packages/insomnia-app/app/plugins/context/__tests__/request.test.js @@ -54,11 +54,7 @@ describe('init()', () => { }); it('initializes correctly in read-only mode', async () => { - const result = plugin.init( - await models.request.getById('req_1'), - CONTEXT, - true - ); + const result = plugin.init(await models.request.getById('req_1'), CONTEXT, true); expect(Object.keys(result)).toEqual(['request']); expect(Object.keys(result.request).sort()).toEqual([ 'getBodyText', @@ -78,9 +74,7 @@ describe('init()', () => { }); it('fails to initialize without request', () => { - expect(() => plugin.init()).toThrowError( - 'contexts.request initialized without request' - ); + expect(() => plugin.init()).toThrowError('contexts.request initialized without request'); }); }); @@ -97,10 +91,7 @@ describe('request.*', () => { { name: 'hello', value: 'world' }, { name: 'Content-Type', value: 'application/json' } ], - parameters: [ - { name: 'foo', value: 'bar' }, - { name: 'message', value: 'Hello World!' } - ] + parameters: [{ name: 'foo', value: 'bar' }, { name: 'message', value: 'Hello World!' }] }); }); @@ -202,14 +193,9 @@ describe('request.*', () => { }); // getEnvironmentVariable - expect(result.request.getEnvironmentVariable('user_key')).toBe( - 'my_user_key' - ); + expect(result.request.getEnvironmentVariable('user_key')).toBe('my_user_key'); expect(result.request.getEnvironmentVariable('hello')).toBe('world'); - expect(result.request.getEnvironmentVariable('array_test')).toEqual([ - 'a', - 'b' - ]); + expect(result.request.getEnvironmentVariable('array_test')).toEqual(['a', 'b']); expect(result.request.getEnvironmentVariable('object_test')).toEqual({ a: 'A', b: 'B' diff --git a/packages/insomnia-app/app/plugins/context/__tests__/response.test.js b/packages/insomnia-app/app/plugins/context/__tests__/response.test.js index 59df52c802..12afaa9f2e 100644 --- a/packages/insomnia-app/app/plugins/context/__tests__/response.test.js +++ b/packages/insomnia-app/app/plugins/context/__tests__/response.test.js @@ -25,9 +25,7 @@ describe('init()', () => { }); it('fails to initialize without response', () => { - expect(() => plugin.init()).toThrowError( - 'contexts.response initialized without response' - ); + expect(() => plugin.init()).toThrowError('contexts.response initialized without response'); }); }); @@ -74,10 +72,7 @@ describe('response.*', () => { const result = plugin.init(response); expect(result.response.getHeader('Does-Not-Exist')).toBeNull(); expect(result.response.getHeader('CONTENT-TYPE')).toBe('application/json'); - expect(result.response.getHeader('set-cookie')).toEqual([ - 'foo=bar', - 'baz=qux' - ]); + expect(result.response.getHeader('set-cookie')).toEqual(['foo=bar', 'baz=qux']); expect(result.response.hasHeader('foo')).toBe(false); expect(result.response.hasHeader('ConTent-Type')).toBe(true); }); diff --git a/packages/insomnia-app/app/plugins/context/app.js b/packages/insomnia-app/app/plugins/context/app.js index 4df50f3799..1e2060edb2 100644 --- a/packages/insomnia-app/app/plugins/context/app.js +++ b/packages/insomnia-app/app/plugins/context/app.js @@ -2,14 +2,9 @@ import * as electron from 'electron'; import { showAlert, showPrompt } from '../../ui/components/modals/index'; import type { RenderPurpose } from '../../common/render'; -import { - RENDER_PURPOSE_GENERAL, - RENDER_PURPOSE_SEND -} from '../../common/render'; +import { RENDER_PURPOSE_GENERAL, RENDER_PURPOSE_SEND } from '../../common/render'; -export function init( - renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL -): { app: Object } { +export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): { app: Object } { return { app: { alert(title: string, message?: string): Promise { @@ -55,9 +50,7 @@ export function init( throw new Error(`Unknown path name ${name}`); } }, - async showSaveDialog( - options: { defaultPath?: string } = {} - ): Promise { + async showSaveDialog(options: { defaultPath?: string } = {}): Promise { if (renderPurpose !== RENDER_PURPOSE_SEND) { return Promise.resolve(null); } diff --git a/packages/insomnia-app/app/plugins/context/data.js b/packages/insomnia-app/app/plugins/context/data.js index 92aeffe83a..ef2f5d0c87 100644 --- a/packages/insomnia-app/app/plugins/context/data.js +++ b/packages/insomnia-app/app/plugins/context/data.js @@ -1,31 +1,18 @@ // @flow -import { - exportHAR, - exportJSON, - importRaw, - importUri -} from '../../common/import'; +import { exportHAR, exportJSON, importRaw, importUri } from '../../common/import'; export function init(): { import: Object, export: Object } { return { import: { - async uri( - uri: string, - options: { workspaceId?: string } = {} - ): Promise { + async uri(uri: string, options: { workspaceId?: string } = {}): Promise { await importUri(options.workspaceId || null, uri); }, - async raw( - text: string, - options: { workspaceId?: string } = {} - ): Promise { + async raw(text: string, options: { workspaceId?: string } = {}): Promise { await importRaw(options.workspaceId || null, text); } }, export: { - async insomnia( - options: { includePrivate?: boolean } = {} - ): Promise { + async insomnia(options: { includePrivate?: boolean } = {}): Promise { options = options || {}; return exportJSON(null, options.includePrivate); }, diff --git a/packages/insomnia-app/app/plugins/context/request.js b/packages/insomnia-app/app/plugins/context/request.js index c892c58e4e..273d1399f9 100644 --- a/packages/insomnia-app/app/plugins/context/request.js +++ b/packages/insomnia-app/app/plugins/context/request.js @@ -38,9 +38,7 @@ export function init( renderedRequest.cookies.push({ name, value }); } }, - getEnvironmentVariable( - name: string - ): string | number | boolean | Object | Array | null { + getEnvironmentVariable(name: string): string | number | boolean | Object | Array | null { return renderedContext[name]; }, getEnvironment(): Object { @@ -79,9 +77,7 @@ export function init( }, removeHeader(name: string): void { const headers = misc.filterHeaders(renderedRequest.headers, name); - renderedRequest.headers = renderedRequest.headers.filter( - h => !headers.includes(h) - ); + renderedRequest.headers = renderedRequest.headers.filter(h => !headers.includes(h)); }, setHeader(name: string, value: string): void { const header = misc.filterHeaders(renderedRequest.headers, name)[0]; @@ -98,10 +94,7 @@ export function init( } }, getParameter(name: string): string | null { - const parameters = misc.filterParameters( - renderedRequest.parameters, - name - ); + const parameters = misc.filterParameters(renderedRequest.parameters, name); if (parameters.length) { // Use the last parameter if there are multiple of the same const parameter = parameters[parameters.length - 1]; @@ -120,19 +113,11 @@ export function init( return this.getParameter(name) !== null; }, removeParameter(name: string): void { - const parameters = misc.filterParameters( - renderedRequest.parameters, - name - ); - renderedRequest.parameters = renderedRequest.parameters.filter( - p => !parameters.includes(p) - ); + const parameters = misc.filterParameters(renderedRequest.parameters, name); + renderedRequest.parameters = renderedRequest.parameters.filter(p => !parameters.includes(p)); }, setParameter(name: string, value: string): void { - const parameter = misc.filterParameters( - renderedRequest.parameters, - name - )[0]; + const parameter = misc.filterParameters(renderedRequest.parameters, name)[0]; if (parameter) { parameter.value = value; } else { @@ -140,10 +125,7 @@ export function init( } }, addParameter(name: string, value: string): void { - const parameter = misc.filterParameters( - renderedRequest.parameters, - name - )[0]; + const parameter = misc.filterParameters(renderedRequest.parameters, name)[0]; if (!parameter) { renderedRequest.parameters.push({ name, value }); } diff --git a/packages/insomnia-app/app/plugins/context/response.js b/packages/insomnia-app/app/plugins/context/response.js index 90b7836456..bd22ae8fae 100644 --- a/packages/insomnia-app/app/plugins/context/response.js +++ b/packages/insomnia-app/app/plugins/context/response.js @@ -59,9 +59,7 @@ export function init(response: MaybeResponse): { response: Object } { }, getHeader(name: string): string | Array | null { const headers = response.headers || []; - const matchedHeaders = headers.filter( - h => h.name.toLowerCase() === name.toLowerCase() - ); + const matchedHeaders = headers.filter(h => h.name.toLowerCase() === name.toLowerCase()); if (matchedHeaders.length > 1) { return matchedHeaders.map(h => h.value); } else if (matchedHeaders.length === 1) { diff --git a/packages/insomnia-app/app/plugins/index.js b/packages/insomnia-app/app/plugins/index.js index a217c12035..fd0221560f 100644 --- a/packages/insomnia-app/app/plugins/index.js +++ b/packages/insomnia-app/app/plugins/index.js @@ -102,11 +102,7 @@ async function _traversePluginPath(pluginMap: Object, allPaths: Array) { // Delete require cache entry and re-require const module = global.require(modulePath); - pluginMap[pluginJson.name] = _initPlugin( - pluginJson || {}, - module, - modulePath - ); + pluginMap[pluginJson.name] = _initPlugin(pluginJson || {}, module, modulePath); console.log(`[plugin] Loaded ${modulePath}`); } catch (err) { showError({ @@ -119,9 +115,7 @@ async function _traversePluginPath(pluginMap: Object, allPaths: Array) { } } -export async function getPlugins( - force: boolean = false -): Promise> { +export async function getPlugins(force: boolean = false): Promise> { if (force) { plugins = null; } @@ -166,10 +160,7 @@ export async function getTemplateTags(): Promise> { let extensions = []; for (const plugin of await getPlugins()) { const templateTags = plugin.module.templateTags || []; - extensions = [ - ...extensions, - ...templateTags.map(tt => ({ plugin, templateTag: tt })) - ]; + extensions = [...extensions, ...templateTags.map(tt => ({ plugin, templateTag: tt }))]; } return extensions; @@ -179,10 +170,7 @@ export async function getRequestHooks(): Promise> { let functions = []; for (const plugin of await getPlugins()) { const moreFunctions = plugin.module.requestHooks || []; - functions = [ - ...functions, - ...moreFunctions.map(hook => ({ plugin, hook })) - ]; + functions = [...functions, ...moreFunctions.map(hook => ({ plugin, hook }))]; } return functions; @@ -192,10 +180,7 @@ export async function getResponseHooks(): Promise> { let functions = []; for (const plugin of await getPlugins()) { const moreFunctions = plugin.module.responseHooks || []; - functions = [ - ...functions, - ...moreFunctions.map(hook => ({ plugin, hook })) - ]; + functions = [...functions, ...moreFunctions.map(hook => ({ plugin, hook }))]; } return functions; diff --git a/packages/insomnia-app/app/plugins/misc.js b/packages/insomnia-app/app/plugins/misc.js index dbff03fecd..e544553da0 100644 --- a/packages/insomnia-app/app/plugins/misc.js +++ b/packages/insomnia-app/app/plugins/misc.js @@ -77,16 +77,8 @@ export async function generateThemeCSS(theme: PluginTheme): Promise { const styles = renderedTheme.styles; // Dropdown Menus - css += wrapStyles( - n, - '.theme--dropdown__menu', - getThemeBlockCSS(styles.dialog) - ); - css += wrapStyles( - n, - '.theme--dropdown__menu', - getThemeBlockCSS(styles.dropdown) - ); + css += wrapStyles(n, '.theme--dropdown__menu', getThemeBlockCSS(styles.dialog)); + css += wrapStyles(n, '.theme--dropdown__menu', getThemeBlockCSS(styles.dropdown)); // Tooltips css += wrapStyles(n, '.theme--tooltip', getThemeBlockCSS(styles.dialog)); @@ -101,37 +93,17 @@ export async function generateThemeCSS(theme: PluginTheme): Promise { // Dialogs css += wrapStyles(n, '.theme--dialog', getThemeBlockCSS(styles.dialog)); - css += wrapStyles( - n, - '.theme--dialog__header', - getThemeBlockCSS(styles.dialogHeader) - ); - css += wrapStyles( - n, - '.theme--dialog__footer', - getThemeBlockCSS(styles.dialogFooter) - ); + css += wrapStyles(n, '.theme--dialog__header', getThemeBlockCSS(styles.dialogHeader)); + css += wrapStyles(n, '.theme--dialog__footer', getThemeBlockCSS(styles.dialogFooter)); // Panes css += wrapStyles(n, '.theme--pane', getThemeBlockCSS(styles.pane)); - css += wrapStyles( - n, - '.theme--pane__header', - getThemeBlockCSS(styles.paneHeader) - ); + css += wrapStyles(n, '.theme--pane__header', getThemeBlockCSS(styles.paneHeader)); // Sidebar Styles css += wrapStyles(n, '.theme--sidebar', getThemeBlockCSS(styles.sidebar)); - css += wrapStyles( - n, - '.theme--sidebar__list', - getThemeBlockCSS(styles.sidebarList) - ); - css += wrapStyles( - n, - '.theme--sidebar__header', - getThemeBlockCSS(styles.sidebarHeader) - ); + css += wrapStyles(n, '.theme--sidebar__list', getThemeBlockCSS(styles.sidebarList)); + css += wrapStyles(n, '.theme--sidebar__header', getThemeBlockCSS(styles.sidebarHeader)); // Link css += wrapStyles(n, '.theme--link', getThemeBlockCSS(styles.link)); diff --git a/packages/insomnia-app/app/sync/__tests__/crypt.test.js b/packages/insomnia-app/app/sync/__tests__/crypt.test.js index ff199ab754..c3f36b18ad 100644 --- a/packages/insomnia-app/app/sync/__tests__/crypt.test.js +++ b/packages/insomnia-app/app/sync/__tests__/crypt.test.js @@ -15,11 +15,7 @@ describe('deriveKey()', () => { describe('encryptRSA', () => { beforeEach(globalBeforeEach); it('encrypts and decrypts', () => { - const resultEncrypted = crypt.encryptAES( - 'rawkey', - 'Hello World!', - 'additional data' - ); + const resultEncrypted = crypt.encryptAES('rawkey', 'Hello World!', 'additional data'); const resultDecrypted = crypt.decryptAES('rawkey', resultEncrypted); const expectedEncrypted = { diff --git a/packages/insomnia-app/app/sync/crypt.js b/packages/insomnia-app/app/sync/crypt.js index 68437d39f9..87650a69d4 100644 --- a/packages/insomnia-app/app/sync/crypt.js +++ b/packages/insomnia-app/app/sync/crypt.js @@ -79,8 +79,7 @@ export function recryptRSAWithJWK(privateJWK, publicJWK, encryptedBlob) { */ export function encryptAES(jwkOrKey, plaintext, additionalData = '') { // TODO: Add assertion checks for JWK - const rawKey = - typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k); + const rawKey = typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k); const key = forge.util.hexToBytes(rawKey); const iv = forge.random.getBytesSync(12); @@ -110,8 +109,7 @@ export function encryptAES(jwkOrKey, plaintext, additionalData = '') { */ export function decryptAES(jwkOrKey, message) { // TODO: Add assertion checks for JWK - const rawKey = - typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k); + const rawKey = typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k); const key = forge.util.hexToBytes(rawKey); // ~~~~~~~~~~~~~~~~~~~~ // @@ -179,11 +177,10 @@ export async function generateAES256Key() { if (subtle) { console.log('[crypt] Using Native AES Key Generation'); - const key = await subtle.generateKey( - { name: 'AES-GCM', length: 256 }, - true, - ['encrypt', 'decrypt'] - ); + const key = await subtle.generateKey({ name: 'AES-GCM', length: 256 }, true, [ + 'encrypt', + 'decrypt' + ]); return subtle.exportKey('jwk', key); } else { console.log('[crypt] Using Fallback Forge AES Key Generation'); @@ -270,9 +267,7 @@ export async function generateKeyPairJWK() { function _hkdfSalt(rawSalt, rawEmail) { return new Promise(resolve => { const hkdf = new HKDF('sha256', rawSalt, rawEmail); - hkdf.derive('', DEFAULT_BYTE_LENGTH, buffer => - resolve(buffer.toString('hex')) - ); + hkdf.derive('', DEFAULT_BYTE_LENGTH, buffer => resolve(buffer.toString('hex'))); }); } @@ -330,11 +325,7 @@ async function _pbkdf2Passphrase(passphrase, salt) { hash: 'SHA-256' }; - const derivedKeyRaw = await window.crypto.subtle.deriveBits( - algo, - k, - DEFAULT_BYTE_LENGTH * 8 - ); + const derivedKeyRaw = await window.crypto.subtle.deriveBits(algo, k, DEFAULT_BYTE_LENGTH * 8); return Buffer.from(derivedKeyRaw).toString('hex'); } else { console.log('[crypt] Using Forge PBKDF2'); diff --git a/packages/insomnia-app/app/sync/session.js b/packages/insomnia-app/app/sync/session.js index 90ce5f089f..52344ebfd4 100644 --- a/packages/insomnia-app/app/sync/session.js +++ b/packages/insomnia-app/app/sync/session.js @@ -67,10 +67,7 @@ export async function login(rawEmail, rawPassphrase) { } = await whoami(sessionId); const derivedSymmetricKey = await crypt.deriveKey(passphrase, email, saltEnc); - const symmetricKeyStr = await crypt.decryptAES( - derivedSymmetricKey, - JSON.parse(encSymmetricKey) - ); + const symmetricKeyStr = await crypt.decryptAES(derivedSymmetricKey, JSON.parse(encSymmetricKey)); // Store the information for later setSessionData( @@ -85,11 +82,7 @@ export async function login(rawEmail, rawPassphrase) { ); } -export function syncCreateResourceGroup( - parentResourceId, - name, - encSymmetricKey -) { +export function syncCreateResourceGroup(parentResourceId, name, encSymmetricKey) { return util.post('/api/resource_groups', { parentResourceId, name, @@ -123,10 +116,9 @@ export function unshareWithAllTeams(resourceGroupId) { export async function shareWithTeam(resourceGroupId, teamId, rawPassphrase) { // Ask the server what we need to do to invite the member - const instructions = await util.post( - `/api/resource_groups/${resourceGroupId}/share-a`, - { teamId } - ); + const instructions = await util.post(`/api/resource_groups/${resourceGroupId}/share-a`, { + teamId + }); // Compute keys necessary to invite the member const passPhrase = _sanitizePassphrase(rawPassphrase); @@ -138,10 +130,7 @@ export async function shareWithTeam(resourceGroupId, teamId, rawPassphrase) { } catch (err) { throw new Error('Invalid password'); } - const privateKey = crypt.decryptAES( - JSON.parse(symmetricKey), - JSON.parse(encPrivateKey) - ); + const privateKey = crypt.decryptAES(JSON.parse(symmetricKey), JSON.parse(encPrivateKey)); const privateKeyJWK = JSON.parse(privateKey); const resourceGroupSymmetricKey = crypt.decryptRSAWithJWK( privateKeyJWK, @@ -152,10 +141,7 @@ export async function shareWithTeam(resourceGroupId, teamId, rawPassphrase) { const newKeys = {}; for (const accountId of Object.keys(instructions.keys)) { const accountPublicKeyJWK = JSON.parse(instructions.keys[accountId]); - newKeys[accountId] = crypt.encryptRSAWithJWK( - accountPublicKeyJWK, - resourceGroupSymmetricKey - ); + newKeys[accountId] = crypt.encryptRSAWithJWK(accountPublicKeyJWK, resourceGroupSymmetricKey); } // Actually share it with the team diff --git a/packages/insomnia-app/app/sync/storage.js b/packages/insomnia-app/app/sync/storage.js index d1cc55b348..4acd866e05 100644 --- a/packages/insomnia-app/app/sync/storage.js +++ b/packages/insomnia-app/app/sync/storage.js @@ -55,18 +55,14 @@ export async function findResources(query = {}) { export async function findActiveResources(query) { const configs = await findActiveConfigs(); const resourceGroupIds = configs.map(c => c.resourceGroupId); - return findResources( - Object.assign({ resourceGroupId: { $in: resourceGroupIds } }, query) - ); + return findResources(Object.assign({ resourceGroupId: { $in: resourceGroupIds } }, query)); } export async function findActiveDirtyResources() { return findActiveResources({ dirty: true }); } -export async function findActiveDirtyResourcesForResourceGroup( - resourceGroupId -) { +export async function findActiveDirtyResourcesForResourceGroup(resourceGroupId) { return findActiveResources({ dirty: true, resourceGroupId }); } @@ -134,12 +130,7 @@ export async function updateResource(resource, ...patches) { } export async function removeResource(resource) { - await _execDB( - TYPE_RESOURCE, - 'remove', - { _id: resource._id }, - { multi: true } - ); + await _execDB(TYPE_RESOURCE, 'remove', { _id: resource._id }, { multi: true }); _notifyChange(); } @@ -219,9 +210,7 @@ export function initDB(config, forceReset) { Object.assign({ filename: resourcePath, autoload: true }, config) ); - _database['Config'] = new NeDB( - Object.assign({ filename: configPath, autoload: true }, config) - ); + _database['Config'] = new NeDB(Object.assign({ filename: configPath, autoload: true }, config)); for (const key of Object.keys(_database)) { _database[key].persistence.setAutocompactionInterval(DB_PERSIST_INTERVAL); diff --git a/packages/insomnia-app/app/templating/__tests__/utils.test.js b/packages/insomnia-app/app/templating/__tests__/utils.test.js index 64e28b6680..02d2e052d4 100644 --- a/packages/insomnia-app/app/templating/__tests__/utils.test.js +++ b/packages/insomnia-app/app/templating/__tests__/utils.test.js @@ -45,9 +45,7 @@ describe('getKeys()', () => { describe('tokenizeTag()', () => { beforeEach(globalBeforeEach); it('tokenizes complex tag', () => { - const actual = utils.tokenizeTag( - `{% name bar, "baz \\"qux\\"" , 1 + 5 | default("foo") %}` - ); + const actual = utils.tokenizeTag(`{% name bar, "baz \\"qux\\"" , 1 + 5 | default("foo") %}`); const expected = { name: 'name', @@ -67,10 +65,7 @@ describe('tokenizeTag()', () => { const expected = { name: 'name', - args: [ - { type: 'string', value: 'foo', quotedBy: "'" }, - { type: 'variable', value: 'bar' } - ] + args: [{ type: 'string', value: 'foo', quotedBy: "'" }, { type: 'variable', value: 'bar' }] }; expect(minimal).toEqual(expected); @@ -108,19 +103,14 @@ describe('tokenizeTag()', () => { const expected = { name: 'name', - args: [ - { type: 'boolean', value: true }, - { type: 'boolean', value: false } - ] + args: [{ type: 'boolean', value: true }, { type: 'boolean', value: false }] }; expect(actual).toEqual(expected); }); it('handles type expression', () => { - const actual = utils.tokenizeTag( - `{% name 5 * 10 + 'hello' | default(2 - 3) %}` - ); + const actual = utils.tokenizeTag(`{% name 5 * 10 + 'hello' | default(2 - 3) %}`); const expected = { name: 'name', @@ -160,10 +150,7 @@ describe('unTokenizeTag()', () => { it('fixes missing quotedBy attribute', () => { const tagData = { name: 'name', - args: [ - { type: 'file', value: 'foo/bar/baz' }, - { type: 'model', value: 'foo' } - ] + args: [{ type: 'file', value: 'foo/bar/baz' }, { type: 'model', value: 'foo' }] }; const result = utils.unTokenizeTag(tagData); diff --git a/packages/insomnia-app/app/templating/base-extension.js b/packages/insomnia-app/app/templating/base-extension.js index f006abc92b..9ef12c39f5 100644 --- a/packages/insomnia-app/app/templating/base-extension.js +++ b/packages/insomnia-app/app/templating/base-extension.js @@ -64,14 +64,10 @@ export default class BaseExtension { const renderMeta = renderContext.getMeta ? renderContext.getMeta() : {}; // Pull out the purpose - const renderPurpose = renderContext.getPurpose - ? renderContext.getPurpose() - : null; + const renderPurpose = renderContext.getPurpose ? renderContext.getPurpose() : null; // Extract the rest of the args - const args = runArgs - .slice(0, runArgs.length - 1) - .filter(a => a !== EMPTY_ARG); + const args = runArgs.slice(0, runArgs.length - 1).filter(a => a !== EMPTY_ARG); // Define a helper context with utils const helperContext = { diff --git a/packages/insomnia-app/app/templating/extensions/index.js b/packages/insomnia-app/app/templating/extensions/index.js index 9131e959ff..3beee1b881 100644 --- a/packages/insomnia-app/app/templating/extensions/index.js +++ b/packages/insomnia-app/app/templating/extensions/index.js @@ -69,10 +69,7 @@ export type PluginTemplateTagContext = { }, response: { getLatestForRequestId: (id: string) => Promise, - getBodyBuffer: ( - response: Response, - fallback?: any - ) => Promise + getBodyBuffer: (response: Response, fallback?: any) => Promise } } } @@ -83,10 +80,7 @@ export type PluginTemplateTag = { name: string, displayName: DisplayName, description: string, - run: ( - context: PluginTemplateTagContext, - ...arg: Array - ) => Promise | any, + run: (context: PluginTemplateTagContext, ...arg: Array) => Promise | any, deprecated?: boolean, validate?: (value: any) => ?string, priority?: number diff --git a/packages/insomnia-app/app/templating/index.js b/packages/insomnia-app/app/templating/index.js index ade6c6fb93..6ecbcad926 100644 --- a/packages/insomnia-app/app/templating/index.js +++ b/packages/insomnia-app/app/templating/index.js @@ -52,9 +52,7 @@ export function render( const location = err.message.match(/\[Line (\d)+, Column (\d)*]/); const line = location ? parseInt(location[1]) : 1; const column = location ? parseInt(location[2]) : 1; - const reason = err.message.includes( - 'attempted to output null or undefined value' - ) + const reason = err.message.includes('attempted to output null or undefined value') ? 'undefined' : 'error'; diff --git a/packages/insomnia-app/app/templating/utils.js b/packages/insomnia-app/app/templating/utils.js index 2a2a473cd5..5b2d9e14c6 100644 --- a/packages/insomnia-app/app/templating/utils.js +++ b/packages/insomnia-app/app/templating/utils.js @@ -25,10 +25,7 @@ export type NunjucksParsedTag = { * @param {String} [prefix] - base path to prefix to all paths * @returns {Array} - list of paths */ -export function getKeys( - obj: any, - prefix: string = '' -): Array<{ name: string, value: any }> { +export function getKeys(obj: any, prefix: string = ''): Array<{ name: string, value: any }> { let allKeys = []; const typeOfObj = Object.prototype.toString.call(obj); @@ -170,16 +167,12 @@ export function unTokenizeTag(tagData: NunjucksParsedTag): string { } /** Get the default Nunjucks string for an extension */ -export function getDefaultFill( - name: string, - args: Array -): string { +export function getDefaultFill(name: string, args: Array): string { const stringArgs: Array = (args || []).map(argDefinition => { switch (argDefinition.type) { case 'enum': const { defaultValue, options } = argDefinition; - const value = - defaultValue !== undefined ? defaultValue : options[0].value; + const value = defaultValue !== undefined ? defaultValue : options[0].value; return `'${value}'`; case 'number': return `${parseFloat(argDefinition.defaultValue) || 0}`; diff --git a/packages/insomnia-app/app/ui/components/base/copy-button.js b/packages/insomnia-app/app/ui/components/base/copy-button.js index 93eb9c2b58..506a11a417 100644 --- a/packages/insomnia-app/app/ui/components/base/copy-button.js +++ b/packages/insomnia-app/app/ui/components/base/copy-button.js @@ -17,9 +17,7 @@ class CopyButton extends PureComponent { e.stopPropagation(); const content = - typeof this.props.content === 'string' - ? this.props.content - : await this.props.content(); + typeof this.props.content === 'string' ? this.props.content : await this.props.content(); if (content) { clipboard.writeText(content); @@ -46,8 +44,7 @@ class CopyButton extends PureComponent { } = this.props; const { showConfirmation } = this.state; - const confirm = - typeof confirmMessage === 'string' ? confirmMessage : 'Copied'; + const confirm = typeof confirmMessage === 'string' ? confirmMessage : 'Copied'; return ( ); } return ( -
+
{children}
{closeButton}
diff --git a/packages/insomnia-app/app/ui/components/base/modal.js b/packages/insomnia-app/app/ui/components/base/modal.js index f3cbb25d9b..cc2a3ac86d 100644 --- a/packages/insomnia-app/app/ui/components/base/modal.js +++ b/packages/insomnia-app/app/ui/components/base/modal.js @@ -56,10 +56,7 @@ class Modal extends PureComponent { let shouldHide = false; for (let i = 0; i < 5; i++) { - if ( - target instanceof HTMLElement && - target.hasAttribute('data-close-modal') - ) { + if (target instanceof HTMLElement && target.hasAttribute('data-close-modal')) { shouldHide = true; break; } @@ -141,10 +138,7 @@ class Modal extends PureComponent { className={classes} style={styles} onClick={this._handleClick}> -
+
{children} diff --git a/packages/insomnia-app/app/ui/components/base/prompt-button.js b/packages/insomnia-app/app/ui/components/base/prompt-button.js index 50289ef814..5c24db3794 100644 --- a/packages/insomnia-app/app/ui/components/base/prompt-button.js +++ b/packages/insomnia-app/app/ui/components/base/prompt-button.js @@ -89,11 +89,7 @@ class PromptButton extends PureComponent { innerMsg = ( - {finalConfirmMessage ? ( - {finalConfirmMessage} - ) : ( - '' - )} + {finalConfirmMessage ? {finalConfirmMessage} : ''} ); } else if (state === STATE_ASK) { @@ -109,11 +105,7 @@ class PromptButton extends PureComponent { } return ( - ); diff --git a/packages/insomnia-app/app/ui/components/check-for-updates-button.js b/packages/insomnia-app/app/ui/components/check-for-updates-button.js index fe2caf7fe9..c18b3555dd 100644 --- a/packages/insomnia-app/app/ui/components/check-for-updates-button.js +++ b/packages/insomnia-app/app/ui/components/check-for-updates-button.js @@ -42,21 +42,12 @@ class CheckForUpdatesButton extends React.PureComponent { componentDidMount() { electron.ipcRenderer.on('updater.check.status', this._listenerCheckStatus); - electron.ipcRenderer.on( - 'updater.check.complete', - this._listenerCheckComplete - ); + electron.ipcRenderer.on('updater.check.complete', this._listenerCheckComplete); } componentWillUnmount() { - electron.ipcRenderer.removeListener( - 'updater.check.complete', - this._listenerCheckComplete - ); - electron.ipcRenderer.removeListener( - 'updater.check.status', - this._listenerCheckStatus - ); + electron.ipcRenderer.removeListener('updater.check.complete', this._listenerCheckComplete); + electron.ipcRenderer.removeListener('updater.check.status', this._listenerCheckStatus); } render() { @@ -64,10 +55,7 @@ class CheckForUpdatesButton extends React.PureComponent { const { status, checking } = this.state; return ( - ); diff --git a/packages/insomnia-app/app/ui/components/codemirror/code-editor.js b/packages/insomnia-app/app/ui/components/codemirror/code-editor.js index 27dd2667ae..2254e96295 100644 --- a/packages/insomnia-app/app/ui/components/codemirror/code-editor.js +++ b/packages/insomnia-app/app/ui/components/codemirror/code-editor.js @@ -363,7 +363,9 @@ class CodeEditor extends React.Component { } _indentChars() { - return this.codeMirror.getOption('indentWithTabs') ? '\t' : new Array(this.codeMirror.getOption('indentUnit') + 1).join(' '); + return this.codeMirror.getOption('indentWithTabs') + ? '\t' + : new Array(this.codeMirror.getOption('indentUnit') + 1).join(' '); } _handleBeautify() { diff --git a/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js b/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js index f05fa24ff8..991b327ca1 100644 --- a/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js +++ b/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js @@ -43,9 +43,7 @@ async function _highlightNunjucksTags(render) { const vp = this.getViewport(); for (let lineNo = vp.from; lineNo < vp.to; lineNo++) { const line = this.getLineTokens(lineNo); - const tokens = line.filter( - ({ type }) => type && type.indexOf('nunjucks') >= 0 - ); + const tokens = line.filter(({ type }) => type && type.indexOf('nunjucks') >= 0); // Aggregate same tokens const newTokens = []; @@ -53,11 +51,7 @@ async function _highlightNunjucksTags(render) { for (let i = 0; i < tokens.length; i++) { const nextTok = tokens[i]; - if ( - currTok && - currTok.type === nextTok.type && - currTok.end === nextTok.start - ) { + if (currTok && currTok.type === nextTok.type && currTok.end === nextTok.start) { currTok.end = nextTok.end; currTok.string += nextTok.string; } else if (currTok) { @@ -80,8 +74,7 @@ async function _highlightNunjucksTags(render) { const end = { line: lineNo, ch: tok.end }; const cursor = doc.getCursor(); const isSameLine = cursor.line === lineNo; - const isCursorInToken = - isSameLine && cursor.ch > tok.start && cursor.ch < tok.end; + const isCursorInToken = isSameLine && cursor.ch > tok.start && cursor.ch < tok.end; const isFocused = this.hasFocus(); // Show the token again if we're not inside of it. @@ -198,10 +191,7 @@ async function _highlightNunjucksTags(render) { // Clear all the marks that we didn't just modify/add // For example, adding a {% raw %} tag would need to clear everything it wrapped - const marksInViewport = doc.findMarks( - { ch: 0, line: vp.from }, - { ch: 0, line: vp.to } - ); + const marksInViewport = doc.findMarks({ ch: 0, line: vp.from }, { ch: 0, line: vp.to }); for (const mark of marksInViewport) { // Only check marks we created @@ -242,22 +232,16 @@ async function _updateElementText(render, mark, text) { if (tagMatch) { const tagData = tokenizeTag(str); - const tagDefinition = (await getTagDefinitions()).find( - d => d.name === tagData.name - ); + const tagDefinition = (await getTagDefinitions()).find(d => d.name === tagData.name); if (tagDefinition) { // Try rendering these so we can show errors if needed const firstArg = tagDefinition.args[0]; if (firstArg && firstArg.type === 'enum') { const argData = tagData.args[0]; - const foundOption = firstArg.options.find( - d => d.value === argData.value - ); + const foundOption = firstArg.options.find(d => d.value === argData.value); const option = foundOption || firstArg.options[0]; - innerHTML = `${tagDefinition.displayName} ⇒ ${ - option.displayName - }`; + innerHTML = `${tagDefinition.displayName} ⇒ ${option.displayName}`; } else { innerHTML = tagDefinition.displayName || tagData.name; } @@ -284,8 +268,7 @@ async function _updateElementText(render, mark, text) { el.setAttribute('data-ignore', dataIgnore); if (dataError === 'on') { el.setAttribute('data-error', dataError); - el.innerHTML = - '' + innerHTML; + el.innerHTML = '' + innerHTML; } else { el.innerHTML = '' + innerHTML; } diff --git a/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js b/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js index 292cd7a1c7..7a871c42ca 100644 --- a/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js +++ b/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js @@ -1,10 +1,7 @@ import CodeMirror from 'codemirror'; CodeMirror.defineMode('nunjucks', (config, parserConfig) => { - const baseMode = CodeMirror.getMode( - config, - parserConfig.baseMode || 'text/plain' - ); + const baseMode = CodeMirror.getMode(config, parserConfig.baseMode || 'text/plain'); const nunjucksMode = _nunjucksMode(); return CodeMirror.overlayMode(baseMode, nunjucksMode, false); }); diff --git a/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js b/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js index fabb0df614..68d3f80115 100644 --- a/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js +++ b/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js @@ -68,9 +68,7 @@ class OneLineEditor extends PureComponent { if (this._editor) { return this._editor.getSelectionStart(); } else { - console.warn( - 'Tried to get selection start of one-line-editor when ' - ); + console.warn('Tried to get selection start of one-line-editor when '); return this._input.value.length; } } @@ -79,9 +77,7 @@ class OneLineEditor extends PureComponent { if (this._editor) { return this._editor.getSelectionEnd(); } else { - console.warn( - 'Tried to get selection end of one-line-editor when ' - ); + console.warn('Tried to get selection end of one-line-editor when '); return this._input.value.length; } } @@ -91,10 +87,7 @@ class OneLineEditor extends PureComponent { } componentWillUnmount() { - document.body.removeEventListener( - 'mousedown', - this._handleDocumentMousedown - ); + document.body.removeEventListener('mousedown', this._handleDocumentMousedown); } _handleDocumentMousedown(e) { @@ -122,10 +115,7 @@ class OneLineEditor extends PureComponent { * NOTE: we're doing it in a timeout because we don't want to convert if the * mouse goes in an out right away. */ - this._mouseEnterTimeout = setTimeout( - this._convertToEditorPreserveFocus, - 100 - ); + this._mouseEnterTimeout = setTimeout(this._convertToEditorPreserveFocus, 100); } _handleInputMouseLeave() { diff --git a/packages/insomnia-app/app/ui/components/cookie-list.js b/packages/insomnia-app/app/ui/components/cookie-list.js index 410fc9f598..e1d1ab1603 100644 --- a/packages/insomnia-app/app/ui/components/cookie-list.js +++ b/packages/insomnia-app/app/ui/components/cookie-list.js @@ -41,12 +41,7 @@ class CookieList extends React.PureComponent { } render() { - const { - cookies, - handleDeleteAll, - handleShowModifyCookieModal, - handleRender - } = this.props; + const { cookies, handleDeleteAll, handleShowModifyCookieModal, handleRender } = this.props; return (
@@ -65,9 +60,7 @@ class CookieList extends React.PureComponent { Add Cookie - + Delete All @@ -76,20 +69,14 @@ class CookieList extends React.PureComponent { {cookies.map((cookie, i) => { - const cookieString = cookieToString( - toughCookie.Cookie.fromJSON(cookie) - ); + const cookieString = cookieToString(toughCookie.Cookie.fromJSON(cookie)); return ( - - {cookie.domain || ''} - + {cookie.domain || ''} - - {cookieString || ''} - + {cookieString || ''}

diff --git a/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js index 35aa1710db..98498d9d50 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js @@ -1,12 +1,7 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import autobind from 'autobind-decorator'; -import { - Dropdown, - DropdownButton, - DropdownDivider, - DropdownItem -} from '../base/dropdown'; +import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown'; import { showModal } from '../modals'; import AlertModal from '../modals/alert-modal'; import * as models from '../../../models'; @@ -33,13 +28,8 @@ class AuthDropdown extends PureComponent { return; } - const newAuthentication = models.request.newAuth( - type, - this.props.authentication - ); - const defaultAuthentication = models.request.newAuth( - this.props.authentication.type - ); + const newAuthentication = models.request.newAuth(type, this.props.authentication); + const defaultAuthentication = models.request.newAuth(this.props.authentication.type); // Prompt the user if fields will change between new and old for (const key of Object.keys(this.props.authentication)) { @@ -68,11 +58,7 @@ class AuthDropdown extends PureComponent { const currentType = this.props.authentication.type || AUTH_NONE; return ( - {currentType === type ? ( - - ) : ( - - )}{' '} + {currentType === type ? : }{' '} {nameOverride || getAuthTypeName(type, true)} ); diff --git a/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js index 21a5c5037b..5fabc244a0 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js @@ -1,12 +1,7 @@ // @flow import * as React from 'react'; import autobind from 'autobind-decorator'; -import { - Dropdown, - DropdownButton, - DropdownDivider, - DropdownItem -} from '../base/dropdown'; +import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown'; import { CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, @@ -48,8 +43,7 @@ class ContentTypeDropdown extends React.PureComponent { const isEmpty = !hasParams && !hasText && !hasFile; const isFile = body.mimeType === CONTENT_TYPE_FILE; const isMultipartWithFiles = - body.mimeType === CONTENT_TYPE_FORM_DATA && - (body.params || []).find(p => p.type === 'file'); + body.mimeType === CONTENT_TYPE_FORM_DATA && (body.params || []).find(p => p.type === 'file'); const isFormUrlEncoded = body.mimeType === CONTENT_TYPE_FORM_URLENCODED; const isText = !isFile && !isMultipartWithFiles; @@ -64,8 +58,7 @@ class ContentTypeDropdown extends React.PureComponent { if (!isEmpty && !willPreserveText && !willPreserveForm) { await showModal(AlertModal, { title: 'Switch Body Type?', - message: - 'Current body will be lost. Are you sure you want to continue?', + message: 'Current body will be lost. Are you sure you want to continue?', addCancel: true }); } @@ -83,9 +76,7 @@ class ContentTypeDropdown extends React.PureComponent { _renderDropdownItem(mimeType: string | null, forcedName: string = '') { const contentType = - typeof this.props.contentType === 'string' - ? this.props.contentType - : EMPTY_MIME_TYPE; + typeof this.props.contentType === 'string' ? this.props.contentType : EMPTY_MIME_TYPE; const iconClass = mimeType === contentType ? 'fa-check' : 'fa-empty'; diff --git a/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js index e4727245f2..fe51c57516 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js @@ -73,9 +73,7 @@ class EnvironmentsDropdown extends React.PureComponent { } = this.props; // NOTE: Base environment might not exist if the users hasn't managed environments yet. - const baseEnvironment = environments.find( - e => e.parentId === workspace._id - ); + const baseEnvironment = environments.find(e => e.parentId === workspace._id); const subEnvironments = environments .filter(e => e.parentId === (baseEnvironment && baseEnvironment._id)) .sort((e1, e2) => e1.metaSortKey - e2.metaSortKey); diff --git a/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js index 3278520054..14a3214441 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js @@ -1,12 +1,7 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import autobind from 'autobind-decorator'; -import { - Dropdown, - DropdownButton, - DropdownDivider, - DropdownItem -} from '../base/dropdown'; +import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown'; import * as constants from '../../../common/constants'; import { showPrompt } from '../modals/index'; @@ -40,10 +35,7 @@ class MethodDropdown extends PureComponent { hints: recentMethods, onDeleteHint: method => { recentMethods = recentMethods.filter(m => m !== method); - window.localStorage.setItem( - LOCALSTORAGE_KEY, - JSON.stringify(recentMethods) - ); + window.localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(recentMethods)); }, onComplete: method => { // Don't add empty methods @@ -59,10 +51,7 @@ class MethodDropdown extends PureComponent { // Save method as recent recentMethods = recentMethods.filter(m => m !== method); recentMethods.unshift(method); - window.localStorage.setItem( - LOCALSTORAGE_KEY, - JSON.stringify(recentMethods) - ); + window.localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(recentMethods)); // Invoke callback this.props.onChange(method); @@ -86,10 +75,7 @@ class MethodDropdown extends PureComponent { ...extraProps } = this.props; return ( - + {method} diff --git a/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js index d36bf01ec8..858926ebb1 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js @@ -1,12 +1,7 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import autobind from 'autobind-decorator'; -import { - Dropdown, - DropdownButton, - DropdownDivider, - DropdownItem -} from '../base/dropdown'; +import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown'; import { getPreviewModeName, PREVIEW_MODES } from '../../../common/constants'; @autobind @@ -19,11 +14,7 @@ class PreviewModeDropdown extends PureComponent { const { previewMode } = this.props; return ( - {previewMode === mode ? ( - - ) : ( - - )} + {previewMode === mode ? : } {getPreviewModeName(mode, true)} ); diff --git a/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js index efe21da62c..c9613574f6 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js @@ -63,10 +63,7 @@ class RequestActionsDropdown extends PureComponent { Copy as Curl - + Delete diff --git a/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js index 4b88e4601f..4119fa255b 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js @@ -92,10 +92,7 @@ class RequestGroupActionsDropdown extends PureComponent { Move - + Delete diff --git a/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js index f9feafdf57..191e8755fa 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js @@ -1,12 +1,7 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import autobind from 'autobind-decorator'; -import { - Dropdown, - DropdownButton, - DropdownDivider, - DropdownItem -} from '../base/dropdown'; +import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown'; import StatusTag from '../tags/status-tag'; import URLTag from '../tags/url-tag'; import PromptButton from '../base/prompt-button'; @@ -57,11 +52,7 @@ class ResponseHistoryDropdown extends PureComponent { disabled={active} value={i === 0 ? null : response} onClick={this._handleSetActiveResponse}> - {active ? ( - - ) : ( - - )}{' '} + {active ? : }{' '} - - {!response.requestVersionId && ( - - )} + + {!response.requestVersionId && } ); } @@ -91,8 +76,7 @@ class ResponseHistoryDropdown extends PureComponent { ...extraProps } = this.props; - const isLatestResponseActive = - !responses.length || activeResponse._id === responses[0]._id; + const isLatestResponseActive = !responses.length || activeResponse._id === responses[0]._id; return ( @@ -100,9 +84,7 @@ class ResponseHistoryDropdown extends PureComponent { ref={this._setDropdownRef} key={activeResponse ? activeResponse._id : 'n/a'} {...extraProps}> - + {!isLatestResponseActive ? ( ) : ( @@ -111,17 +93,11 @@ class ResponseHistoryDropdown extends PureComponent { Response History - + Delete Current Response - + Clear History diff --git a/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js index 0c8d8aede5..5ae31cbf6c 100644 --- a/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js +++ b/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js @@ -38,9 +38,7 @@ class WorkspaceDropdown extends PureComponent { async _handleDropdownHide() { // Mark all unseen workspace as seen for (const workspace of this.props.unseenWorkspaces) { - const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId( - workspace._id - ); + const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(workspace._id); if (!workspaceMeta.hasSeen) { models.workspaceMeta.update(workspaceMeta, { hasSeen: true }); } @@ -111,9 +109,7 @@ class WorkspaceDropdown extends PureComponent { const nonActiveWorkspaces = workspaces .filter(w => w._id !== activeWorkspace._id) .sort((w1, w2) => w1.name.localeCompare(w2.name)); - const addedWorkspaceNames = unseenWorkspaces - .map(w => `"${w.name}"`) - .join(', '); + const addedWorkspaceNames = unseenWorkspaces.map(w => `"${w.name}"`).join(', '); const classes = classnames(className, 'wide', 'workspace-dropdown'); const unseenWorkspacesMessage = ( @@ -153,8 +149,7 @@ class WorkspaceDropdown extends PureComponent { - Share{' '} - {activeWorkspace.name} + Share {activeWorkspace.name} Switch Workspace @@ -162,10 +157,7 @@ class WorkspaceDropdown extends PureComponent { {nonActiveWorkspaces.map(w => { const isUnseen = !!unseenWorkspaces.find(v => v._id === w._id); return ( - + To {w.name} {isUnseen && ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js index c8a317f682..0153ea44b4 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js @@ -52,25 +52,16 @@ class AsapAuth extends React.PureComponent { } renderAsapAuthenticationFields(): React.Node { - const asapIssuer = this.renderTextInput( - 'Issuer (iss)', - 'issuer', - 'text/plain', - value => this._handleChangeProperty('issuer', value) + const asapIssuer = this.renderTextInput('Issuer (iss)', 'issuer', 'text/plain', value => + this._handleChangeProperty('issuer', value) ); - const asapSubject = this.renderTextInput( - 'Subject (sub)', - 'subject', - 'text/plain', - value => this._handleChangeProperty('subject', value) + const asapSubject = this.renderTextInput('Subject (sub)', 'subject', 'text/plain', value => + this._handleChangeProperty('subject', value) ); - const asapAudience = this.renderTextInput( - 'Audience (aud)', - 'audience', - 'text/plain', - value => this._handleChangeProperty('audience', value) + const asapAudience = this.renderTextInput('Audience (aud)', 'audience', 'text/plain', value => + this._handleChangeProperty('audience', value) ); const asapAdditionalClaims = this.renderTextInput( @@ -80,23 +71,13 @@ class AsapAuth extends React.PureComponent { value => this._handleChangeProperty('additionalClaims', value) ); - const asapKeyId = this.renderTextInput( - 'Key ID (kid)', - 'keyId', - 'text/plain', - value => this._handleChangeProperty('keyId', value) + const asapKeyId = this.renderTextInput('Key ID (kid)', 'keyId', 'text/plain', value => + this._handleChangeProperty('keyId', value) ); const asapPrivateKey = this.renderPrivateKeyInput('Private Key'); - return [ - asapIssuer, - asapSubject, - asapAudience, - asapAdditionalClaims, - asapKeyId, - asapPrivateKey - ]; + return [asapIssuer, asapSubject, asapAudience, asapAdditionalClaims, asapKeyId, asapPrivateKey]; } renderTextInput( @@ -121,12 +102,9 @@ class AsapAuth extends React.PureComponent {
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> { @@ -179,9 +156,7 @@ class AsapAuth extends React.PureComponent { 'form-control--inactive': authentication.disabled } )}> - @@ -213,9 +188,7 @@ class AsapAuth extends React.PureComponent { id="enabled" onClick={this._handleDisable} value={!authentication.disabled} - title={ - authentication.disabled ? 'Enable item' : 'Disable item' - }> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js b/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js index 9a09aac797..e7c0dc15f2 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js @@ -148,10 +148,7 @@ class AuthWrapper extends PureComponent { return (

- +

Select an auth type from above diff --git a/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js index 19d0e39f0b..1cd272b7c3 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js @@ -73,12 +73,9 @@ class AWSAuth extends React.PureComponent {

+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> {
- {this.renderRow( - 'accessKeyId', - 'Access Key ID', - this._handleChangeAccessKeyId - )} + {this.renderRow('accessKeyId', 'Access Key ID', this._handleChangeAccessKeyId)} {this.renderRow( 'secretAccessKey', 'Secret Access Key', @@ -140,9 +133,7 @@ class AWSAuth extends React.PureComponent { id="enabled" onClick={this._handleDisable} value={!authentication.disabled} - title={ - authentication.disabled ? 'Enable item' : 'Disable item' - }> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js index b0eea99146..0326218993 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js @@ -46,12 +46,9 @@ class BasicAuth extends PureComponent { @@ -95,12 +82,9 @@ class HawkAuth extends React.PureComponent { - + {bytesContent >= 0 && ( - + )} diff --git a/packages/insomnia-app/app/ui/components/tags/status-tag.js b/packages/insomnia-app/app/ui/components/tags/status-tag.js index 452d1ca49c..ff8282ff42 100644 --- a/packages/insomnia-app/app/ui/components/tags/status-tag.js +++ b/packages/insomnia-app/app/ui/components/tags/status-tag.js @@ -46,8 +46,7 @@ class StatusTag extends React.PureComponent { break; } - const description = - RESPONSE_CODE_DESCRIPTIONS[statusCode] || 'Unknown Response Code'; + const description = RESPONSE_CODE_DESCRIPTIONS[statusCode] || 'Unknown Response Code'; return (
diff --git a/packages/insomnia-app/app/ui/components/templating/tag-editor.js b/packages/insomnia-app/app/ui/components/templating/tag-editor.js index 94800e3ce8..db58576cfa 100644 --- a/packages/insomnia-app/app/ui/components/templating/tag-editor.js +++ b/packages/insomnia-app/app/ui/components/templating/tag-editor.js @@ -4,10 +4,7 @@ import autobind from 'autobind-decorator'; import classnames from 'classnames'; import clone from 'clone'; import * as templating from '../../../templating'; -import type { - NunjucksParsedTag, - NunjucksParsedTagArg -} from '../../../templating/utils'; +import type { NunjucksParsedTag, NunjucksParsedTagArg } from '../../../templating/utils'; import * as templateUtils from '../../../templating/utils'; import * as db from '../../../common/database'; import * as models from '../../../models'; @@ -16,12 +13,7 @@ import { delay, fnOrString } from '../../../common/misc'; import type { BaseModel } from '../../../models/index'; import type { Workspace } from '../../../models/workspace'; import type { PluginArgumentEnumOption } from '../../../templating/extensions/index'; -import { - Dropdown, - DropdownButton, - DropdownDivider, - DropdownItem -} from '../base/dropdown/index'; +import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown/index'; import FileInputButton from '../base/file-input-button'; type Props = { @@ -118,10 +110,7 @@ class TagEditor extends React.PureComponent { allDocs[type] = []; } - for (const doc of await db.withDescendants( - workspace, - models.request.type - )) { + for (const doc of await db.withDescendants(workspace, models.request.type)) { allDocs[doc.type].push(doc); } @@ -181,10 +170,7 @@ class TagEditor extends React.PureComponent { this._update(tagDefinitions, activeTagDefinition, tagData, false); } - async _handleChangeArgVariable(options: { - argIndex: number, - variable: boolean - }) { + async _handleChangeArgVariable(options: { argIndex: number, variable: boolean }) { const { variable, argIndex } = options; const { activeTagData, activeTagDefinition, variables } = this.state; @@ -378,9 +364,7 @@ class TagEditor extends React.PureComponent { } renderArgBoolean(checked: boolean) { - return ( - - ); + return ; } renderArgFile(value: string, argIndex: number) { @@ -396,19 +380,14 @@ class TagEditor extends React.PureComponent { } renderArgEnum(value: string, options: Array) { - const argDatas = this.state.activeTagData - ? this.state.activeTagData.args - : []; + const argDatas = this.state.activeTagData ? this.state.activeTagData.args : []; return (
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}>
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js index 275f4c59b4..1214972431 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js @@ -46,12 +46,9 @@ class BearerAuth extends PureComponent {
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> Prefix{' '} - Prefix to use when sending the Authorization header. - Defaults to Bearer. + Prefix to use when sending the Authorization header. Defaults to Bearer.
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js index e5a572004e..75d44488e0 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js @@ -46,12 +46,9 @@ class DigestAuth extends PureComponent {
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}>
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js index 0ebf100353..5e410ec0e5 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js @@ -5,10 +5,7 @@ import * as React from 'react'; import classnames from 'classnames'; import autobind from 'autobind-decorator'; import OneLineEditor from '../../codemirror/one-line-editor'; -import { - HAWK_ALGORITHM_SHA1, - HAWK_ALGORITHM_SHA256 -} from '../../../../common/constants'; +import { HAWK_ALGORITHM_SHA1, HAWK_ALGORITHM_SHA256 } from '../../../../common/constants'; import HelpTooltip from '../../help-tooltip'; import Button from '../../base/button'; @@ -47,17 +44,9 @@ class HawkAuth extends React.PureComponent { } renderHawkAuthenticationFields(): React.Node { - const hawkAuthId = this.renderInputRow( - 'Auth ID', - 'id', - this._handleChangeHawkAuthId - ); + const hawkAuthId = this.renderInputRow('Auth ID', 'id', this._handleChangeHawkAuthId); - const hawkAuthKey = this.renderInputRow( - 'Auth Key', - 'key', - this._handleChangeHawkAuthKey - ); + const hawkAuthKey = this.renderInputRow('Auth Key', 'key', this._handleChangeHawkAuthKey); const algorithm = this.renderSelectRow( 'Algorithm', @@ -81,9 +70,7 @@ class HawkAuth extends React.PureComponent { ): React.Element<*> { const { authentication } = this.props; const id = label.replace(/ /g, '-'); - const value = authentication.hasOwnProperty(property) - ? authentication[property] - : options[0]; + const value = authentication.hasOwnProperty(property) ? authentication[property] : options[0]; return (
+ className={classnames('form-control form-control--outlined no-margin', { + 'form-control--inactive': authentication.disabled + })}>
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> { id="enabled" onClick={this._handleDisable} value={!authentication.disabled} - title={ - authentication.disabled ? 'Enable item' : 'Disable item' - }> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js index 7b28e78769..6a53aea015 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js @@ -46,12 +46,9 @@ class NTLMAuth extends PureComponent {
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}>
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> + title={authentication.disabled ? 'Enable item' : 'Disable item'}> {authentication.disabled ? ( ) : ( diff --git a/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js index ede2f2c403..24131ff690 100644 --- a/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js +++ b/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js @@ -153,18 +153,10 @@ class OAuth1Auth extends React.PureComponent { help: string | null = null, handleAutocomplete: Function | null = null ): React.Element<*> { - const { - handleRender, - handleGetRenderContext, - request, - nunjucksPowerUserMode - } = this.props; + const { handleRender, handleGetRenderContext, request, nunjucksPowerUserMode } = this.props; const { authentication } = request; const id = label.replace(/ /g, '-'); - const type = - !this.props.showPasswords && property === 'password' - ? 'password' - : 'text'; + const type = !this.props.showPasswords && property === 'password' ? 'password' : 'text'; return (
@@ -175,12 +167,9 @@ class OAuth1Auth extends React.PureComponent {
+ className={classnames('form-control form-control--underlined no-margin', { + 'form-control--inactive': authentication.disabled + })}> {
+ className={classnames('form-control form-control--outlined no-margin', { + 'form-control--inactive': authentication.disabled + })}>
- @@ -282,11 +262,7 @@ class OAuth1Auth extends React.PureComponent { this._handleChangeConsumerSecret ); - const tokenKey = this.renderInputRow( - 'Token', - 'tokenKey', - this._handleChangeTokenKey - ); + const tokenKey = this.renderInputRow('Token', 'tokenKey', this._handleChangeTokenKey); const tokenSecret = this.renderInputRow( 'Token Secret', @@ -294,11 +270,7 @@ class OAuth1Auth extends React.PureComponent { this._handleChangeTokenSecret ); - const callback = this.renderInputRow( - 'Callback URL', - 'callback', - this._handleChangeCallback - ); + const callback = this.renderInputRow('Callback URL', 'callback', this._handleChangeCallback); const realm = this.renderInputRow( 'Realm', @@ -346,11 +318,7 @@ class OAuth1Auth extends React.PureComponent { this._handleChangePrivateKey ); - const version = this.renderInputRow( - 'Version', - 'version', - this._handleChangeVersion - ); + const version = this.renderInputRow('Version', 'version', this._handleChangeVersion); const enabled = this.renderEnabledRow(this._handleChangeEnabled); diff --git a/packages/insomnia-app/app/ui/components/editors/body/body-editor.js b/packages/insomnia-app/app/ui/components/editors/body/body-editor.js index e4467a7213..97d7017050 100644 --- a/packages/insomnia-app/app/ui/components/editors/body/body-editor.js +++ b/packages/insomnia-app/app/ui/components/editors/body/body-editor.js @@ -90,8 +90,8 @@ class BodyEditor extends React.PureComponent { title: 'Change Content-Type', message: (

- Do you want set the Content-Type{' '} - header to {newContentType}? + Do you want set the Content-Type header to{' '} + {newContentType}?

), onDone: saidYes => { @@ -150,13 +150,7 @@ class BodyEditor extends React.PureComponent { /> ); } else if (mimeType === CONTENT_TYPE_FILE) { - return ( - - ); + return ; } else if (mimeType === CONTENT_TYPE_GRAPHQL) { return ( { /> ); } else if (!isBodyEmpty) { - const contentType = - getContentTypeFromHeaders(request.headers) || mimeType; + const contentType = getContentTypeFromHeaders(request.headers) || mimeType; return ( { return (

- +

Select a body type from above diff --git a/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js b/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js index 6f43557a9b..568391442f 100644 --- a/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js +++ b/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js @@ -4,22 +4,14 @@ import { newBodyRaw } from '../../../../models/request'; import * as React from 'react'; import autobind from 'autobind-decorator'; import { markdownToHTML } from '../../../../common/markdown-to-html'; -import { - parse, - print, - typeFromAST, - type Document as DocumentAST -} from 'graphql'; +import { parse, print, typeFromAST, type Document as DocumentAST } from 'graphql'; import { introspectionQuery } from 'graphql/utilities/introspectionQuery'; import { buildClientSchema } from 'graphql/utilities/buildClientSchema'; import type { CodeMirror, TextMarker } from 'codemirror'; import CodeEditor from '../../codemirror/code-editor'; import { jsonParseOr } from '../../../../common/misc'; import HelpTooltip from '../../help-tooltip'; -import { - CONTENT_TYPE_JSON, - DEBOUNCE_MILLIS -} from '../../../../common/constants'; +import { CONTENT_TYPE_JSON, DEBOUNCE_MILLIS } from '../../../../common/constants'; import prettify from 'insomnia-prettify'; import type { ResponsePatch } from '../../../../network/network'; import * as network from '../../../../network/network'; @@ -243,18 +235,11 @@ class GraphQLEditor extends React.PureComponent { }) ); - responsePatch = await network.send( - introspectionRequest._id, - environmentId - ); + responsePatch = await network.send(introspectionRequest._id, environmentId); const bodyBuffer = models.response.getBodyBuffer(responsePatch); - const status = - typeof responsePatch.statusCode === 'number' - ? responsePatch.statusCode - : 0; - const error = - typeof responsePatch.error === 'string' ? responsePatch.error : ''; + const status = typeof responsePatch.statusCode === 'number' ? responsePatch.statusCode : 0; + const error = typeof responsePatch.error === 'string' ? responsePatch.error : ''; if (error) { newState.schemaFetchError = { @@ -290,10 +275,7 @@ class GraphQLEditor extends React.PureComponent { } } - _buildVariableTypes( - schema: Object | null, - query: string - ): { [string]: Object } { + _buildVariableTypes(schema: Object | null, query: string): { [string]: Object } { if (!schema) { return {}; } @@ -328,13 +310,8 @@ class GraphQLEditor extends React.PureComponent { const { body, forceRefreshKey } = this.state; const { variables, query } = body; const prettyQuery = query && print(parse(query)); - const prettyVariables = - variables && JSON.parse(prettify.json(JSON.stringify(variables))); - this._handleBodyChange( - prettyQuery, - prettyVariables, - this.state.body.operationName - ); + const prettyVariables = variables && JSON.parse(prettify.json(JSON.stringify(variables))); + this._handleBodyChange(prettyQuery, prettyVariables, this.state.body.operationName); setTimeout(() => { this.setState({ forceRefreshKey: forceRefreshKey + 1 }); }, 200); @@ -345,16 +322,10 @@ class GraphQLEditor extends React.PureComponent { return []; } - return this._documentAST.definitions.filter( - def => def.kind === 'OperationDefinition' - ); + return this._documentAST.definitions.filter(def => def.kind === 'OperationDefinition'); } - _handleBodyChange( - query: string, - variables: ?Object, - operationName: ?string - ): void { + _handleBodyChange(query: string, variables: ?Object, operationName: ?string): void { try { this._documentAST = parse(query); } catch (e) { @@ -388,11 +359,7 @@ class GraphQLEditor extends React.PureComponent { _handleVariablesChange(variables: string): void { try { const variablesObj = JSON.parse(variables || 'null'); - this._handleBodyChange( - this.state.body.query, - variablesObj, - this.state.body.operationName - ); + this._handleBodyChange(this.state.body.query, variablesObj, this.state.body.operationName); } catch (err) { this.setState({ variablesSyntaxError: err.message }); } @@ -480,14 +447,7 @@ class GraphQLEditor extends React.PureComponent { } render() { - const { - content, - render, - getRenderContext, - settings, - className, - uniquenessKey - } = this.props; + const { content, render, getRenderContext, settings, className, uniquenessKey } = this.props; const { schema, @@ -498,10 +458,7 @@ class GraphQLEditor extends React.PureComponent { schemaIsFetching } = this.state; - const { - query, - variables: variablesObject - } = GraphQLEditor._stringToGraphQL(content); + const { query, variables: variablesObject } = GraphQLEditor._stringToGraphQL(content); const variables = prettify.json(JSON.stringify(variablesObject)); @@ -513,9 +470,7 @@ class GraphQLEditor extends React.PureComponent { { schemaFetchError && (

- - {' '} @@ -574,16 +525,12 @@ class GraphQLEditor extends React.PureComponent {
{this.renderSchemaFetchMessage()} {!schemaIsFetching && ( - )}
-
- {this.renderSelectedOperationName()} -
+
{this.renderSelectedOperationName()}

Query Variables{' '} @@ -591,17 +538,13 @@ class GraphQLEditor extends React.PureComponent { Variables to use in GraphQL query
(JSON format) {variablesSyntaxError && ( - - {variablesSyntaxError} - + {variablesSyntaxError} )}

{ />
-
diff --git a/packages/insomnia-app/app/ui/components/editors/environment-editor.js b/packages/insomnia-app/app/ui/components/editors/environment-editor.js index b2d5162637..49fa68f15f 100644 --- a/packages/insomnia-app/app/ui/components/editors/environment-editor.js +++ b/packages/insomnia-app/app/ui/components/editors/environment-editor.js @@ -113,8 +113,7 @@ class EnvironmentEditor extends React.PureComponent { {...props} /> {error &&

{error}

} - {!error && - warning &&

{warning}

} + {!error && warning &&

{warning}

}
); } diff --git a/packages/insomnia-app/app/ui/components/error-boundary.js b/packages/insomnia-app/app/ui/components/error-boundary.js index 1da8027682..66a57673a7 100644 --- a/packages/insomnia-app/app/ui/components/error-boundary.js +++ b/packages/insomnia-app/app/ui/components/error-boundary.js @@ -26,8 +26,7 @@ class SingleErrorBoundary extends React.PureComponent { componentDidCatch(error: Error, info: { componentStack: string }) { const { children } = this.props; - const firstChild = - Array.isArray(children) && children.length === 1 ? children[0] : children; + const firstChild = Array.isArray(children) && children.length === 1 ? children[0] : children; this.setState({ error, info }); @@ -45,13 +44,8 @@ class SingleErrorBoundary extends React.PureComponent { title: 'Application Error', message: (

- Failed to render {componentName}. Please send the following error - to{' '} - . + Failed to render {componentName}. Please send the following error to{' '} + .

) }); @@ -66,11 +60,7 @@ class SingleErrorBoundary extends React.PureComponent { const { errorClassName, children } = this.props; if (error && info) { - return ( -
- Render Failure: {error.message} -
- ); + return
Render Failure: {error.message}
; } return children; diff --git a/packages/insomnia-app/app/ui/components/help-tooltip.js b/packages/insomnia-app/app/ui/components/help-tooltip.js index 82952fe5b8..780de8f15d 100644 --- a/packages/insomnia-app/app/ui/components/help-tooltip.js +++ b/packages/insomnia-app/app/ui/components/help-tooltip.js @@ -18,14 +18,8 @@ class HelpTooltip extends React.PureComponent { render() { const { children, className, style, info } = this.props; return ( - - + + ); } diff --git a/packages/insomnia-app/app/ui/components/hotkey.js b/packages/insomnia-app/app/ui/components/hotkey.js index 7fecab58cb..e8927e0b2d 100644 --- a/packages/insomnia-app/app/ui/components/hotkey.js +++ b/packages/insomnia-app/app/ui/components/hotkey.js @@ -3,14 +3,7 @@ import * as React from 'react'; import classnames from 'classnames'; import type { Hotkey as HotkeyType } from '../../common/hotkeys'; import * as hotkeys from '../../common/hotkeys'; -import { - ALT_SYM, - CTRL_SYM, - isMac, - joinHotKeys, - MOD_SYM, - SHIFT_SYM -} from '../../common/constants'; +import { ALT_SYM, CTRL_SYM, isMac, joinHotKeys, MOD_SYM, SHIFT_SYM } from '../../common/constants'; type Props = { hotkey: HotkeyType, diff --git a/packages/insomnia-app/app/ui/components/key-value-editor/editor.js b/packages/insomnia-app/app/ui/components/key-value-editor/editor.js index ec23b7ff71..787556e00c 100644 --- a/packages/insomnia-app/app/ui/components/key-value-editor/editor.js +++ b/packages/insomnia-app/app/ui/components/key-value-editor/editor.js @@ -197,10 +197,7 @@ class Editor extends PureComponent { const pair = this.state.pairs[position]; this.props.onDelete && this.props.onDelete(pair); - const pairs = [ - ...this.state.pairs.slice(0, position), - ...this.state.pairs.slice(position + 1) - ]; + const pairs = [...this.state.pairs.slice(0, position), ...this.state.pairs.slice(position + 1)]; if (focusedPosition >= position) { const newPosition = breakFocus ? -1 : focusedPosition - 1; @@ -368,12 +365,8 @@ class Editor extends PureComponent { nunjucksPowerUserMode={nunjucksPowerUserMode} handleRender={handleRender} handleGetRenderContext={handleGetRenderContext} - handleGetAutocompleteNameConstants={ - handleGetAutocompleteNameConstants - } - handleGetAutocompleteValueConstants={ - handleGetAutocompleteValueConstants - } + handleGetAutocompleteNameConstants={handleGetAutocompleteNameConstants} + handleGetAutocompleteValueConstants={handleGetAutocompleteValueConstants} allowMultiline={allowMultiline} allowFile={allowFile} pair={pair} @@ -396,9 +389,7 @@ class Editor extends PureComponent { - + Delete All Items diff --git a/packages/insomnia-app/app/ui/components/key-value-editor/row.js b/packages/insomnia-app/app/ui/components/key-value-editor/row.js index 930e1aa155..0009cb5a04 100644 --- a/packages/insomnia-app/app/ui/components/key-value-editor/row.js +++ b/packages/insomnia-app/app/ui/components/key-value-editor/row.js @@ -73,10 +73,7 @@ class KeyValueEditorRow extends PureComponent { // Insert the pasted text into the current selection. Unfortunately, this // is the easiest way to do this. const currentValue = this._valueInput.getValue(); - const prefix = currentValue.slice( - 0, - this._valueInput.getSelectionStart() - ); + const prefix = currentValue.slice(0, this._valueInput.getSelectionStart()); const suffix = currentValue.slice(this._valueInput.getSelectionEnd()); const finalValue = `${prefix}${value}${suffix}`; @@ -250,9 +247,7 @@ class KeyValueEditorRow extends PureComponent { - + Text {allowMultiline && ( @@ -263,9 +258,7 @@ class KeyValueEditorRow extends PureComponent { )} {allowFile && ( - + File )} @@ -303,10 +296,8 @@ class KeyValueEditorRow extends PureComponent { const classes = classnames(className, { 'key-value-editor__row-wrapper': true, 'key-value-editor__row-wrapper--dragging': isDragging, - 'key-value-editor__row-wrapper--dragging-above': - isDraggingOver && dragDirection > 0, - 'key-value-editor__row-wrapper--dragging-below': - isDraggingOver && dragDirection < 0, + 'key-value-editor__row-wrapper--dragging-above': isDraggingOver && dragDirection > 0, + 'key-value-editor__row-wrapper--dragging-below': isDraggingOver && dragDirection < 0, 'key-value-editor__row-wrapper--disabled': pair.disabled }); @@ -328,12 +319,9 @@ class KeyValueEditorRow extends PureComponent { {handle}
+ className={classnames('form-control form-control--underlined form-control--wide', { + 'form-control--inactive': pair.disabled + })}> { const el = ReactDOM.findDOMNode(this); el && el.addEventListener('keydown', this._handleKeydown); } else { - document.body && - document.body.addEventListener('keydown', this._handleKeydown); + document.body && document.body.addEventListener('keydown', this._handleKeydown); } } @@ -44,8 +43,7 @@ class KeydownBinder extends React.PureComponent { const el = ReactDOM.findDOMNode(this); el && el.removeEventListener('keydown', this._handleKeydown); } else { - document.body && - document.body.removeEventListener('keydown', this._handleKeydown); + document.body && document.body.removeEventListener('keydown', this._handleKeydown); } } diff --git a/packages/insomnia-app/app/ui/components/markdown-editor.js b/packages/insomnia-app/app/ui/components/markdown-editor.js index 3177ea569f..f6e463a916 100644 --- a/packages/insomnia-app/app/ui/components/markdown-editor.js +++ b/packages/insomnia-app/app/ui/components/markdown-editor.js @@ -51,13 +51,9 @@ class MarkdownEditor extends PureComponent { const { markdown } = this.state; - const classes = classnames( - 'react-tabs', - 'markdown-editor', - 'outlined', - className, - { 'markdown-editor--dynamic-height': !tall } - ); + const classes = classnames('react-tabs', 'markdown-editor', 'outlined', className, { + 'markdown-editor--dynamic-height': !tall + }); return ( @@ -92,9 +88,7 @@ class MarkdownEditor extends PureComponent { onChange={this._handleChange} />
-
- Styling with Markdown is supported -
+
Styling with Markdown is supported
diff --git a/packages/insomnia-app/app/ui/components/markdown-preview.js b/packages/insomnia-app/app/ui/components/markdown-preview.js index 97a2ff177b..05d23fe5fd 100644 --- a/packages/insomnia-app/app/ui/components/markdown-preview.js +++ b/packages/insomnia-app/app/ui/components/markdown-preview.js @@ -91,14 +91,8 @@ class MarkdownPreview extends PureComponent { let html = heading ? `

${heading}

\n${compiled}` : compiled; return ( -
- {renderError && ( -

- Failed to render: {renderError} -

- )} +
+ {renderError &&

Failed to render: {renderError}

}
diff --git a/packages/insomnia-app/app/ui/components/modals/alert-modal.js b/packages/insomnia-app/app/ui/components/modals/alert-modal.js index b23aff0629..7a960ed4d9 100644 --- a/packages/insomnia-app/app/ui/components/modals/alert-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/alert-modal.js @@ -64,17 +64,11 @@ class AlertModal extends PureComponent {
{addCancel ? ( - ) : null} -
diff --git a/packages/insomnia-app/app/ui/components/modals/ask-modal.js b/packages/insomnia-app/app/ui/components/modals/ask-modal.js index 41d49db7a3..e462f5775a 100644 --- a/packages/insomnia-app/app/ui/components/modals/ask-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/ask-modal.js @@ -70,10 +70,7 @@ class AskModal extends PureComponent { -
diff --git a/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js b/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js index bea7fb007a..aa86cd3a3c 100644 --- a/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js @@ -120,9 +120,7 @@ class CodePromptModal extends PureComponent { defaultValue={defaultValue} placeholder={placeholder} onChange={this._handleChange} - handleGetRenderContext={ - enableRender ? handleGetRenderContext : null - } + handleGetRenderContext={enableRender ? handleGetRenderContext : null} handleRender={enableRender ? handleRender : null} mode={mode} keyMap={editorKeyMap} @@ -142,9 +140,7 @@ class CodePromptModal extends PureComponent { placeholder={placeholder} onChange={this._handleChange} nunjucksPowerUserMode={nunjucksPowerUserMode} - getRenderContext={ - enableRender ? handleGetRenderContext : null - } + getRenderContext={enableRender ? handleGetRenderContext : null} render={enableRender ? handleRender : null} mode={mode} keyMap={editorKeyMap} @@ -165,19 +161,14 @@ class CodePromptModal extends PureComponent { Editor Syntax {Object.keys(MODES).map(mode => ( - + {MODES[mode]} ))} ) : null} -
- {hint ? `* ${hint}` : ''} -
+
{hint ? `* ${hint}` : ''}
diff --git a/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js b/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js index 758236513c..af3cd9d7bf 100644 --- a/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js @@ -126,11 +126,7 @@ class CookieModifyModal extends React.PureComponent { return; } - cookieJar.cookies = [ - ...cookies.slice(0, index), - cookie, - ...cookies.slice(index + 1) - ]; + cookieJar.cookies = [...cookies.slice(0, index), cookie, ...cookies.slice(index + 1)]; this.setState({ cookie }); @@ -177,9 +173,7 @@ class CookieModifyModal extends React.PureComponent { } try { - return cookieToString( - toughCookie.Cookie.fromJSON(JSON.stringify(cookie)) - ); + return cookieToString(toughCookie.Cookie.fromJSON(JSON.stringify(cookie))); } catch (err) { console.warn('Failed to parse cookie string', err); return ''; @@ -188,11 +182,7 @@ class CookieModifyModal extends React.PureComponent { _renderInputField(field: string, error: string | null = null) { const { cookie } = this.state; - const { - handleRender, - handleGetRenderContext, - nunjucksPowerUserMode - } = this.props; + const { handleRender, handleGetRenderContext, nunjucksPowerUserMode } = this.props; if (!cookie) { return null; @@ -248,9 +238,7 @@ class CookieModifyModal extends React.PureComponent {
{this._renderInputField( 'expires', - isNaN(new Date(cookie.expires || 0).getTime()) - ? 'Invalid Date' - : null + isNaN(new Date(cookie.expires || 0).getTime()) ? 'Invalid Date' : null )}
diff --git a/packages/insomnia-app/app/ui/components/modals/cookies-modal.js b/packages/insomnia-app/app/ui/components/modals/cookies-modal.js index 78064b2251..d89ae02566 100644 --- a/packages/insomnia-app/app/ui/components/modals/cookies-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/cookies-modal.js @@ -87,10 +87,7 @@ class CookiesModal extends PureComponent { componentWillReceiveProps(nextProps: Props) { // Re-filter if we received new cookies // Compare cookies with Dates cast to strings - const sameCookies = deepEqual( - this.props.cookieJar.cookies, - nextProps.cookieJar.cookies - ); + const sameCookies = deepEqual(this.props.cookieJar.cookies, nextProps.cookieJar.cookies); if (!sameCookies) { this._applyFilter(this.state.filter, nextProps.cookieJar.cookies); diff --git a/packages/insomnia-app/app/ui/components/modals/filter-help-modal.js b/packages/insomnia-app/app/ui/components/modals/filter-help-modal.js index 4879deaa24..cb9882aa05 100644 --- a/packages/insomnia-app/app/ui/components/modals/filter-help-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/filter-help-modal.js @@ -41,8 +41,8 @@ class FilterHelpModal extends PureComponent { Response Filtering Help

- Use {link} to filter the response body. Here are some examples that - you might use on a book store API. + Use {link} to filter the response body. Here are some examples that you might use on a + book store API.

@@ -57,9 +57,7 @@ class FilterHelpModal extends PureComponent { diff --git a/packages/insomnia-app/app/ui/components/modals/generate-code-modal.js b/packages/insomnia-app/app/ui/components/modals/generate-code-modal.js index e86c55751f..1c5d7802ca 100644 --- a/packages/insomnia-app/app/ui/components/modals/generate-code-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/generate-code-modal.js @@ -38,14 +38,10 @@ class GenerateCodeModal extends PureComponent { // Load preferences from localStorage try { - target = JSON.parse( - window.localStorage.getItem('insomnia::generateCode::target') - ); + target = JSON.parse(window.localStorage.getItem('insomnia::generateCode::target')); } catch (e) {} try { - client = JSON.parse( - window.localStorage.getItem('insomnia::generateCode::client') - ); + client = JSON.parse(window.localStorage.getItem('insomnia::generateCode::client')); } catch (e) {} this.state = { @@ -85,30 +81,18 @@ class GenerateCodeModal extends PureComponent { async _generateCode(request, target, client) { // Some clients need a content-length for the request to succeed - const addContentLength = (TO_ADD_CONTENT_LENGTH[target.key] || []).find( - c => c === client.key - ); + const addContentLength = (TO_ADD_CONTENT_LENGTH[target.key] || []).find(c => c === client.key); const { environmentId } = this.props; - const har = await exportHarRequest( - request._id, - environmentId, - addContentLength - ); + const har = await exportHarRequest(request._id, environmentId, addContentLength); const snippet = new HTTPSnippet(har); const cmd = snippet.convert(target.key, client.key); this.setState({ request, cmd, client, target }); // Save client/target for next time - window.localStorage.setItem( - 'insomnia::generateCode::client', - JSON.stringify(client) - ); - window.localStorage.setItem( - 'insomnia::generateCode::target', - JSON.stringify(target) - ); + window.localStorage.setItem('insomnia::generateCode::client', JSON.stringify(client)); + window.localStorage.setItem('insomnia::generateCode::target', JSON.stringify(target)); } show(request) { @@ -146,10 +130,7 @@ class GenerateCodeModal extends PureComponent { {targets.map(target => ( - + {target.title} ))} @@ -161,10 +142,7 @@ class GenerateCodeModal extends PureComponent { {clients.map(client => ( - + {client.title} ))} @@ -188,9 +166,7 @@ class GenerateCodeModal extends PureComponent {
* Code snippets generated by  - - httpsnippet - + httpsnippet
@@ -121,9 +116,7 @@ class LoginModal extends PureComponent {

Enjoy your stay!

If you have any questions or concerns, send you email to{' '} - - support@insomnia.rest - + support@insomnia.rest

, diff --git a/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js b/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js index adf19a71cb..b8ed1384d6 100644 --- a/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js +++ b/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js @@ -44,9 +44,7 @@ class MoveRequestGroupModal extends React.PureComponent { return; } - const workspace = await models.workspace.getById( - selectedWorkspaceId || 'n/a' - ); + const workspace = await models.workspace.getById(selectedWorkspaceId || 'n/a'); if (!workspace) { return; } @@ -86,12 +84,8 @@ class MoveRequestGroupModal extends React.PureComponent {
- {isJson - ? '$.store.books[?(@.price < 10)].title' - : '/store/books[price < 10]'} + {isJson ? '$.store.books[?(@.price < 10)].title' : '/store/books[price < 10]'} Get books costing less than $10
- @@ -317,9 +296,7 @@ class RequestPane extends React.PureComponent { - + {
- + { - +
@@ -387,20 +357,14 @@ class RequestPane extends React.PureComponent {
- + {
- + {request.description ? (
-
@@ -449,10 +409,7 @@ class RequestPane extends React.PureComponent {

- +

diff --git a/packages/insomnia-app/app/ui/components/request-url-bar.js b/packages/insomnia-app/app/ui/components/request-url-bar.js index 5be2caa2d0..08690104dd 100644 --- a/packages/insomnia-app/app/ui/components/request-url-bar.js +++ b/packages/insomnia-app/app/ui/components/request-url-bar.js @@ -250,11 +250,7 @@ class RequestUrlBar extends PureComponent { let sendButton; if (!cancelButton) { sendButton = ( - + { const options = { title: 'Save Response Body', buttonLabel: 'Save', - defaultPath: `${request.name.replace( - / +/g, - '_' - )}-${Date.now()}.${extension}` + defaultPath: `${request.name.replace(/ +/g, '_')}-${Date.now()}.${extension}` }; remote.dialog.showSaveDialog(options, outputPath => { @@ -216,10 +213,7 @@ class ResponsePane extends React.PureComponent {

- + ); } @@ -231,15 +225,9 @@ class ResponsePane extends React.PureComponent { {!response ? null : (
- + - +
{
- +
- + {
- + { - + ); diff --git a/packages/insomnia-app/app/ui/components/settings/about.js b/packages/insomnia-app/app/ui/components/settings/about.js index ee96c8f04f..9b4388db62 100644 --- a/packages/insomnia-app/app/ui/components/settings/about.js +++ b/packages/insomnia-app/app/ui/components/settings/about.js @@ -7,14 +7,13 @@ class About extends PureComponent {

Hi, I'm Greg!

- Insomnia started as a side-project of mine in 2014 and transitioned - into what I do full-time in mid 2016. + Insomnia started as a side-project of mine in 2014 and transitioned into what I do + full-time in mid 2016.

If you have any question or concerns, don't hesitate to{' '} - reach out. And, if - you want access to cloud sync or just feel like being awesome, you can - sign up for{' '} + reach out. And, if you want access to + cloud sync or just feel like being awesome, you can sign up for{' '} Plus Plan{' '}

diff --git a/packages/insomnia-app/app/ui/components/settings/account.js b/packages/insomnia-app/app/ui/components/settings/account.js index 19c02d7a5c..5a414c4fd9 100644 --- a/packages/insomnia-app/app/ui/components/settings/account.js +++ b/packages/insomnia-app/app/ui/components/settings/account.js @@ -32,10 +32,7 @@ class Account extends PureComponent {


- + Plus for Individuals

Welcome {session.getFirstName()}!

- You are currently logged in as{' '} - {session.getEmail()} + You are currently logged in as {session.getEmail()}


- + Manage Account - + Sign Out
diff --git a/packages/insomnia-app/app/ui/components/settings/general.js b/packages/insomnia-app/app/ui/components/settings/general.js index a8a497ce4c..9feca9adb4 100644 --- a/packages/insomnia-app/app/ui/components/settings/general.js +++ b/packages/insomnia-app/app/ui/components/settings/general.js @@ -132,8 +132,7 @@ class General extends React.PureComponent {
); } diff --git a/packages/insomnia-app/app/ui/components/settings/plugins.js b/packages/insomnia-app/app/ui/components/settings/plugins.js index f8b94673e8..bf5b306ab9 100644 --- a/packages/insomnia-app/app/ui/components/settings/plugins.js +++ b/packages/insomnia-app/app/ui/components/settings/plugins.js @@ -102,21 +102,14 @@ class Plugins extends React.PureComponent { } render() { - const { - plugins, - error, - isInstallingFromNpm, - isRefreshingPlugins - } = this.state; + const { plugins, error, isInstallingFromNpm, isRefreshingPlugins } = this.state; return (

Plugins is still an experimental feature. See{' '} - - Documentation - {' '} - for more info. + Documentation for + more info.

{plugins.length === 0 ? (
No Plugins Added
@@ -166,9 +159,7 @@ class Plugins extends React.PureComponent { {error && (
-
{error}
@@ -186,12 +177,8 @@ class Plugins extends React.PureComponent { />
-
@@ -213,9 +200,7 @@ class Plugins extends React.PureComponent { className="btn btn--clicky space-left" onClick={this._handleClickRefreshPlugins}> Reload Plugin List - {isRefreshingPlugins && ( - - )} + {isRefreshingPlugins && }
diff --git a/packages/insomnia-app/app/ui/components/settings/theme.js b/packages/insomnia-app/app/ui/components/settings/theme.js index eb08354038..2037622538 100644 --- a/packages/insomnia-app/app/ui/components/settings/theme.js +++ b/packages/insomnia-app/app/ui/components/settings/theme.js @@ -52,13 +52,7 @@ class Theme extends React.PureComponent { {/* Panes */} - + { {/* Sidebar */} - + { {/* Lines */} - - - - + + + + {/* Colors */} - - - - - - + + + + + + diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js index 2f676f870c..c28bd5880d 100644 --- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js +++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js @@ -1,12 +1,7 @@ // @flow import * as React from 'react'; import autobind from 'autobind-decorator'; -import { - Dropdown, - DropdownHint, - DropdownButton, - DropdownItem -} from '../base/dropdown'; +import { Dropdown, DropdownHint, DropdownButton, DropdownItem } from '../base/dropdown'; import { DEBOUNCE_MILLIS } from '../../../common/constants'; import KeydownBinder from '../keydown-binder'; import * as hotkeys from '../../../common/hotkeys'; @@ -72,9 +67,7 @@ class SidebarFilter extends React.PureComponent { onChange={this._handleOnChange} /> {filter && ( - )} diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js index 6dedce7435..03adfe6c2e 100644 --- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js +++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js @@ -23,11 +23,7 @@ class SidebarRequestGroupRow extends PureComponent { } _handleCollapse() { - const { - requestGroup, - handleSetRequestGroupCollapsed, - isCollapsed - } = this.props; + const { requestGroup, handleSetRequestGroupCollapsed, isCollapsed } = this.props; handleSetRequestGroupCollapsed(requestGroup._id, !isCollapsed); } @@ -77,9 +73,7 @@ class SidebarRequestGroupRow extends PureComponent { // NOTE: We only want the button draggable, not the whole container (ie. no children) const button = connectDragSource( connectDropTarget( -
@@ -192,12 +190,9 @@ function isAbove(monitor, component) { const dragTarget = { drop(props, monitor, component) { - const movingDoc = - monitor.getItem().requestGroup || monitor.getItem().request; + const movingDoc = monitor.getItem().requestGroup || monitor.getItem().request; - const parentId = props.requestGroup - ? props.requestGroup._id - : props.request.parentId; + const parentId = props.requestGroup ? props.requestGroup._id : props.request.parentId; const targetId = props.request ? props.request._id : null; if (isAbove(monitor, component)) { @@ -229,9 +224,5 @@ function targetCollect(connect, monitor) { }; } -const source = DragSource('SIDEBAR_REQUEST_ROW', dragSource, sourceCollect)( - SidebarRequestRow -); -export default DropTarget('SIDEBAR_REQUEST_ROW', dragTarget, targetCollect)( - source -); +const source = DragSource('SIDEBAR_REQUEST_ROW', dragSource, sourceCollect)(SidebarRequestRow); +export default DropTarget('SIDEBAR_REQUEST_ROW', dragTarget, targetCollect)(source); diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar.js index f4d5d985ef..8127bf56c5 100644 --- a/packages/insomnia-app/app/ui/components/sidebar/sidebar.js +++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar.js @@ -7,10 +7,7 @@ import SidebarFilter from './sidebar-filter'; import SidebarChildren from './sidebar-children'; import SyncButton from '../dropdowns/sync-dropdown'; import WorkspaceDropdown from '../dropdowns/workspace-dropdown'; -import { - SIDEBAR_SKINNY_REMS, - COLLAPSE_SIDEBAR_REMS -} from '../../../common/constants'; +import { SIDEBAR_SKINNY_REMS, COLLAPSE_SIDEBAR_REMS } from '../../../common/constants'; @autobind class Sidebar extends PureComponent { @@ -126,11 +123,7 @@ class Sidebar extends PureComponent { filter={filter || ''} /> - + ); } diff --git a/packages/insomnia-app/app/ui/components/tags/method-tag.js b/packages/insomnia-app/app/ui/components/tags/method-tag.js index 00cb65f5ad..1ac9766213 100644 --- a/packages/insomnia-app/app/ui/components/tags/method-tag.js +++ b/packages/insomnia-app/app/ui/components/tags/method-tag.js @@ -9,10 +9,7 @@ class MethodTag extends PureComponent { let methodName = method; if (!fullNames) { - if ( - method === constants.METHOD_DELETE || - method === constants.METHOD_OPTIONS - ) { + if (method === constants.METHOD_DELETE || method === constants.METHOD_OPTIONS) { methodName = method.slice(0, 3); } else if (method.length > 4) { methodName = util.removeVowels(method).slice(0, 4); diff --git a/packages/insomnia-app/app/ui/components/tags/size-tag.js b/packages/insomnia-app/app/ui/components/tags/size-tag.js index 76bfa4429c..5dd874bcd7 100644 --- a/packages/insomnia-app/app/ui/components/tags/size-tag.js +++ b/packages/insomnia-app/app/ui/components/tags/size-tag.js @@ -23,16 +23,12 @@ class SizeTag extends React.PureComponent {
Read - {responseSizeReadString} - {responseSizeReadString}
Content - {responseSizeRawString} - {responseSizeRawString}