Merge branch 'new_auth'

* new_auth: build is hard fixed package-lock and electron-rebuild prettier i need shebang-command to get the precommit hook working update locks store auth token in OS keyring, not in local storage minor cleanup
2017-06-21 10:01:28 -04:00 · 2017-06-21 10:01:28 -04:00 · 024278e235
commit 024278e235
parent 4562b0bf99 92bac9de54
19 changed files with 603 additions and 282 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,13 @@
-node_modules
-LBRY-darwin-x64
-dist
+/node_modules
+/LBRY-darwin-x64
+/dist
+
+/ui/dist/css/*
+/ui/dist/js/*
+!/ui/dist/js/mediaelement
+/ui/node_modules
+/ui/.sass-cache
+

 /app/dist
 /app/node_modules
--- a/.travis.yml
+++ b/.travis.yml
@ -9,6 +9,8 @@ matrix:


 install:
+  - rvm install 2.3.1
+  - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger
  - wget https://www.python.org/ftp/python/2.7.13/python-2.7.13-macosx10.6.pkg
  - sudo installer -pkg python-2.7.13-macosx10.6.pkg -target /
  - pip install -U pip
--- a/ui/Dangerfile
+++ b/ui/Dangerfile
--- a/app/package-lock.json
+++ b/app/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "LBRY",
-  "version": "0.12.0",
+  "version": "0.12.2rc3",
  "lockfileVersion": 1,
  "dependencies": {
    "commander": {
@ -155,7 +155,8 @@
        },
        "dezalgo": {
          "version": "1.0.3",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+          "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY="
        },
        "editor": {
          "version": "1.0.0",
@ -525,7 +526,8 @@
        },
        "normalize-git-url": {
          "version": "3.0.2",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.2.tgz",
+          "integrity": "sha1-jl8Uvgva7bc+ByADEKpBbCc1D8Q="
        },
        "normalize-package-data": {
          "version": "2.3.8",
@ -549,7 +551,8 @@
        },
        "npm-install-checks": {
          "version": "3.0.0",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz",
+          "integrity": "sha1-1K7N/VGlPjcjt7L5Oy7ijjB7wNc="
        },
        "npm-package-arg": {
          "version": "4.2.1",
@ -717,7 +720,8 @@
            },
            "core-util-is": {
              "version": "1.0.2",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
            },
            "isarray": {
              "version": "1.0.0",
@ -743,7 +747,8 @@
        },
        "realize-package-specifier": {
          "version": "3.0.3",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz",
+          "integrity": "sha1-0N74gpUrjeP2frpekRmWYScfQfQ="
        },
        "request": {
          "version": "2.81.0",
@ -1064,7 +1069,8 @@
          "dependencies": {
            "unique-slug": {
              "version": "2.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
+              "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks="
            }
          }
        },
@ -1420,7 +1426,8 @@
                },
                "spdx-license-ids": {
                  "version": "1.2.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz",
+                  "integrity": "sha1-tUndD2Pct0Whfi6joHQC4OMy0eI="
                }
              }
            }
--- a/build/build.ps1
+++ b/build/build.ps1
@ -13,6 +13,12 @@ cd ..
 # build ui
 cd ui
 npm install
+
+# necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
+# yes, it needs to be run twice. it fails the first time, not sure why
+node_modules\.bin\electron-rebuild
+node_modules\.bin\electron-rebuild
+
 node extractLocals.js
 node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\
 node_modules\.bin\webpack
--- a/build/build.sh
+++ b/build/build.sh
@ -45,6 +45,13 @@ if [ "$FULL_BUILD" == "true" ]; then
  python "$BUILD_DIR/set_version.py"
 fi

+libsecret="libsecret-1-dev"
+if $LINUX && [ -z "$(dpkg-query --show --showformat='${Status}\n' "$libsecret" 2>/dev/null | grep "install ok installed")" ]; then
+  # this is needed for keytar, which does secure password/token management
+  sudo apt-get install --no-install-recommends -y "$libsecret"
+fi
+
+
 [ -d "$ROOT/dist" ] && rm -rf "$ROOT/dist"
 mkdir -p "$ROOT/dist"
 [ -d "$ROOT/app/dist" ] && rm -rf "$ROOT/app/dist"
@ -61,6 +68,15 @@ npm install
 (
  cd "$ROOT/ui"
  npm install
+
+  # necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
+  # yes, it needs to be run twice. it fails the first time, not sure why
+  set +e
+  # DEBUG=electron-rebuild node_modules/.bin/electron-rebuild .
+  node_modules/.bin/electron-rebuild "$ROOT/ui"
+  set -e
+  node_modules/.bin/electron-rebuild "$ROOT/ui"
+
  node extractLocals.js
  node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
  node_modules/.bin/webpack
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,6 @@
 {
  "lockfileVersion": 1,
  "dependencies": {
-    "@types/node": {
-      "version": "7.0.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz",
-      "integrity": "sha512-+KrE1LDddn97ip+gXZAnzNQ0pupKH/6tcKwTpo96BDVNpzmhIKGHug0Wd3H0dN4WEqYB1tXYI5m2mZuIZNI8tg==",
-      "dev": true
-    },
    "7zip-bin": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.1.0.tgz",
--- a/ui/.gitignore
+++ b/ui/.gitignore
@ -1,7 +0,0 @@
-dist/css/*
-dist/js/*
-!dist/js/mediaelement
-node_modules
-.sass-cache
-.idea
-.DS_Store
--- a/ui/.travis.yml
+++ b/ui/.travis.yml
@ -1,35 +0,0 @@
-language: node_js
-node_js: 5
-
-# note that travis still builds PRs so that covers
-# other branches
-branches:
-  only: 
-    - master
-    - development
-
-install:
-  - rvm install 2.3.1
-  - npm install
-
-script:
-  - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger
-  - mkdir -p dist/css dist/js
-  - node_modules/.bin/node-sass scss/all.scss dist/css/all.css
-  - node_modules/.bin/webpack
-  - mkdir upload
-  - cd dist; zip -r ../upload/dist.zip *; cd -
-  - .travis/echo_sha.sh > upload/data.json
-
-deploy:
-  provider: s3
-  access_key_id:
-    secure: "LjqvQ2MQj8fbumcnIKZC5wa03s3SIAnaLdOrmi7uRcltKIMko20QluRlpXipmYLdDRBg9sZrGgHJzN2QMZBk29XDsPhnFTG5Mhnaf9Ycxac2dy6FABtarNXjEOSH6Vv+Z96W8NkNTly7Okgyg0lXylTi1rLm/JxW14z+SrDPBOVPx5i4Wemd/y4Qx/5Oy611jaZIC4tExL+KWLCfX6tCgg1iE1vnJ22DAjNVlUOmZrLpuhuz/d/4mgkjtZvHAENDPmTItoN6WXxWPspMuaBaSMsj5OuhXqfro8BygbalWfUN7bSMvCqvO+irC6PBeZ4ntq675fS6g9Xb0vzZ6KnNck40PdHXdZRb4wvseqphCL4Xy9cLgUfND3GhxDtStJlqpMeaCg5Yjd9JknQjfCteObLqVeHyjIbWUNsQlyyQcgrVdAQRQiImG+do5qWQXC/02YqxffGJxW/6iQUC/TqC6vNoTKbMSVlccHExt9wnoooZ8D7MT7oN4BCk8bw+G/momH03hGoI0xffcVM9mN+y4z3/BbDX+bn/H5J2cmGWVFZHcOcbY+ehsTmdcqmm+KeePIpKmP6bD7waSUp+czXMgAgfjlWKuzmOFVxvlTo/rLzj5NlIH35RtIKOoVjU8kHzYI1aWAKIHNTHHrUJp4aVYeYGw5y2oejaHnO0ltmVoog="
-  secret_access_key:
-    secure: "cAWUhKK+2//JBmV2ohcLs3WTDgDWAMK2RxDrwTqUBEeOdAHMRnEVR++a7fzEL+2dcYi939ZaynNXS5JFJANdjIEKmSWDtvyszyl5MWH0xERZtD0K0xs9bNXS8Un6UrTxhaatmQmqx0KokdUmdH5iqB02BBCKLuwGEjMcUVbadXkp+F8Pd4EXmDPbYHQ2eNo87FzQ7dCQ+GOyQBDNM1Orq+hOKiqJOzB9sDWKShsMTeq5Hyb1oji3cAxTyi6niJ/M/46NokLrPT0xrJLxy+sw5k2106SJXyofJsW1UVOsa5Nxx/suJTv2D0E6d7Ei1XYNnkAbDltu1m9wMq2xqLyoxfdvcC7bxr/NcUZ+DTCKcsM5oa8CiL/y+sOpB8ia0CjO3WBebIUWQAhyswQb312rYsbfQXscb5TnheS+wo4Z1MLse7fSm6jzZRZwqGi27GxC7SFWkSkBwHgaQ8tA7mzsdi6DFmz/KrnwgzqzFRkGg9d0RNXVfUN09p0GJr9drVS1DscVYWGhhD1eDKAIEaEd89u0vKF83zLk73UuNVZA38kkERtLwv7Yr1rRdftL3/gt6fMiW//JQB9sRWV0fDfiWbV2vaki6c/0s6moX00UBuZq21FEpx8puylUOwkXNlQK6TH/bw41ikrRMO156njokYOwLgQaebI/Mb0Cwi32gOU="
-  bucket: lbry-ui
-  skip_cleanup: true
-  upload-dir: ${TRAVIS_BRANCH}
-  local_dir: upload
-  on:
-    all_branches: true
--- a/ui/.travis/echo_sha.sh
+++ b/ui/.travis/echo_sha.sh
@ -1,7 +0,0 @@
-#!/bin/bash
-
-# this is a script instead of a line in the travis.yml
-# getting the quoting on this correctly inside the yaml is
-# unreadable and difficult
-
-echo '{"sha": "'${TRAVIS_COMMIT}'"}'
--- a/ui/LICENSE.md
+++ b/ui/LICENSE.md
@ -1 +0,0 @@
-See https://github.com/lbryio/lbry/blob/master/LICENSE
--- a/ui/js/actions/user.js
+++ b/ui/js/actions/user.js
@ -33,20 +33,20 @@ export function doUserFetch() {
    dispatch({
      type: types.USER_FETCH_STARTED,
    });
-    lbryio.setCurrentUser(
-      user => {
+    lbryio
+      .getCurrentUser()
+      .then(user => {
        dispatch({
          type: types.USER_FETCH_SUCCESS,
          data: { user },
        });
-      },
-      error => {
+      })
+      .catch(error => {
        dispatch({
          type: types.USER_FETCH_FAILURE,
          data: { error },
        });
-      }
-    );
+      });
  };
 }

@ -56,32 +56,37 @@ export function doUserEmailNew(email) {
      type: types.USER_EMAIL_NEW_STARTED,
      email: email,
    });
-    lbryio.call("user_email", "new", { email }, "post").then(
-      () => {
+    lbryio
+      .call(
+        "user_email",
+        "new",
+        { email: email, send_verification_email: true },
+        "post"
+      )
+      .catch(error => {
+        if (error.xhr && error.xhr.status == 409) {
+          return lbryio.call(
+            "user_email",
+            "resend_token",
+            { email: email, only_if_expired: true },
+            "post"
+          );
+        }
+        throw error;
+      })
+      .then(() => {
        dispatch({
          type: types.USER_EMAIL_NEW_SUCCESS,
          data: { email },
        });
        dispatch(doUserFetch());
-      },
-      error => {
-        if (
-          error.xhr &&
-          (error.xhr.status == 409 ||
-            error.message == "This email is already in use")
-        ) {
-          dispatch({
-            type: types.USER_EMAIL_NEW_EXISTS,
-            data: { email },
-          });
-        } else {
-          dispatch({
-            type: types.USER_EMAIL_NEW_FAILURE,
-            data: { error: error.message },
-          });
-        }
-      }
-    );
+      })
+      .catch(error => {
+        dispatch({
+          type: types.USER_EMAIL_NEW_FAILURE,
+          data: { error: error.message },
+        });
+      });
  };
 }

--- a/ui/js/lbryio.js
+++ b/ui/js/lbryio.js
@ -1,21 +1,21 @@
-import { getSession, setSession, setLocal } from "./utils.js";
 import lbry from "./lbry.js";

 const querystring = require("querystring");
+const keytar = require("keytar");

 const lbryio = {
-  _accessToken: getSession("accessToken"),
-  _authenticationPromise: null,
  enabled: true,
+  _authenticationPromise: null,
+  _exchangePromise: null,
+  _exchangeLastFetched: null,
 };

 const CONNECTION_STRING = process.env.LBRY_APP_API_URL
  ? process.env.LBRY_APP_API_URL.replace(/\/*$/, "/") // exactly one slash at the end
  : "https://api.lbry.io/";
+
 const EXCHANGE_RATE_TIMEOUT = 20 * 60 * 1000;

-lbryio._exchangePromise = null;
-lbryio._exchangeLastFetched = null;
 lbryio.getExchangeRates = function() {
  if (
    !lbryio._exchangeLastFetched ||
@ -60,7 +60,7 @@ lbryio.call = function(resource, action, params = {}, method = "get") {

      if (!response.success) {
        if (reject) {
-          let error = new Error(response.error);
+          const error = new Error(response.error);
          error.xhr = xhr;
          reject(error);
        } else {
@ -81,54 +81,54 @@ lbryio.call = function(resource, action, params = {}, method = "get") {
      }
    });

-    // For social media auth:
-    //const accessToken = localStorage.getItem('accessToken');
-    //const fullParams = {...params, ... accessToken ? {access_token: accessToken} : {}};
+    lbryio
+      .getAuthToken()
+      .then(token => {
+        const fullParams = { auth_token: token, ...params };

-    // Temp app ID based auth:
-    const fullParams = { app_id: lbryio.getAccessToken(), ...params };
-
-    if (method == "get") {
-      xhr.open(
-        "get",
-        CONNECTION_STRING +
-          resource +
-          "/" +
-          action +
-          "?" +
-          querystring.stringify(fullParams),
-        true
-      );
-      xhr.send();
-    } else if (method == "post") {
-      xhr.open("post", CONNECTION_STRING + resource + "/" + action, true);
-      xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-      xhr.send(querystring.stringify(fullParams));
-    } else {
-      reject(new Error(__("Invalid method")));
-    }
+        if (method == "get") {
+          xhr.open(
+            "get",
+            CONNECTION_STRING +
+              resource +
+              "/" +
+              action +
+              "?" +
+              querystring.stringify(fullParams),
+            true
+          );
+          xhr.send();
+        } else if (method == "post") {
+          xhr.open("post", CONNECTION_STRING + resource + "/" + action, true);
+          xhr.setRequestHeader(
+            "Content-type",
+            "application/x-www-form-urlencoded"
+          );
+          xhr.send(querystring.stringify(fullParams));
+        } else {
+          reject(new Error(__("Invalid method")));
+        }
+      })
+      .catch(reject);
  });
 };

-lbryio.getAccessToken = () => {
-  const token = getSession("accessToken");
-  return token ? token.toString().trim() : token;
+lbryio.getAuthToken = () => {
+  return keytar.getPassword("LBRY", "auth_token").then(token => {
+    return token ? token.toString().trim() : null;
+  });
 };

-lbryio.setAccessToken = token => {
-  setSession("accessToken", token ? token.toString().trim() : token);
+lbryio.setAuthToken = token => {
+  return keytar.setPassword(
+    "LBRY",
+    "auth_token",
+    token ? token.toString().trim() : null
+  );
 };

-lbryio.setCurrentUser = (resolve, reject) => {
-  lbryio
-    .call("user", "me")
-    .then(data => {
-      resolve(data);
-    })
-    .catch(function(err) {
-      lbryio.setAccessToken(null);
-      reject(err);
-    });
+lbryio.getCurrentUser = () => {
+  return lbryio.call("user", "me");
 };

 lbryio.authenticate = function() {
@ -144,48 +144,69 @@ lbryio.authenticate = function() {
      });
    });
  }
+
  if (lbryio._authenticationPromise === null) {
    lbryio._authenticationPromise = new Promise((resolve, reject) => {
-      lbry
-        .status()
-        .then(response => {
-          let installation_id = response.installation_id;
-
-          if (!lbryio.getAccessToken()) {
-            lbryio
-              .call(
-                "user",
-                "new",
-                {
-                  language: "en",
-                  app_id: installation_id,
-                },
-                "post"
-              )
-              .then(function(responseData) {
-                if (!responseData.id) {
-                  reject(
-                    new Error("Received invalid authentication response.")
-                  );
-                }
-                lbryio.setAccessToken(installation_id);
-                lbryio.setCurrentUser(resolve, reject);
-              })
-              .catch(function(error) {
-                /*
-						 until we have better error code format, assume all errors are duplicate application id
-						 if we're wrong, this will be caught by later attempts to make a valid call
-						*/
-                lbryio.setAccessToken(installation_id);
-                lbryio.setCurrentUser(resolve, reject);
-              });
-          } else {
-            lbryio.setCurrentUser(resolve, reject);
+      lbryio
+        .getAuthToken()
+        .then(token => {
+          if (!token || token.length > 60) {
+            return false;
          }
+
+          // check that token works
+          return lbryio
+            .getCurrentUser()
+            .then(() => {
+              return true;
+            })
+            .catch(() => {
+              return false;
+            });
        })
-        .catch(reject);
+        .then(isTokenValid => {
+          if (isTokenValid) {
+            return;
+          }
+
+          let app_id;
+
+          return lbry
+            .status()
+            .then(status => {
+              // first try swapping
+              app_id = status.installation_id;
+              return lbryio.call(
+                "user",
+                "token_swap",
+                { auth_token: "", app_id: app_id },
+                "post"
+              );
+            })
+            .catch(err => {
+              if (err.xhr.status == 403) {
+                // cannot swap. either app_id doesn't exist, or app_id already swapped. pretend its the former and create a new user. if we get another error, then its the latter
+                return lbryio.call(
+                  "user",
+                  "new",
+                  { auth_token: "", language: "en", app_id: app_id },
+                  "post"
+                );
+              }
+              throw err;
+            })
+            .then(response => {
+              if (!response.auth_token) {
+                throw new Error(__("auth_token is missing from response"));
+              }
+              return lbryio.setAuthToken(response.auth_token);
+            });
+        })
+        .then(lbryio.getCurrentUser())
+        .then(resolve, reject);
    });
  }
