Merge branch 'feature/client-certificates' into develop

Author: jarrodek

app.js

@@ -242,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;
@@ -267,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);
     }

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"
             },

menus/linux.json

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

menus/win.json

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

package-lock.json

@@ -40,11 +40,13 @@
     "@advanced-rest-client/arc-icons": "^3.0.5",
     "@advanced-rest-client/arc-info-messages": "^3.0.0",
     "@advanced-rest-client/arc-onboarding": "^3.0.1",
+    "@advanced-rest-client/client-certificates-panel": "^1.0.4",
     "@advanced-rest-client/eslint-config": "^1.1.4",
     "@advanced-rest-client/exchange-search-panel": "^3.0.3",
     "@advanced-rest-client/host-rules-editor": "^3.0.0",
     "@advanced-rest-client/rest-apis-list-panel": "^3.0.0",
     "@advanced-rest-client/themes-panel": "^3.0.0",
+    "@anypoint-web-components/anypoint-dialog": "^0.1.1",
     "@api-components/api-candidates-dialog": "^3.0.0",
     "@api-components/api-documentation": "^4.0.4",
     "@api-components/api-navigation": "^4.0.2",
@@ -286,7 +288,12 @@
       "@anypoint-web-components/anypoint-item/anypoint-item.js",
       "lit-html/directives/repeat.js",
       "@advanced-rest-client/arc-onboarding/arc-onboarding.js",
-      "@advanced-rest-client/rest-apis-list-panel/rest-apis-list-panel.js"
+      "@advanced-rest-client/rest-apis-list-panel/rest-apis-list-panel.js",
+      "@advanced-rest-client/client-certificates-panel/client-certificates-panel.js",
+      "@advanced-rest-client/client-certificates-panel/certificate-import.js",
+      "@advanced-rest-client/arc-models/client-certificate-model.js",
+      "@anypoint-web-components/anypoint-dialog/anypoint-dialog.js",
+      "@anypoint-web-components/anypoint-dialog/anypoint-dialog-scrollable.js"
     ]
   }
 }

package.json

