mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

More unique temporary directory (Closes #568)

Browse Source
This commit is contained in:
Gregory Schier 2017-11-04 21:10:06 +01:00
parent 44449114a9
commit db1ae27fb2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/constants.js
View File

@ -24,6 +24,11 @@ export function getAppEnvironment () {
return process.env.INSOMNIA_ENV || 'production'; return process.env.INSOMNIA_ENV || 'production';
} }
export function getTempDir () {
// NOTE: Using a fairly unique name here because "insomnia" is a common word
return path.join(electron.remote.app.getPath('temp'), `insomnia_${getAppVersion()}`);
}
export function isMac () { export function isMac () {
return getAppPlatform() === 'darwin'; return getAppPlatform() === 'darwin';
} }

8
app/network/network.js
View File

@ -5,8 +5,6 @@ import type {Workspace} from '../models/workspace';
import type {Settings} from '../models/settings'; import type {Settings} from '../models/settings';
import type {RenderedRequest} from '../common/render'; import type {RenderedRequest} from '../common/render';
import {getRenderContext, getRenderedRequest} from '../common/render'; import {getRenderContext, getRenderedRequest} from '../common/render';
import electron from 'electron';
import mkdirp from 'mkdirp'; import mkdirp from 'mkdirp';
import clone from 'clone'; import clone from 'clone';
import {parse as urlParse, resolve as urlResolve} from 'url'; import {parse as urlParse, resolve as urlResolve} from 'url';
@ -15,7 +13,7 @@ import {join as pathJoin} from 'path';
import * as models from '../models'; import * as models from '../models';
import * as querystring from '../common/querystring'; import * as querystring from '../common/querystring';
import * as util from '../common/misc.js'; import * as util from '../common/misc.js';
import {AUTH_AWS_IAM, AUTH_BASIC, AUTH_DIGEST, AUTH_NETRC, AUTH_NTLM, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion, STATUS_CODE_PLUGIN_ERROR} from '../common/constants'; import {AUTH_AWS_IAM, AUTH_BASIC, AUTH_DIGEST, AUTH_NETRC, AUTH_NTLM, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion, getTempDir, STATUS_CODE_PLUGIN_ERROR} from '../common/constants';
import {describeByteSize, getContentTypeHeader, hasAuthHeader, hasContentTypeHeader, hasUserAgentHeader, setDefaultProtocol} from '../common/misc'; import {describeByteSize, getContentTypeHeader, hasAuthHeader, hasContentTypeHeader, hasUserAgentHeader, setDefaultProtocol} from '../common/misc';
import fs from 'fs'; import fs from 'fs';
import * as db from '../common/database'; import * as db from '../common/database';
@ -257,7 +255,7 @@ export function _actuallySend (
// Setup CA Root Certificates if not on Mac. Thanks to libcurl, Mac will use // Setup CA Root Certificates if not on Mac. Thanks to libcurl, Mac will use
// certificates form the OS. // certificates form the OS.
if (process.platform !== 'darwin') { if (process.platform !== 'darwin') {
const basCAPath = pathJoin(electron.remote.app.getPath('temp'), 'insomnia'); const basCAPath = getTempDir();
const fullCAPath = pathJoin(basCAPath, CACerts.filename); const fullCAPath = pathJoin(basCAPath, CACerts.filename);
try { try {
@ -348,7 +346,7 @@ export function _actuallySend (
// Certificate file now found! // Certificate file now found!
// LEGACY: Certs used to be stored in blobs (not as paths), so lets write it to // LEGACY: Certs used to be stored in blobs (not as paths), so lets write it to
// the temp directory first. // the temp directory first.
const fullBase = pathJoin(electron.remote.app.getPath('temp'), 'insomnia'); const fullBase = getTempDir();
mkdirp.sync(fullBase); mkdirp.sync(fullBase);
const name = `${renderedRequest._id}_${renderedRequest.modified}`; const name = `${renderedRequest._id}_${renderedRequest.modified}`;