+
  return lbryio._authenticationPromise;
 };

--- a/ui/js/selectors/user.js
+++ b/ui/js/selectors/user.js
@ -68,8 +68,7 @@ export const selectUserIsVerificationCandidate = createSelector(
  selectUserIsRewardApproved,
  selectEmailToVerify,
  selectUser,
-  (isEligible, isApproved, emailToVerify, user) =>
-    (isEligible && !isApproved) || (emailToVerify && user && !user.has_email)
+  (isEligible, isApproved, emailToVerify, user) => emailToVerify && user
 );

 export const selectUserIsAuthRequested = createSelector(
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@ -97,6 +97,12 @@
      "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=",
      "dev": true
    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
    "anymatch": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
@ -140,9 +146,9 @@
      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
    },
    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
+      "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
      "dev": true
    },
    "array-union": {
@ -661,9 +667,9 @@
      "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4="
    },
    "babylon": {
-      "version": "6.17.3",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.3.tgz",
-      "integrity": "sha512-mq0x3HCAGGmQyZXviOVe5TRsw37Ijy3D43jCqt/9WVf+onx2dUgW3PosnqCbScAFhRO9DGs8nxoMzU0iiosMqQ=="
+      "version": "6.17.4",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz",
+      "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw=="
    },
    "balanced-match": {
      "version": "1.0.0",
@ -715,9 +721,15 @@
      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo="
    },
    "bn.js": {
-      "version": "4.11.6",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
-      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "version": "4.11.7",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz",
+      "integrity": "sha512-LxFiV5mefv0ley0SzqkOPR1bC4EbpPx8LkOz5vMe/Yi15t5hzwgO/G+tc7wOtL4PZTYjwHu8JnEiSLumuSjSfA==",
+      "dev": true
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
      "dev": true
    },
    "boom": {
@ -783,6 +795,12 @@
      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
      "dev": true
    },
