Closes 1225

packages/insomnia-app/app/common/constants.js

@@ -2,6 +2,7 @@ import * as packageJSON from '../../package.json';
 import * as electron from 'electron';
 import path from 'path';
 import mkdirp from 'mkdirp';
+import { getDataDirectory } from './misc';
 
 // App Stuff
 
@@ -67,7 +68,7 @@ export const HUGE_RESPONSE_MB = 100;
 export const FLEXIBLE_URL_REGEX = /^(http|https):\/\/[\wàâäèéêëîïôóœùûüÿçÀÂÄÈÉÊËÎÏÔŒÙÛÜŸÇ\-_.]+[/\wàâäèéêëîïôóœùûüÿçÀÂÄÈÉÊËÎÏÔŒÙÛÜŸÇ.\-+=:\][@%^*&!#?;$]*/;
 export const CHECK_FOR_UPDATES_INTERVAL = 1000 * 60 * 60 * 3; // 3 hours
 export const PLUGIN_PATH = path.join(
-  (electron.remote || electron).app.getPath('userData'),
+  getDataDirectory(),
   'plugins'
 );
 

packages/insomnia-app/app/common/database.js

@@ -6,6 +6,7 @@ import NeDB from 'nedb';
 import fsPath from 'path';
 import { DB_PERSIST_INTERVAL } from './constants';
 import uuid from 'uuid';
+import { getDataDirectory } from './misc';
 
 export const CHANGE_INSERT = 'insert';
 export const CHANGE_UPDATE = 'update';
@@ -26,9 +27,7 @@ function allTypes() {
 
 function getDBFilePath(modelType) {
   // NOTE: Do not EVER change this. EVER!
-  const { app } = electron.remote || electron;
-  const basePath = app.getPath('userData');
-  return fsPath.join(basePath, `insomnia.${modelType}.db`);
+  return fsPath.join(getDataDirectory(), `insomnia.${modelType}.db`);
 }
 
 export async function initClient() {

packages/insomnia-app/app/common/misc.js

@@ -334,3 +334,8 @@ export async function waitForStreamToFinish(s: Readable | Writable): Promise<voi
     });
   });
 }
+
+export function getDataDirectory(): string {
+  const { app } = electron.remote || electron;
+  return process.env.INSOMNIA_DATA_PATH || app.getPath('userData');
+}

packages/insomnia-app/app/main/window-utils.js

