certificate uploader

Author: fstasi

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -242,17 +242,18 @@ import {
   UploadFirmwareDialog,
   UploadFirmwareDialogProps,
   UploadFirmwareDialogWidget,
-} from './dialogs/firmware-uploader/upload-firmware-dialog';
-import {
-  UploadCertificateDialog,
-  UploadCertificateDialogProps,
-  UploadCertificateDialogWidget,
-} from './dialogs/certificate-uploader/upload-certificate-dialog';
+} from './dialogs/firmware-uploader/firmware-uploader-dialog';
+
 import { UploadCertificate } from './contributions/upload-certificate';
 import {
   ArduinoFirmwareUploader,
   ArduinoFirmwareUploaderPath,
 } from '../common/protocol/arduino-firmware-uploader';
+import {
+  UploadCertificateDialog,
+  UploadCertificateDialogProps,
+  UploadCertificateDialogWidget,
+} from './dialogs/certificate-uploader/certificate-uploader-dialog';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 

arduino-ide-extension/src/browser/arduino-preferences.ts

@@ -55,6 +55,11 @@ export const ArduinoConfigSchema: PreferenceSchema = {
         'True to enable automatic update checks. The IDE will check for updates automatically and periodically.',
       default: true,
     },
+    'arduino.board.certificates': {
+      type: 'string',
+      description: 'List of certificates that can be uploaded to boards',
+      default: '',
+    },
     'arduino.sketchbook.showAllFiles': {
       type: 'boolean',
       description:
@@ -123,6 +128,7 @@ export interface ArduinoConfiguration {
   'arduino.window.autoScale': boolean;
   'arduino.window.zoomLevel': number;
   'arduino.ide.autoUpdate': boolean;
+  'arduino.board.certificates': string;
   'arduino.sketchbook.showAllFiles': boolean;
   'arduino.cloud.enabled': boolean;
   'arduino.cloud.pull.warn': boolean;

arduino-ide-extension/src/browser/contributions/upload-certificate.ts

@@ -6,13 +6,36 @@ import {
   Contribution,
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { UploadCertificateDialog } from '../dialogs/certificate-uploader/upload-certificate-dialog';
+import { UploadCertificateDialog } from '../dialogs/certificate-uploader/certificate-uploader-dialog';
+import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
+import {
+  PreferenceScope,
+  PreferenceService,
+} from '@theia/core/lib/browser/preferences/preference-service';
+import { ArduinoPreferences } from '../arduino-preferences';
+import {
+  arduinoCert,
+  certificateList,
+} from '../dialogs/certificate-uploader/utils';
+import { ArduinoFirmwareUploader } from '../../common/protocol/arduino-firmware-uploader';
 
 @injectable()
 export class UploadCertificate extends Contribution {
   @inject(UploadCertificateDialog)
   protected readonly dialog: UploadCertificateDialog;
 
+  @inject(ContextMenuRenderer)
+  protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+  @inject(PreferenceService)
+  protected readonly preferenceService: PreferenceService;
+
+  @inject(ArduinoPreferences)
+  protected readonly arduinoPreferences: ArduinoPreferences;
+
+  @inject(ArduinoFirmwareUploader)
+  protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
+
   protected dialogOpened = false;
 
   registerCommands(registry: CommandRegistry): void {
@@ -27,6 +50,46 @@ export class UploadCertificate extends Contribution {
       },
       isEnabled: () => !this.dialogOpened,
     });
+
+    registry.registerCommand(UploadCertificate.Commands.REMOVE_CERT, {
+      execute: async (certToRemove) => {
+        const certs = this.arduinoPreferences.get('arduino.board.certificates');
+
+        this.preferenceService.set(
+          'arduino.board.certificates',
+          certificateList(certs)
+            .filter((c) => c !== certToRemove)
+            .join(','),
+          PreferenceScope.User
+        );
+      },
+      isEnabled: (certToRemove) => certToRemove !== arduinoCert,
+    });
+
+    registry.registerCommand(UploadCertificate.Commands.UPLOAD_CERT, {
+      execute: async ({ fqbn, address, urls }) => {
+        return this.arduinoFirmwareUploader.uploadCertificates(
+          `-b ${fqbn} -a ${address} ${urls
+            .map((url: string) => `-u ${url}`)
+            .join(' ')}`
+        );
+      },
+      isEnabled: () => true,
+    });
+
+    registry.registerCommand(UploadCertificate.Commands.OPEN_CERT_CONTEXT, {
+      execute: async (args: any) => {
+        this.contextMenuRenderer.render({
+          menuPath: ArduinoMenus.ROOT_CERTIFICATES__CONTEXT,
+          anchor: {
+            x: args.x,
+            y: args.y,
+          },
+          args: [args.cert],
+        });
+      },
+      isEnabled: () => true,
+    });
   }
 
   registerMenus(registry: MenuModelRegistry): void {
@@ -35,6 +98,12 @@ export class UploadCertificate extends Contribution {
       label: UploadCertificate.Commands.OPEN.label,
       order: '1',
     });
+
+    registry.registerMenuAction(ArduinoMenus.ROOT_CERTIFICATES__CONTEXT, {
+      commandId: UploadCertificate.Commands.REMOVE_CERT.id,
+      label: UploadCertificate.Commands.REMOVE_CERT.label,
+      order: '1',
+    });
   }
 }
 