+    "buffer-indexof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz",
+      "integrity": "sha1-9U9kfE9OJSKLqmVqLlfkPV8nCYI=",
+      "dev": true
+    },
    "buffer-xor": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@ -874,22 +892,30 @@
      "dev": true
    },
    "cli-cursor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
      "dev": true
    },
    "cli-spinners": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz",
+      "integrity": "sha1-75h+09SDkaw9q5GAtAanQhgNbmo=",
      "dev": true
    },
    "cli-table": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-      "dev": true
+      "dev": true,
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        }
+      }
    },
    "cli-truncate": {
      "version": "0.2.1",
@ -931,9 +957,9 @@
      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
    },
    "colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
      "dev": true
    },
    "combined-stream": {
@ -1090,9 +1116,9 @@
      "dev": true
    },
    "create-react-class": {
-      "version": "15.5.4",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.5.4.tgz",
-      "integrity": "sha1-GIh1yxXi++TKWVtvQ+sOSh8A/lA="
+      "version": "15.6.0",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz",
+      "integrity": "sha1-q0SEl8JlZuHilBPogyB9V8/nvtQ="
    },
    "cross-spawn": {
      "version": "3.0.1",
@ -1166,6 +1192,12 @@
      "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz",
      "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ="
    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
    "deep-is": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@ -1229,6 +1261,24 @@
      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
      "dev": true
    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz",
+      "integrity": "sha1-I2nUUDivBF84mOb6VoYq7T9AKWw=",
+      "dev": true
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true
+    },
    "doctrine": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