@@ -9,42 +9,37 @@ class AppPrompts {
    * Listens for the application events.
    */
   listen() {
-    ipcMain.on('save-dialog', this._saveDialogHandler.bind(this));
+    ipcMain.handle('save-dialog', this._saveDialogHandler.bind(this));
   }
   /**
    * Hasnles save action dialog. Opens "save as..." dialog and returns
    * the result to the app.
    *
-   * This method emmits `saved-file` event to the sender window with
-   * file location as it's only argument. The argument is `undefined`
-   * when the user cancels the action.
-   *
    * @param {Event} e Event emitted by the BrowserWindow
    * @param {Object} args Prompt dialog options:
    * - file {String} - File name to suggest to the user.
+   * @return {Promise}
    */
-  _saveDialogHandler(e, args) {
+  _saveDialogHandler(e, args={}) {
     log.debug('Save dialog requested', args);
-    args = args || {};
     const options = {
       title: 'Save to file'
     };
     if (args.file) {
       options.defaultPath = args.file;
     }
-    dialog.showSaveDialog(options, function(filename) {
-      e.sender.send('saved-file', filename);
-    });
+    return dialog.showSaveDialog(options);
   }
   /**
    * A dialog that renders error message about missing workspace file.
    * @param {String} file Requested workspace file location.
+   * @return {Promise}
    */
-  static workspaceMissing(file) {
+  static async workspaceMissing(file) {
     let message = 'Workspace file cannot be located. Probably it was deleted or';
     message += ' renamed.\n\n';
     message += 'Requested file: ' + file;
-    dialog.showMessageBox({
+    return await dialog.showMessageBox({
       type: 'error',
       message
     });

scripts/main/app-prompts.js

@@ -41,13 +41,11 @@ class ArcEnvironment {
     ipcMain.on('open-external-url', this._externalUrlHandler.bind(this));
   }
 
-  loadEnvironment() {
+  async loadEnvironment() {
     log.debug('Loading user configuration.');
-    return this.config.load()
-    .then((settings) => {
-      log.debug('User configuration ready.');
-      this._postConfig(settings);
-    });
+    const settings = await this.config.load();
+    log.debug('User configuration ready.');
+    this._postConfig(settings);
   }
 
   registerHandlers() {

scripts/main/arc-environment.js

@@ -15,72 +15,64 @@ const path = require('path');
 class FilesystemProxy {
   constructor() {
     this._exportHandler = this._exportHandler.bind(this);
-    this._fileSavedHandler = this._fileSavedHandler.bind(this);
   }
 
   listen() {
     window.addEventListener('file-data-save', this._exportHandler);
-    ipc.on('saved-file', this._fileSavedHandler);
   }
 
   unlisten() {
     window.removeEventListener('file-data-save', this._exportHandler);
-    ipc.removeListener('saved-file', this._fileSavedHandler);
-  }
-
-  _clear() {
-    this.lastType = undefined;
-    this.lastContent = undefined;
-    this.lastResolve = undefined;
-    this.lastReject = undefined;
   }
 
   _exportHandler(e) {
     if (e.defaultPrevented) {
       return;
     }
     e.preventDefault();
-    const { content, file, options } = e.detail;
-    e.detail.result = this.exportFileData(content, options && options.contentType, file);
+    const { content, file, options={} } = e.detail;
+    e.detail.result = this.exportFileData(content, options.contentType, file);
   }
-
-  exportFileData(content, mime, file) {
-    ipc.send('save-dialog', {
+  /**
+   * Requests a save file dialog and saves the data to selected path if not cancelled.
+   * This does nothing when dialog is canceled.
+   *
+   * @param {String|Object|Buffer} content Data to write
+   * @param {String=} mime Content media type. Currently only `application/json` is
+   * supported when the `content` is an object or an array.
+   * @param {String=} file Suggested file name
+   * @return {Promise}
+   */
+  async exportFileData(content, mime, file) {
+    const opts = {
       file
-    });
-    this.lastContent = content;
-    this.lastType = mime;
-    new Promise((resolve, reject) => {
-      this.lastResolve = resolve;
-      this.lastReject = reject;
-    });
-  }
-
-  _fileSavedHandler(e, selectedPath) {
-    if (!selectedPath) {
-      this.lastResolve();
-      this._clear();
+    };
+    const result = await ipc.invoke('save-dialog', opts)
+    const { filePath, canceled } = result;
+    if (canceled) {
       return;
     }
-    return this._writeContent(selectedPath)
-    .then(() => this.lastResolve())
-    .catch((cause) => this.lastReject(cause))
-    .then(() => this._clear());
+    await this._writeContent(filePath, content, mime);
   }
-
-  _writeContent(path) {
-    let data = this.lastContent;
-    if (typeof data !== 'string') {
-      data = this._prepareData(data);
+  /**
+   * Writes content to a file
+   * @param {String} path Absolute path to a file
+   * @param {String|Object|Buffer} content Data to be written
+   * @param {String=} mime Content media type.
+   * @return {Promise}
+   */
+  _writeContent(path, content, mime) {
+    if (typeof content !== 'string') {
+      content = this._prepareData(content, mime);
     }
-    return fs.writeFile(path, data, 'utf8');
+    return fs.writeFile(path, content, 'utf8');
   }
 
-  _prepareData(data) {
-    switch (this.lastType) {
+  _prepareData(data, mime) {
+    switch (mime) {
       case 'application/json': return JSON.stringify(data);
+      default: return String(data);
     }
-    return String(data);
   }
   /**
    * Allows to read file from user filesystem.

scripts/renderer/filesystem-proxy.js

@@ -8,6 +8,10 @@ import PouchQuickSearch from
 import marked from '../web_modules/marked/lib/marked.js';
 import styles from '../web_modules/@advanced-rest-client/arc-app-mixin/AppStyles.js';
 import '../web_modules/@api-components/api-candidates-dialog/api-candidates-dialog.js';
+import '../web_modules/@advanced-rest-client/arc-models/client-certificate-model.js';
+import '../web_modules/@anypoint-web-components/anypoint-dialog/anypoint-dialog.js';
+import '../web_modules/@anypoint-web-components/anypoint-dialog/anypoint-dialog-scrollable.js';
+import '../web_modules/@advanced-rest-client/client-certificates-panel/certificate-import.js';
 import './electron-http-transport/electron-http-transport.js';
 import poweredIcon from './poweredby.js';
 window.PouchDB = PouchDB;
@@ -32,6 +36,11 @@ class ArcElectron extends ArcAppMixin(LitElement) {
        * When true it is rendering API console view.
        */
       isApiConsole: { type: Boolean },
+      /**
+       * When set the certificates import panel is currently rendered.
+       * @type {Object}
+       */
+      ccImportOpened: { type: Boolean },
     };
   }
 
@@ -46,10 +55,12 @@ class ArcElectron extends ArcAppMixin(LitElement) {
     this._exchangeAssetHandler = this._exchangeAssetHandler.bind(this);
     this._activeThemeHandler = this._activeThemeHandler.bind(this);
     this._apiDataHandler = this._apiDataHandler.bind(this);
+    this._certCcImportHandler = this._certCcImportHandler.bind(this);
     /* global log */
     this.log = log;
     this.sysVars = process.env;
     this.withEncrypt = true;
+    this.clientCertificateImport = true;
   }
 
   connectedCallback() {
@@ -59,6 +70,7 @@ class ArcElectron extends ArcAppMixin(LitElement) {
     window.addEventListener('theme-activated', this._activeThemeHandler);
     window.addEventListener('api-data-ready', this._apiDataHandler);
     this.addEventListener('process-exchange-asset-data', this._exchangeAssetHandler);
+    window.addEventListener('client-certificate-import', this._certCcImportHandler);
   }
 
   disconnectedCallback() {
@@ -67,6 +79,7 @@ class ArcElectron extends ArcAppMixin(LitElement) {
     window.removeEventListener('content-copy', this._copyContentHandler);
     window.removeEventListener('theme-activated', this._activeThemeHandler);
     window.removeEventListener('api-data-ready', this._apiDataHandler);
+    window.removeEventListener('client-certificate-import', this._certCcImportHandler);
   }
 
   _routeDataChanged() {
@@ -109,6 +122,11 @@ class ArcElectron extends ArcAppMixin(LitElement) {
         path = 'host-rules-editor/host-rules-editor';
         scope = '@advanced-rest-client';
         break;
+      case 'client-certificates':
+        id = 'client-certificates-panel';
+        path = 'client-certificates-panel/client-certificates-panel';
+        scope = '@advanced-rest-client';
+        break;
     }
     if (id) {
       const cls = window.customElements.get(id);
@@ -577,12 +595,29 @@ class ArcElectron extends ArcAppMixin(LitElement) {
     `;
   }
 
+  /**
+   * Opens cliet cetrificates panel by setting `page` to `client-certificates`.
+   */
+  openClientCertificates() {
+    this.page = 'client-certificates';
+  }
+
+  _certCcImportHandler() {
+    this.ccImportOpened = true;
+  }
+
+  _closeCcImportHandler() {
+    this.ccImportOpened = false;
+  }
+
   render() {
     return html`
     ${this.applicationTemplate()}
     ${this.apiCandidatedViewTemplate()}
+    ${this._ccImportDialogTemplate()}
     <arc-onboarding></arc-onboarding>
-    <paper-toast id="errorToast" duration="5000"></paper-toast>`;
+    <paper-toast id="errorToast" duration="5000"></paper-toast>
+    <client-certificate-model></client-certificate-model>`;
   }
 
   _pageTemplate() {
@@ -598,6 +633,7 @@ class ArcElectron extends ArcAppMixin(LitElement) {
       case 'rest-projects': return this.restApisViewTemplate({ explore: true });
       case 'hosts-rules': return this.hostsViewTemplate();
       case 'themes-panel': return this.themesViewTemplate();
+      case 'client-certificates': return this.clientCertificatesTemplate();
       default: return super._pageTemplate();
     }
   }
@@ -829,13 +865,27 @@ class ArcElectron extends ArcAppMixin(LitElement) {
     </div>`;
   }
 
-  apiCandidatedViewTemplate(opts) {
-    const {
-      compatibility
-    } = this;
+  apiCandidatedViewTemplate(opts={}) {
+    const { compatibility } = this;
     return html`<api-candidates-dialog
       ?compatibility="${compatibility}"
     ></api-candidates-dialog>`;
   }
+
+  clientCertificatesTemplate() {
+    return html`<client-certificates-panel></client-certificates-panel>`;
+  }
+
+  _ccImportDialogTemplate() {
+    const { ccImportOpened } = this;
+    return html`
+    <anypoint-dialog ?opened="${ccImportOpened}" modal>
+      <h2>Import a certificate</h2>
+      <anypoint-dialog-scrollable>
+        <certificate-import @close="${this._closeCcImportHandler}"></certificate-import>
+      </anypoint-dialog-scrollable>
+    </anypoint-dialog>
+    `;
+  }
 }
 window.customElements.define('arc-electron', ArcElectron);