@@ -236,7 +236,7 @@ export function createWindow() {
       {
         label: 'Show App Data Folder',
         click: (menuItem, window, e) => {
-          const directory = app.getPath('userData');
+          const directory = misc.getDataDirectory();
           shell.showItemInFolder(directory);
         }
       },
@@ -413,7 +413,7 @@ function getZoomFactor() {
 }
 
 function initLocalStorage() {
-  const localStoragePath = path.join(app.getPath('userData'), 'localStorage');
+  const localStoragePath = path.join(misc.getDataDirectory(), 'localStorage');
   localStorage = new LocalStorage(localStoragePath);
 }
 

packages/insomnia-app/app/models/__tests__/response.test.js

@@ -1,9 +1,9 @@
 import path from 'path';
 import zlib from 'zlib';
 import fs from 'fs';
-import * as electron from 'electron';
 import * as models from '../../models';
 import { globalBeforeEach } from '../../__jest__/before-each';
+import { getDataDirectory } from '../../common/misc';
 
 describe('migrate()', () => {
   beforeEach(async () => {
@@ -17,7 +17,7 @@ describe('migrate()', () => {
 
     const newModel = await models.initModel(models.response.type, initialModel);
     const expectedBodyPath = path.join(
-      electron.remote.app.getPath('userData'),
+      getDataDirectory(),
       `responses/fc3ff98e8c6a0d3087d515c0473f8677.zip`
     );
     const storedBody = models.response.getBodyBuffer(newModel);
@@ -37,7 +37,7 @@ describe('migrate()', () => {
     const newModel = await models.initModel(models.response.type, initialModel);
     jest.runAllTimers();
     const expectedBodyPath = path.join(
-      electron.remote.app.getPath('userData'),
+      getDataDirectory(),
       `responses/fc3ff98e8c6a0d3087d515c0473f8677.zip`
     );
     const storedBody = models.response.getBodyBuffer(newModel);
@@ -59,7 +59,7 @@ describe('migrate()', () => {
     jest.runAllTimers();
 
     const expectedBodyPath = path.join(
-      electron.remote.app.getPath('userData'),
+      getDataDirectory(),
       'responses/d41d8cd98f00b204e9800998ecf8427e.zip'
     );
     const storedBody = models.response.getBodyBuffer(newModel);
@@ -87,7 +87,7 @@ describe('migrate()', () => {
   });
 
   it('does it', async () => {
-    const bodyPath = path.join(electron.remote.app.getPath('userData'), 'foo.zip');
+    const bodyPath = path.join(getDataDirectory(), 'foo.zip');
     fs.writeFileSync(bodyPath, zlib.gzipSync('Hello World!'));
 
     const response = await models.initModel(models.response.type, { bodyPath });

packages/insomnia-app/app/models/response.js

@@ -8,9 +8,9 @@ import crypto from 'crypto';
 import path from 'path';
 import zlib from 'zlib';
 import mkdirp from 'mkdirp';
-import * as electron from 'electron';
 import { MAX_RESPONSES } from '../common/constants';
 import * as db from '../common/database';
+import { getDataDirectory } from '../common/misc';
 
 export const name = 'Response';
 export const type = 'Response';
@@ -201,8 +201,7 @@ function getBodyBufferFromPath<T>(
 async function migrateBodyToFileSystem(doc: Object) {
   if (doc.hasOwnProperty('body') && doc._id && !doc.bodyPath) {
     const bodyBuffer = Buffer.from(doc.body, doc.encoding || 'utf8');
-    const { app } = electron.remote || electron;
-    const root = app.getPath('userData');
+    const root = getDataDirectory();
     const dir = path.join(root, 'responses');
 
     mkdirp.sync(dir);

packages/insomnia-app/app/network/network.js

@@ -11,7 +11,6 @@ import { parse as urlParse, resolve as urlResolve } from 'url';
 import { Curl } from 'insomnia-libcurl';
 import { join as pathJoin } from 'path';
 import uuid from 'uuid';
-import * as electron from 'electron';
 import * as models from '../models';
 import {
   AUTH_AWS_IAM,
@@ -37,7 +36,8 @@ import {
   hasAuthHeader,
   hasContentTypeHeader,
   hasUserAgentHeader,
-  waitForStreamToFinish
+  waitForStreamToFinish,
+  getDataDirectory
 } from '../common/misc';
 import {
   buildQueryStringFromParams,
@@ -56,8 +56,6 @@ import { urlMatchesCertHost } from './url-matches-cert-host';
 import aws4 from 'aws4';
 import { buildMultipart } from './multipart';
 
-const { app } = electron.remote || electron;
-
 export type ResponsePatch = {
   statusMessage?: string,
   error?: string,
@@ -641,7 +639,7 @@ export async function _actuallySend(
       setOpt(Curl.option.HTTPHEADER, headerStrings);
 
       let responseBodyBytes = 0;
-      const responsesDir = pathJoin(app.getPath('userData'), 'responses');
+      const responsesDir = pathJoin(getDataDirectory(), 'responses');
       mkdirp.sync(responsesDir);
       const responseBodyPath = pathJoin(responsesDir, uuid.v4() + '.response');
       const responseBodyWriteStream = fs.createWriteStream(responseBodyPath);

packages/insomnia-app/app/sync/storage.js

@@ -1,4 +1,3 @@
-import electron from 'electron';
 import NeDB from 'nedb';
 import fsPath from 'path';
 import crypto from 'crypto';
@@ -198,7 +197,7 @@ function _initConfig(data) {
 
 export function initDB(config, forceReset) {
   if (!_database || forceReset) {
-    const basePath = electron.remote.app.getPath('userData');
+    const basePath = util.getDataDirectory();
     _database = {};
 
     // NOTE: Do not EVER change this. EVER!