@ -1253,12 +1303,23 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
      "dev": true
    },
+    "electron-rebuild": {
+      "version": "1.5.11",
+      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.5.11.tgz",
+      "integrity": "sha1-bqZg3rVGpRbn76qBzVmF1WZPJFw=",
+      "dev": true
+    },
    "elegant-spinner": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
      "dev": true
    },
+    "element-class": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/element-class/-/element-class-0.2.2.tgz",
+      "integrity": "sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4="
+    },
    "elliptic": {
      "version": "6.4.0",
      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
@ -1413,9 +1474,9 @@
      "dev": true
    },
    "eslint-loader": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-1.7.1.tgz",
-      "integrity": "sha1-ULFY3WJy3O+5fphCVIN/gaWALOA=",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-1.8.0.tgz",
+      "integrity": "sha512-+d9me9y9t+/k1pY5hsorY685H3yYoQT0t5pZT1TGB7L46VOoLv8+3uKHvkjpUx1aCTjeacbj4yz4s5/LcGolpg==",
      "dev": true,
      "dependencies": {
        "loader-utils": {
@ -1547,18 +1608,10 @@
      "dev": true
    },
    "esrecurse": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz",
-      "integrity": "sha1-RxO2U2rffyrE8yfVWed1a/9kgiA=",
-      "dev": true,
-      "dependencies": {
-        "estraverse": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
-          "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=",
-          "dev": true
-        }
-      }
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "dev": true
    },
    "estraverse": {
      "version": "4.2.0",
@ -1621,6 +1674,11 @@
        }
      }
    },
