Release 5.1.1 (#268)

* Skip invalid cookies and some tweaks

* Fix adding context menu multiple times (#254)

* Update electron and fix React key warning

* OAuth password field should abide by password setting (#256)

* Size app icon appropriately

* Better errors inside environment editors (#257)

* Start a fresh OAuth2 session every launch (#258)

* Show folder name in response tag dialog (#259)

* Some autocomplete tweaks and added ctrl+Enter shortcut

* npm@5 in CI and package-lock.json

* Always have equals signs in x-www-form-urlencoded bodies (#265)

* Bump version

Author: gschier

.appveyor.yml

@@ -15,7 +15,7 @@ environment:
 # Things to install after repo clone
 install:
   - ps: Install-Product node $env:NODEJS_VERSION $env:Platform
-  - npm install -g npm@latest > Nul
+  - npm install -g npm@5 > Nul
   - npm config set msvs_version 2013
   - npm install > NUL
   - node --version

.travis.yml

@@ -32,7 +32,10 @@ cache:
     - $HOME/.cache
 
 install:
+- npm install -g npm@5 > Nul
 - npm install > /dev/null
+- node --version
+- npm --version
 
 script:
 - npm test

app/common/constants.js

@@ -60,6 +60,7 @@ export const CHECK_FOR_UPDATES_INTERVAL = 1000 * 60 * 60 * 3; // 3 hours
 export const MOD_SYM = isMac() ? '⌘' : 'ctrl';
 export const ALT_SYM = isMac() ? '⌃' : 'alt';
 export const SHIFT_SYM = isMac() ? '⇧' : 'shift';
+export const CTRL_SYM = isMac() ? '⌃' : 'ctrl';
 export function joinHotKeys (keys) {
   return keys.join(isMac() ? '' : '+');
 }

app/common/render.js

@@ -4,7 +4,7 @@ import {setDefaultProtocol} from './misc';
 import * as db from './database';
 import * as templating from '../templating';
 
-export async function buildRenderContext (ancestors, rootEnvironment, subEnvironment) {
+export async function buildRenderContext (ancestors, rootEnvironment, subEnvironment, variablesOnly = true) {
   if (!Array.isArray(ancestors)) {
     ancestors = [];
   }
@@ -52,7 +52,7 @@ export async function buildRenderContext (ancestors, rootEnvironment, subEnviron
        * original base_url of google.com would be lost.
        */
       if (typeof renderContext[key] === 'string') {
-        renderContext[key] = await render(environment[key], renderContext, null, true);
+        renderContext[key] = await render(environment[key], renderContext, null, variablesOnly);
       } else {
         renderContext[key] = environment[key];
       }
@@ -64,7 +64,7 @@ export async function buildRenderContext (ancestors, rootEnvironment, subEnviron
 
   // Render up to 5 levels of recursive references.
   for (let i = 0; i < 3; i++) {
-    finalRenderContext = await render(finalRenderContext, finalRenderContext, null, true);
+    finalRenderContext = await render(finalRenderContext, finalRenderContext, null, variablesOnly);
   }
 
   return finalRenderContext;
@@ -137,7 +137,7 @@ export async function render (obj, context = {}, blacklistPathRegex = null, vari
   return next(newObj);
 }
 
-export async function getRenderContext (request, environmentId, ancestors = null) {
+export async function getRenderContext (request, environmentId, ancestors = null, variablesOnly = true) {
   if (!request) {
     return {};
   }
@@ -154,7 +154,7 @@ export async function getRenderContext (request, environmentId, ancestors = null
   const subEnvironment = await models.environment.getById(environmentId);
 
   // Generate the context we need to render
-  return buildRenderContext(ancestors, rootEnvironment, subEnvironment);
+  return buildRenderContext(ancestors, rootEnvironment, subEnvironment, variablesOnly);
 }
 
 export async function getRenderedRequest (request, environmentId) {

app/icons/icon.icns

@@ -90,6 +90,55 @@ describe('actuallySend()', () => {
     });
   });
 
+  it('sends a urlencoded', async () => {
+    const workspace = await models.workspace.create();
+    const settings = await models.settings.create();
+    const request = Object.assign(models.request.init(), {
+      _id: 'req_123',
+      parentId: workspace._id,
+      headers: [{name: 'Content-Type', value: CONTENT_TYPE_FORM_URLENCODED}],
+      method: 'POST',
+      body: {
+        mimeType: CONTENT_TYPE_FORM_URLENCODED,
+        params: [
+          {name: 'foo', value: 'bar'},
+          {name: 'bar', value: ''},
+          {name: '', value: 'value'}
+        ]
+      },
+      url: 'http://localhost'
+    });
+
+    const renderedRequest = await getRenderedRequest(request);
+    const response = await networkUtils._actuallySend(
+      renderedRequest,
+      workspace,
+      settings
+    );
+
+    const body = JSON.parse(Buffer.from(response.body, 'base64'));
+    expect(body).toEqual({
+      options: {
+        CUSTOMREQUEST: 'POST',
+        ACCEPT_ENCODING: '',
+        NOBODY: 0,
+        FOLLOWLOCATION: true,
+        HTTPHEADER: [
+          'Content-Type: application/x-www-form-urlencoded',
+          'Expect: ',
+          'Transfer-Encoding: '
+        ],
+        NOPROGRESS: false,
+        POSTFIELDS: 'foo=bar&bar=&=value',
+        PROXY: '',
+        TIMEOUT_MS: 0,
+        URL: 'http://localhost/',
+        USERAGENT: `insomnia/${getAppVersion()}`,
+        VERBOSE: true
+      }
+    });
+  });
+
   it('skips sending and storing cookies with setting', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();

app/icons/icon.ico

@@ -297,7 +297,7 @@ export function _actuallySend (renderedRequest, workspace, settings) {
       let noBody = false;
       const expectsBody = ['POST', 'PUT', 'PATCH'].includes(renderedRequest.method.toUpperCase());
       if (renderedRequest.body.mimeType === CONTENT_TYPE_FORM_URLENCODED) {
-        const d = querystring.buildFromParams(renderedRequest.body.params || [], true);
+        const d = querystring.buildFromParams(renderedRequest.body.params || [], false);
         setOpt(Curl.option.POSTFIELDS, d); // Send raw data
       } else if (renderedRequest.body.mimeType === CONTENT_TYPE_FORM_DATA) {
         const data = renderedRequest.body.params.map(param => {
@@ -415,14 +415,18 @@ export function _actuallySend (renderedRequest, workspace, settings) {
         if (renderedRequest.settingStoreCookies && setCookieHeaders.length) {
           const jar = jarFromCookies(renderedRequest.cookieJar.cookies);
           for (const header of getSetCookieHeaders(headers)) {
-            jar.setCookieSync(header.value, curl.getInfo(Curl.info.EFFECTIVE_URL));
+            try {
+              jar.setCookieSync(header.value, curl.getInfo(Curl.info.EFFECTIVE_URL));
+            } catch (err) {
+              timeline.push({name: 'TEXT', value: `Rejected cookie: ${err.message}`});
+            }
           }
 
           const cookies = await cookiesFromJar(jar);
 
           // Make sure domains are prefixed with dots (Curl does this)
           for (const cookie of cookies) {
-            if (cookie.domain[0] !== '.') {
+            if (cookie.domain && cookie.domain[0] !== '.') {
               cookie.domain = `.${cookie.domain}`;
             }
           }

app/network/__tests__/network.test.js

@@ -1,5 +1,5 @@
 import * as querystring from '../../common/querystring';
-import {getBasicAuthHeader} from '../../common/misc';
+import {getBasicAuthHeader, setDefaultProtocol} from '../../common/misc';
 import * as c from './constants';
 import {responseToObject} from './misc';
 
@@ -38,7 +38,15 @@ export default async function (accessTokenUrl,
     headers: headers
   };
 
-  const response = await window.fetch(accessTokenUrl, config);
+  const url = setDefaultProtocol(accessTokenUrl);
+
+  let response;
+  try {
+    response = await window.fetch(url, config);
+  } catch (err) {
+    throw new Error(`Failed to fetch access token at URL "${url}"`);
+  }
+
   const body = await response.text();
   const results = responseToObject(body, [
     c.P_ACCESS_TOKEN,

app/network/network.js

@@ -1,6 +1,9 @@
 import electron from 'electron';
+import uuid from 'uuid';
 import querystring from 'querystring';
 
+const AUTH_WINDOW_SESSION_ID = uuid.v4();
+
 export function responseToObject (body, keys) {
   let data = null;
   try {
@@ -32,7 +35,7 @@ export function authorizeUserInWindow (url, urlRegex = /.*/) {
     const child = new electron.remote.BrowserWindow({
       webPreferences: {
         nodeIntegration: false,
-        partition: `persist:oauth2`
+        partition: `oauth2_${AUTH_WINDOW_SESSION_ID}`
       },
       show: false
     });

app/network/o-auth-2/grant-password.js

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "productName": "Insomnia",
   "longName": "Insomnia REST Client",
   "description": "Debug APIs like a human, not a robot",

app/network/o-auth-2/misc.js

@@ -148,6 +148,9 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
     'Ctrl-Space': completeForce, // Force autocomplete on hotkey
     "' '": completeIfAfterTagOrVarOpen
   });
+
+  // Close dropdown whenever something is clicked
+  document.addEventListener('click', () => cm.closeHint());
 });
 
 /**

app/package.json

@@ -126,6 +126,7 @@ class OAuth2 extends PureComponent {
   renderInputRow (label, property, onChange, handleAutocomplete = null) {
     const {handleRender, handleGetRenderContext, request} = this.props;
     const id = label.replace(/ /g, '-');
+    const type = !this.props.showPasswords && property === 'password' ? 'password' : 'text';
     return (
       <tr key={id}>
         <td className="pad-right no-wrap valign-middle">
@@ -135,6 +136,7 @@ class OAuth2 extends PureComponent {
           <div className="form-control form-control--underlined no-margin">
             <OneLineEditor
               id={id}
+              type={type}
               onChange={onChange}
               defaultValue={request.authentication[property] || ''}
               render={handleRender}

app/ui/components/codemirror/extensions/autocomplete.js

@@ -5,7 +5,40 @@ import {DEBOUNCE_MILLIS} from '../../../common/constants';
 
 @autobind
 class EnvironmentEditor extends PureComponent {
+  constructor (props) {
+    super(props);
+    this.state = {
+      error: null,
+      warning: null
+    };
+  }
+
   _handleChange () {
+    let error = null;
+    let warning = null;
+    let value = null;
+
+    // Check for JSON parse errors
+    try {
+      value = this.getValue();
+    } catch (err) {
+      error = err.message;
+    }
+
+    // Check for invalid key names
+    if (value) {
+      for (const key of Object.keys(value)) {
+        if (!key.match(/^[a-zA-Z_$][0-9a-zA-Z_$]*$/)) {
+          warning = `"${key}" must only contain letters, numbers, and underscores`;
+          break;
+        }
+      }
+    }
+
+    if (this.state.error !== error || this.state.warning !== warning) {
+      this.setState({error, warning});
+    }
+
     this.props.didChange();
   }
 
@@ -18,12 +51,7 @@ class EnvironmentEditor extends PureComponent {
   }
 
   isValid () {
-    try {
-      return this.getValue() !== undefined;
-    } catch (e) {
-      // Failed to parse JSON
-      return false;
-    }
+    return !this.state.error;
   }
 
   render () {
@@ -38,22 +66,28 @@ class EnvironmentEditor extends PureComponent {
       ...props
     } = this.props;
 
+    const {error, warning} = this.state;
+
     return (
-      <CodeEditor
-        ref={this._setEditorRef}
-        autoPrettify
-        fontSize={editorFontSize}
-        indentSize={editorIndentSize}
-        lineWrapping={lineWrapping}
-        keyMap={editorKeyMap}
-        onChange={this._handleChange}
-        debounceMillis={DEBOUNCE_MILLIS * 6}
-        defaultValue={JSON.stringify(environment)}
-        render={render}
-        getRenderContext={getRenderContext}
-        mode="application/json"
-        {...props}
-      />
+      <div className="environment-editor">
+        <CodeEditor
+          ref={this._setEditorRef}
+          autoPrettify
+          fontSize={editorFontSize}
+          indentSize={editorIndentSize}
+          lineWrapping={lineWrapping}
+          keyMap={editorKeyMap}
+          onChange={this._handleChange}
+          debounceMillis={DEBOUNCE_MILLIS * 6}
+          defaultValue={JSON.stringify(environment)}
+          render={render}
+          getRenderContext={getRenderContext}
+          mode="application/json"
+          {...props}
+        />
+        {error && <p className="notice error margin">{error}</p>}
+        {(!error && warning) && <p className="notice warning margin">{warning}</p>}
+      </div>
     );
   }
 }

app/ui/components/editors/auth/o-auth-2.js

@@ -1,14 +1,15 @@
 import React, {PropTypes, PureComponent} from 'react';
-import {ALT_SYM, isMac, joinHotKeys, MOD_SYM, SHIFT_SYM} from '../../common/constants';
+import {ALT_SYM, CTRL_SYM, isMac, joinHotKeys, MOD_SYM, SHIFT_SYM} from '../../common/constants';
 
 class Hotkey extends PureComponent {
   render () {
-    const {char, shift, alt, className} = this.props;
+    const {char, shift, alt, ctrl, className} = this.props;
     const chars = [ ];
 
     alt && chars.push(ALT_SYM);
     shift && chars.push(SHIFT_SYM);
-    chars.push(MOD_SYM);
+    ctrl && chars.push(CTRL_SYM);
+    !ctrl && chars.push(MOD_SYM);
     chars.push(char);
 
     return (
@@ -25,6 +26,7 @@ Hotkey.propTypes = {
   // Optional
   alt: PropTypes.bool,
   shift: PropTypes.bool,
+  ctrl: PropTypes.bool,
   className: PropTypes.string
 };
 

app/ui/components/editors/environment-editor.js

@@ -250,7 +250,7 @@ class RequestSwitcherModal extends PureComponent {
                       <div className="pull-right faint italic">
                         {requestGroup.name}
                         &nbsp;&nbsp;
-                        <i className="fa fa-folder-o"></i>
+                        <i className="fa fa-folder-o"/>
                       </div>
                     )}
                     <MethodTag method={r.method}/>
@@ -260,10 +260,10 @@ class RequestSwitcherModal extends PureComponent {
               );
             })}
 
-            {matchedRequests.length && matchedWorkspaces.length && (
-              <div className="pad-left pad-right">
+            {(matchedRequests.length > 0 && matchedWorkspaces.length > 0) && (
+              <li className="pad-left pad-right">
                 <hr/>
-              </div>
+              </li>
             )}
 
             {matchedWorkspaces.map((w, i) => {

app/ui/components/hotkey.js

@@ -133,7 +133,7 @@ class WorkspaceEnvironmentsEditModal extends PureComponent {
   _didChange () {
     const isValid = this._envEditor.isValid();
 
-    if (this.state.isValid === isValid) {
+    if (this.state.isValid !== isValid) {
       this.setState({isValid});
     }