@@ -45,5 +114,23 @@ export namespace UploadCertificate {
       label: 'Upload SSL Root Certificates',
       category: 'Arduino',
     };
+
+    export const OPEN_CERT_CONTEXT: Command = {
+      id: 'arduino-certificate-open-context',
+      label: 'Open context',
+      category: 'Arduino',
+    };
+
+    export const REMOVE_CERT: Command = {
+      id: 'arduino-certificate-remove',
+      label: 'Remove',
+      category: 'Arduino',
+    };
+
+    export const UPLOAD_CERT: Command = {
+      id: 'arduino-certificate-upload',
+      label: 'Upload',
+      category: 'Arduino',
+    };
   }
 }

arduino-ide-extension/src/browser/contributions/upload-firmware.ts

@@ -6,7 +6,7 @@ import {
   Contribution,
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { UploadFirmwareDialog } from '../dialogs/firmware-uploader/upload-firmware-dialog';
+import { UploadFirmwareDialog } from '../dialogs/firmware-uploader/firmware-uploader-dialog';
 
 @injectable()
 export class UploadFirmware extends Contribution {

arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-list.tsx

@@ -0,0 +1,51 @@
+import * as React from 'react';
+
+export const CertificateListComponent = ({
+  certificates,
+  selectedCerts,
+  setSelectedCerts,
+  openContextMenu,
+}: {
+  certificates: string[];
+  selectedCerts: string[];
+  setSelectedCerts: React.Dispatch<React.SetStateAction<string[]>>;
+  openContextMenu: (x: number, y: number, cert: string) => void;
+}): React.ReactElement => {
+  const handleOnChange = (event: any) => {
+    const target = event.target;
+
+    const newSelectedCerts = selectedCerts.filter(
+      (cert) => cert !== target.name
+    );
+
+    if (target.checked) {
+      newSelectedCerts.push(target.name);
+    }
+
+    setSelectedCerts(newSelectedCerts);
+  };
+
+  const handleContextMenu = (event: React.MouseEvent, cert: string) => {
+    openContextMenu(event.clientX, event.clientY, cert);
+  };
+
+  return (
+    <div className="certificate-list">
+      {certificates.map((certificate, i) => (
+        <label
+          key={i}
+          className="certificate-row"
+          onContextMenu={(e) => handleContextMenu(e, certificate)}
+        >
+          <span className="fl1">{certificate}</span>
+          <input
+            type="checkbox"
+            name={certificate}
+            checked={selectedCerts.includes(certificate)}
+            onChange={handleOnChange}
+          />
+        </label>
+      ))}
+    </div>
+  );
+};