+    "exenv": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.0.tgz",
+      "integrity": "sha1-ODXxJ6vwdb/ggtCu1EhAV8eOPIk="
+    },
    "exit-hook": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@ -1643,6 +1701,12 @@
      "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
      "dev": true,
      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        },
        "debug": {
          "version": "2.6.7",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
@ -1803,6 +1867,18 @@
      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8="
    },
+    "fs-extra": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+      "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+      "dev": true
+    },
+    "fs-promise": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-2.0.3.tgz",
+      "integrity": "sha1-9k5PhUvPaJqovdy6JokW2z20aFQ=",
+      "dev": true
+    },
    "fs-readdir-recursive": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
@ -2515,9 +2591,9 @@
      "dev": true
    },
    "hash.js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
-      "integrity": "sha1-EzL/ABVsCg/92CNgE9B7d6BFFXM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.1.tgz",
+      "integrity": "sha512-I2TYCUjYQMmqmRMCp6jKMC5bvdXxGIZ/heITRR/0F1u0OP920ImEj/cXt3WgcTKBnNYGn7enxUzdai3db829JA==",
      "dev": true
    },
    "hawk": {
@ -2695,6 +2771,32 @@
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
+      "dev": true,
+      "dependencies": {
+        "cli-cursor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+          "dev": true
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
+      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
      "dev": true
    },
    "interpret": {
@ -2713,6 +2815,12 @@
      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
    "ipaddr.js": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
@ -2978,6 +3086,12 @@
      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true
+    },
    "jsonify": {
      "version": "0.0.0",
      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@ -3019,6 +3133,18 @@
      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
      "dev": true
    },
+    "keytar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-4.0.3.tgz",
+      "integrity": "sha1-RaNnQsHPzQchDSbRuUKOKXh5vPw=",
+      "dependencies": {
+        "nan": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz",
+          "integrity": "sha1-1bAWkSUzJql6K77p5hxV2NYDUeI="
+        }
+      }
+    },
    "kind-of": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@ -3056,7 +3182,39 @@
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
      "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
