Merge branch 'beta'

Author: jarrodek

.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
+  parser: "babel-eslint",
   // extends: ['eslint-config-google'].map(require.resolve),
   extends: ['@advanced-rest-client/eslint-config'].map(require.resolve),
   rules: {

.travis.yml

@@ -21,6 +21,9 @@ cache:
   - "$HOME/.cache/electron-builder"
 before_cache:
 - rm -rf $HOME/.cache/electron-builder/wine
+branches:
+  except:
+    - "/^\\d+\\.\\d+\\.\\d+$/"
 install:
 - npm install
 script: "./test/travis-build.sh"

app.js

@@ -1,5 +1,8 @@
 // Scrips are moved to scripts/renderer/preload.js so node integration can be disabled
 // in the application window.
+
+/* eslint-disable no-console */
+
 /**
  * Class responsible for initializing the main ARC elements
  * and setup base options.
@@ -94,6 +97,7 @@ class ArcInit {
     ipc.on('app-navigate', this._appNavHandler.bind(this));
     ipc.on('popup-app-menu-opened', this._popupMenuOpened.bind(this));
     ipc.on('popup-app-menu-closed', this._popupMenuClosed.bind(this));
+    ipc.on('system-theme-changed', this._systemThemeChangeHandler.bind(this));
   }
   /**
    * Requests initial state information from the main process for current
@@ -145,9 +149,9 @@ class ArcInit {
       throw e;
     }
     if (this.initConfig.darkMode) {
-      cnf.theme = 'advanced-rest-client/arc-electron-dark-theme';
+      cnf.theme = '@advanced-rest-client/arc-electron-dark-theme';
     }
-    if (cnf.theme === 'advanced-rest-client/arc-electron-anypoint-theme') {
+    if (cnf.theme === '@advanced-rest-client/arc-electron-anypoint-theme') {
       const app = this.app;
       app.compatibility = true;
     }
@@ -177,6 +181,7 @@ class ArcInit {
     if (this.created) {
       return Promise.resolve();
     }
+    /* eslint-disable-next-line import/no-unresolved */
     await import('web-module://src/arc-electron.js');
     const app = document.createElement('arc-electron');
     app.id = 'app';
@@ -237,7 +242,7 @@ class ArcInit {
    */
   commandHandler(e, action, ...args) {
     // console.info('Renderer command handled: ', action);
-    const app = this.app;
+    const { app } = this;
     switch (action) {
       case 'show-settings': app.openSettings(); break;
       case 'about': app.openAbout(); break;
@@ -262,6 +267,7 @@ class ArcInit {
       case 'open-onboarding': app.openOnboarding(); break;
       case 'open-workspace-details': app.openWorkspaceDetails(); break;
       case 'export-workspace': this.exportWorkspace(); break;
+      case 'open-client-certificates': app.openClientCertificates(); break;
       default:
         console.warn('Unknown command', action, args);
     }
@@ -504,6 +510,26 @@ class ArcInit {
     const workspace = this.app.workspace.serializeWorkspace();
     return await this.fs.exportFileData(workspace, 'application/json', 'arc-workspace.arc');
   }
+  /**
+   * Handler for system theme change event dispatche in the IO thread.
+   * Updates theme depending on current setting.
+   *
+   * @param {Event} e
+   * @param {Boolean} isDarkMode true when Electron detected dark mode
+   * @return {Promise}
+   */
+  async _systemThemeChangeHandler(e, isDarkMode) {
+    const theme = isDarkMode ?
+      '@advanced-rest-client/arc-electron-dark-theme' :
+      '@advanced-rest-client/arc-electron-default-theme';
+    const app = this.app;
+    app.compatibility = false;
+    try {
+      await this.themeManager.loadTheme(theme);
+    } catch (e) {
+      console.error(e);
+    }
+  }
 }
 
 const initScript = new ArcInit();

dev-api/api-es.js

@@ -0,0 +1,49 @@
+import express from 'express';
+import session from 'express-session';
+import apiRouter from './routes.js';
+
+/* eslint-disable no-console */
+
+const app = express();
+export default app;
+
+app.disable('etag');
+app.disable('x-powered-by');
+app.set('trust proxy', true);
+
+const sessionConfig = {
+  resave: false,
+  saveUninitialized: false,
+  secret: 'dev-secret',
+  signed: true
+};
+
+app.use(session(sessionConfig));
+app.use('/v1', apiRouter);
+
+const portStr = process.argv.slice(2).find((arg) => arg.indexOf('--PORT') === 0);
+let port;
+if (!isNaN(portStr)) {
+  port = Number(portStr);
+} else {
+  port = 8080;
+}
+
+// Basic 404 handler
+app.use((req, res) => {
+  res.status(404).send('Not Found');
+});
+
+// Basic error handler
+app.use((err, req, res) => {
+  console.error(err.response);
+  res.status(500).send({
+    error: true,
+    message: err.response || 'Something is wrong...'
+  });
+});
+
+const server = app.listen(port, () => {
+  const port = server.address().port;
+  console.info(`App listening on port ${port}`);
+});

dev-api/api.js

@@ -0,0 +1,2 @@
+require = require('esm')(module);
+module.exports = require('./api-es.js');

dev-api/auth-basic.route.js

@@ -0,0 +1,42 @@
+import express from 'express';
+import { BaseApi } from './base-api.js';
+
+const router = express.Router();
+export default router;
+
+class AuthBaiscRoute extends BaseApi {
+  sendUnauthorized(res) {
+    res.status(401);
+    res.set('WWW-Authenticate', 'Basic realm="This resource is protected"');
+    res.send('Auth required');
+  }
+
+  requireAuthorized(req, res) {
+    const auth = req.headers['authorization'];
+    if (!auth) {
+      this.sendUnauthorized(res);
+      return;
+    }
+    const { username, password } = req.params;
+    try {
+      const parsed = auth.replace(/basic| /ig).trim();
+      const buff = new Buffer(parsed, 'base64');
+      const str = buff.toString('ascii');
+      const [aUname, aPasswd] = str.split(':');
+      if (username !== aUname || password !== aPasswd) {
+        this.sendUnauthorized(res);
+        return;
+      }
+    } catch (e) {
+      this.sendUnauthorized(res);
+      return;
+    }
+    this.printDefaultResponse(req, res);
+  }
+}
+
+const api = new AuthBaiscRoute();
+api.setCors(router);
+api.wrapApi(router, [
+  ['/:username/:password', 'requireAuthorized'],
+]);

dev-api/base-api.js

@@ -0,0 +1,78 @@
+import cors from 'cors';
+
+export class BaseApi {
+  constructor() {
+    this._processCors = this._processCors.bind(this);
+  }
+  /**
+   * Sets CORS on all routes for `OPTIONS` HTTP method.
+   * @param {Object} router Express app.
+   */
+  setCors(router) {
+    router.options('*', cors(this._processCors));
+  }
+  /**
+   * Shorthand function to register a route on this class.
+   * @param {Object} router Express app.
+   * @param {Array<Array<String>>} routes List of routes. Each route is an array
+   * where:
+   * - index `0` is the API route, eg, `/api/models/:modelId`
+   * - index `1` is the function name to call
+   * - index `2` is optional and describes HTTP method. Defaults to 'get'.
+   * It must be lowercase.
+   */
+  wrapApi(router, routes) {
+    for (let i = 0, len = routes.length; i < len; i++) {
+      const route = routes[i];
+      const method = route[2] || 'get';
+      const clb = this[route[1]].bind(this);
+      router[method](route[0], cors(this._processCors), clb);
+    }
+  }
+  /**
+   * Sends error to the client in a standarized way.
+   * @param {Object} res HTTP response object
+   * @param {String} message Error message to send.
+   * @param {?Number} status HTTP status code, default to 400.
+   */
+  sendError(res, message, status) {
+    res.status(status || 400).send({
+      error: true,
+      message
+    });
+  }
+
+  _processCors(req, callback) {
+    const whitelist = [];
+    const origin = req.header('Origin');
+    let corsOptions;
+    if (!origin) {
+      corsOptions = { origin: false };
+    } else if (origin.indexOf('http://localhost:') === 0 || origin.indexOf('http://127.0.0.1:') === 0) {
+      corsOptions = { origin: true };
+    } else if (whitelist.indexOf(origin) !== -1) {
+      corsOptions = { origin: true };
+    }
+    if (corsOptions) {
+      corsOptions.credentials = true;
+      corsOptions.allowedHeaders = ['Content-Type', 'Authorization'];
+      corsOptions.origin = origin;
+    }
+    callback(null, corsOptions);
+  }
+  /**
+   * Creates a default response message and writes it to the response.
+   * @param {Object} req
+   * @param {Object} res
+   */
+  printDefaultResponse(req, res) {
+    const result = {
+      header: req.headers,
+      url: req.url
+    };
+    if (req.body) {
+      result.body = req.body;
+    }
+    res.send(result);
+  }
+}

dev-api/routes.js

@@ -0,0 +1,30 @@
+import express from 'express';
+import statusCodesRoute from './status-codes.route.js';
+import authBasicRoute from './auth-basic.route.js';
+
+/* eslint-disable no-console */
+
+const router = express.Router();
+export default router;
+
+// Test scenarios for status codes
+router.use('/status', statusCodesRoute);
+router.use('/auth/basic', authBasicRoute);
+
+// Errors
+router.use((req, res) => {
+  const message = `Route ${req.url} not found`;
+  console.warn(message);
+  res.status(404).send({
+    error: true,
+    message
+  });
+});
+
+router.use((err, req, res) => {
+  console.error(err);
+  res.send({
+    error: true,
+    message: 'There was an error. That is all we can share.'
+  });
+});

dev-api/status-codes.route.js

@@ -0,0 +1,42 @@
+import express from 'express';
+import bodyParser from 'body-parser';
+import { BaseApi } from './base-api.js';
+
+const router = express.Router();
+export default router;
+router.use(bodyParser.json());
+
+class StatusCodesRoute extends BaseApi {
+  returnStatus(req, res) {
+    const { status } = req.params;
+    let parsedStatus = Number(status);
+    if (parsedStatus !== parsedStatus) {
+      parsedStatus = 200;
+    }
+    res.status(parsedStatus);
+    this.printDefaultResponse(req, res);
+    res.end();
+  }
+
+  returnMessage(req, res) {
+    const { msg } = req.params;
+    const message = decodeURIComponent(msg.replace(/\+/g, ' '));
+    res.statusMessage = message;
+    res.status(200);
+    this.printDefaultResponse(req, res);
+    res.end();
+  }
+
+  returnEmptyMessage(req, res) {
+    res.writeHead(200, '', { 'Content-Type': 'text/plain' });
+    res.end();
+  }
+}
+
+const api = new StatusCodesRoute();
+api.setCors(router);
+api.wrapApi(router, [
+  ['/code/:status', 'returnStatus'],
+  ['/message/empty', 'returnEmptyMessage'],
+  ['/message/:msg', 'returnMessage'],
+]);

menus/darwin.json

@@ -265,6 +265,10 @@
               "label": "Cookie manager",
               "command": "application:open-cookie-manager"
             },
+            {
+              "label": "Client certificates",
+              "command": "application:open-client-certificates"
+            },
             {
               "type": "separator"
             },