-      "dev": true
+      "dev": true,
+      "dependencies": {
+        "cli-cursor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+          "dev": true
+        },
+        "cli-spinners": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+          "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+          "dev": true
+        },
+        "ora": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
+          "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+          "dev": true
+        }
+      }
    },
    "listr-silent-renderer": {
      "version": "1.1.1",
@ -3082,7 +3240,27 @@
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.0.tgz",
      "integrity": "sha1-RNwBuww0oDxXIVTU0Izemx3FYg8=",
-      "dev": true
+      "dev": true,
+      "dependencies": {
+        "cli-cursor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+          "dev": true
+        }
+      }
    },
    "load-json-file": {
      "version": "1.1.0",
@ -3264,7 +3442,27 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
-      "dev": true
+      "dev": true,
+      "dependencies": {
+        "cli-cursor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+          "dev": true
+        }
+      }
    },
    "longest": {
      "version": "1.0.1",
@ -3377,6 +3575,12 @@
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0="
    },
+    "mimic-fn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "dev": true
+    },
    "minimalistic-assert": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
@ -3419,6 +3623,18 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
    },
+    "multicast-dns": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz",
+      "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=",
+      "dev": true
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
    "multistream": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz",
@ -3430,6 +3646,12 @@
      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
      "dev": true
    },
+    "mz": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz",
+      "integrity": "sha1-yLhSHZWN8KTydoAl22nHGe5O8c4=",
+      "dev": true
+    },
    "nan": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
@ -3452,6 +3674,12 @@
      "resolved": "https://registry.npmjs.org/next-event/-/next-event-1.0.0.tgz",
      "integrity": "sha1-53eKzeLlWALgrRh5w5z2917aYdg="
    },
+    "node-abi": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.0.3.tgz",
+      "integrity": "sha1-DKZ+XmZ7jhNDVJyhcVOoFdC7/ao=",
+      "dev": true
+    },
    "node-emoji": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz",
@ -3463,6 +3691,12 @@
      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz",
      "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ=="
    },
+    "node-forge": {
+      "version": "0.6.33",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz",
+      "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=",
+      "dev": true
+    },
    "node-gyp": {
      "version": "3.6.2",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
@ -3482,6 +3716,12 @@
        }
      }
    },
+    "node-loader": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/node-loader/-/node-loader-0.6.0.tgz",
+      "integrity": "sha1-x5fvUQle1YWZArFX9jhPY2HgWug=",
+      "dev": true
+    },
    "node-notifier": {
      "version": "4.6.1",
      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-4.6.1.tgz",
@ -3606,9 +3846,9 @@
      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
    },
    "onetime": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
      "dev": true
    },
    "opn": {
@ -3638,9 +3878,9 @@
      "dev": true
    },
    "ora": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
-      "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz",
+      "integrity": "sha1-gAeN0rkqk0r2ajrXKluRBpTt5Ro=",
      "dev": true
    },
    "original": {
@ -3883,9 +4123,9 @@
      "dev": true
    },
    "promise": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
-      "integrity": "sha1-SJZUxpJha4qlWwck+oCbt9tJxb8="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="
    },
    "prop-types": {
      "version": "15.5.10",
@ -3976,15 +4216,7 @@
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
-          "integrity": "sha512-aSLEDudu6OoRr/2rU609gRmnYboRLxgDG1z9o2Q0os7236FwvcqIOO8r8U5JUEwivZOhDaKlFO4SbPTJYyBEyQ==",
-          "dev": true
-        }
-      }
+      "dev": true
    },
    "range-parser": {
      "version": "1.2.0",
@ -4003,19 +4235,24 @@
      "integrity": "sha1-0xzLFJmuIjwNIdFIVlCqSg03TOA="
    },
    "react": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.6.0.tgz",
-      "integrity": "sha1-wjKZtI4w7TAlCM6J4aAskZ+Ca84="
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz",
+      "integrity": "sha1-uqhDTsZ4C96ZfNw4C3nNM7ljk98="
    },
    "react-dom": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.0.tgz",
-      "integrity": "sha1-i8I8sMgOcGNVt2yp+M5Hz3vfttE="
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz",
+      "integrity": "sha1-LLDtQZEDjlPCCes6eaI+Kkz5lHA="
+    },
+    "react-dom-factories": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom-factories/-/react-dom-factories-1.0.0.tgz",
+      "integrity": "sha1-9DwF5QUbME8zJRYY1byFmynka20="
    },
    "react-modal": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-1.9.4.tgz",
-      "integrity": "sha512-ourtHswaEA/KyeI20AsCOSWTC23WF3z0b1C3qzQtA5UhBOdwQ2sEK2OPJGN8u7iFGJ83etmk605aeF/i4tGVEQ=="
+      "version": "1.9.7",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-1.9.7.tgz",
+      "integrity": "sha512-oZNqI0ZnPD7NnfObrCMz2hxHTAw5oEuhZJ+gnyFNIQB2rR8h1YbLQTfhms1mtSJigb0J23OOWElHjXYYaKO+wg=="
    },
    "react-redux": {
      "version": "5.0.5",
@ -4033,9 +4270,9 @@
      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI="
    },
    "readable-stream": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz",
-      "integrity": "sha512-h+8+r3MKEhkiVrwdKL8aWs1oc1VvBu33ueshOvS26RsZQ3Amhx/oO3TKe4lApSV9ueY6as8EAh7mtuFjdlhg9Q=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.0.tgz",
+      "integrity": "sha512-c7KMXGd4b48nN3OJ1U9qOsn6pXNzf6kLd3kdZCkg2sxAcoiufInqF0XckwEnlrcwuaYwonlNK8GQUIOC/WC7sg=="
    },
    "readdirp": {
      "version": "2.1.0",
@ -4086,9 +4323,9 @@
      }
    },
    "redux": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz",
-      "integrity": "sha1-iHwrPQub2G7KK+cFccJ2VMGeGI0="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.0.tgz",
+      "integrity": "sha512-GHjaOkEQtQnnuLoYPFkRKHIqs1i1tdTlisu/xUHfk2juzCobSy4STxs4Lz5bPkc07Owb6BeGKx/r76c9IVTkOw=="
    },
    "redux-action-buffer": {
      "version": "1.1.0",
@ -4238,9 +4475,9 @@
      "dev": true
    },
    "restore-cursor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
      "dev": true
    },
    "right-align": {
@ -4273,15 +4510,15 @@
      "dev": true
    },
    "rxjs": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz",
-      "integrity": "sha1-p9sUqxV/nXqsalbmVeejhg05vyY=",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.1.tgz",
+      "integrity": "sha1-ti91fyeURdJloYpY+wpw3JDpFiY=",
      "dev": true
    },
    "safe-buffer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-      "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
+      "integrity": "sha512-aSLEDudu6OoRr/2rU609gRmnYboRLxgDG1z9o2Q0os7236FwvcqIOO8r8U5JUEwivZOhDaKlFO4SbPTJYyBEyQ=="
    },
    "sass-graph": {
      "version": "2.2.4",
@ -4306,6 +4543,12 @@
      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
      "dev": true
    },
+    "selfsigned": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.9.1.tgz",
+      "integrity": "sha1-zdpEktcNSGVw+HxlVGAjVY4d+lo=",
+      "dev": true
+    },
    "semver": {
      "version": "5.3.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@ -4453,6 +4696,12 @@
      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E="
    },
+    "spawn-rx": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.11.tgz",
+      "integrity": "sha1-ZUUa1lZigB2up1VJgyp4LeAEjb8=",
+      "dev": true
+    },
    "spdx-correct": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
@ -4541,7 +4790,14 @@
    "string_decoder": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz",
-      "integrity": "sha1-sp4fThEl+pehA4K4pTNze3SR4Xk="
+      "integrity": "sha1-sp4fThEl+pehA4K4pTNze3SR4Xk=",
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
+        }
+      }
    },
    "string-width": {
      "version": "1.0.2",
@ -4633,6 +4889,18 @@
      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
      "dev": true
    },
+    "thenify": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
+      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
+      "dev": true
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true
+    },
    "through": {
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@ -4660,6 +4928,12 @@
        }
      }
    },
+    "thunky": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
+      "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=",
+      "dev": true
+    },
    "timers-browserify": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz",
@ -4850,9 +5124,9 @@
      "dev": true
    },
    "uuid": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-      "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
    },
    "v8flags": {
      "version": "2.1.1",
@ -4963,9 +5237,9 @@
      "dev": true
    },
    "webpack-dev-server": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz",
-      "integrity": "sha1-MThM6BE2vhCAtLTN4OubkOVO5s8=",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.5.0.tgz",
+      "integrity": "sha1-TTanKLA7iyr6SO0wJCiEfOooQK0=",
      "dev": true,
      "dependencies": {
        "camelcase": {
@ -4974,6 +5248,32 @@
          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
          "dev": true
        },
+        "del": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+          "dev": true
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
        "supports-color": {
          "version": "3.2.3",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
--- a/ui/package.json
+++ b/ui/package.json
@ -16,11 +16,11 @@
    "name": "LBRY Inc.",
    "email": "hello@lbry.io"
  },
-  "license": "SEE LICENSE IN LICENSE.md",
+  "license": "MIT",
  "bugs": {
    "url": "https://github.com/lbryio/lbry-app/issues"
  },
-  "homepage": "https://github.com/lbryio/lbry-app#readme",
+  "homepage": "https://github.com/lbryio/lbry-app",
  "dependencies": {
    "babel-cli": "^6.11.4",
    "babel-preset-es2015": "^6.13.2",
@ -28,6 +28,7 @@
    "from2": "^2.3.0",
    "jshashes": "^1.0.6",
    "localforage": "^1.5.0",
+    "keytar": "^4.0.3",
    "node-sass": "^3.8.0",
    "rc-progress": "^2.0.6",
    "react": "^15.4.0",
@ -54,6 +55,7 @@
    "babel-preset-es2015": "^6.18.0",
    "babel-preset-react": "^6.16.0",
    "babel-preset-stage-2": "^6.18.0",
+    "electron-rebuild": "^1.5.11",
    "eslint": "^3.10.2",
    "eslint-config-airbnb": "^13.0.0",
    "eslint-loader": "^1.6.1",
@ -64,6 +66,7 @@
    "i18n-extract": "^0.4.4",
    "json-loader": "^0.5.4",
    "lint-staged": "^3.6.0",
+    "node-loader": "^0.6.0",
    "node-sass": "^3.13.0",
    "prettier": "^1.4.2",
    "webpack": "^2.6.1",
--- a/ui/watch.sh
+++ b/ui/watch.sh
@ -7,16 +7,19 @@ set -euo pipefail

 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

-mkdir -p $DIR/dist/css
-mkdir -p $DIR/dist/js
+(
+  cd "$DIR"
+  mkdir -p $DIR/dist/css
+  mkdir -p $DIR/dist/js

-if [ ! -d "$DIR/node_modules" ]; then
-  echo "Installing NPM modules"
-  npm install
-fi
+  if [ ! -d "$DIR/node_modules" ]; then
+    echo "Installing NPM modules"
+    npm install
+  fi

-# run sass once without --watch to force update. then run with --watch to keep watching
-$DIR/node_modules/.bin/node-sass --output $DIR/../app/dist/css --sourcemap=none $DIR/scss/
-$DIR/node_modules/.bin/node-sass --output $DIR/../app/dist/css --sourcemap=none --watch $DIR/scss/ &
+  # run sass once without --watch to force update. then run with --watch to keep watching
+  node_modules/.bin/node-sass --output $DIR/../app/dist/css --sourcemap=none $DIR/scss/
+  node_modules/.bin/node-sass --output $DIR/../app/dist/css --sourcemap=none --watch $DIR/scss/ &

-node_modules/.bin/webpack --config webpack.dev.config.js --progress --colors --watch
+  node_modules/.bin/webpack --config webpack.dev.config.js --progress --colors --watch
+)
--- a/ui/webpack.config.js
+++ b/ui/webpack.config.js
@ -33,6 +33,10 @@ module.exports = {
        // define an include so we check just the files we need
        include: PATHS.app
      },
+      {
+        test: /\.node$/,
+        use: ["node-loader"]
+      },
      {
        test: /\.css$/,
        use: ["style-loader", "css-loader"]
--- a/ui/webpack.dev.config.js
+++ b/ui/webpack.dev.config.js
@ -41,6 +41,10 @@ module.exports = {
        // define an include so we check just the files we need
        include: PATHS.app
      },
+      {
+        test: /\.node$/,
+        use: ["node-loader"]
+      },
      {
        test: /\.css$/,
        use: ["style-loader", "css-loader"]
				`@ -1 +0,0 @@`
				`See https://github.com/lbryio/lbry/blob/master/LICENSE`