Merge branch 'release/3.6.3' into main

app/javascripts/main/constants.ts

@@ -0,0 +1,7 @@
+/** Build-time constants */
+
+declare const AUTO_UPDATING_AVAILABLE: boolean;
+declare const KEYCHAIN_ACCESS_IS_USER_CONFIGURABLE: boolean;
+
+export const autoUpdatingAvailable = AUTO_UPDATING_AVAILABLE;
+export const keychainAccessIsUserConfigurable = KEYCHAIN_ACCESS_IS_USER_CONFIGURABLE;

app/javascripts/main/keychain.ts

@@ -2,7 +2,8 @@ import { app, BrowserWindow, ipcMain } from 'electron';
 import keytar from 'keytar';
 import { isLinux } from './platforms';
 import { AppName } from './strings';
-import { isDev, isTesting, keychainAccessIsUserConfigurable } from './utils';
+import { keychainAccessIsUserConfigurable } from './constants';
+import { isDev, isTesting } from './utils';
 import { IpcMessages } from '../shared/ipcMessages';
 import {
   grantLinuxPasswordsAccessJsPath,

app/javascripts/main/menus.ts

@@ -10,6 +10,7 @@ import {
   WebContents,
 } from 'electron';
 import { autorun } from 'mobx';
+import { autoUpdatingAvailable } from './constants';
 import { MessageType } from '../../../test/TestIpcMessage';
 import { BackupsManager } from './backupsManager';
 import { isLinux, isMac } from './platforms';
@@ -23,7 +24,7 @@ import {
   openChangelog,
   showUpdateInstallationDialog,
 } from './updateManager';
-import { autoUpdatingAvailable, isDev, isTesting } from './utils';
+import { isDev, isTesting } from './utils';
 
 export const enum MenuId {
   SpellcheckerLanguages = 'SpellcheckerLanguages',

app/javascripts/main/updateManager.ts

@@ -3,14 +3,15 @@ import { BrowserWindow, dialog, shell } from 'electron';
 import electronLog from 'electron-log';
 import { autoUpdater } from 'electron-updater';
 import { action, autorun, computed, makeObservable, observable } from 'mobx';
+import { autoUpdatingAvailable } from './constants';
 import { MessageType } from '../../../test/TestIpcMessage';
 import { AppState } from '../../application';
 import { BackupsManager } from './backupsManager';
 import { isMac } from './platforms';
 import { StoreKeys } from './store';
 import { updates as str } from './strings';
 import { handle } from './testing';
-import { autoUpdatingAvailable, isTesting } from './utils';
+import { isTesting } from './utils';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function logError(...message: any) {

app/javascripts/main/utils.ts

@@ -1,11 +1,5 @@
 import { CommandLineArgs } from '../shared/CommandLineArgs';
 
-declare const AUTO_UPDATING_AVAILABLE: boolean;
-declare const KEYCHAIN_ACCESS_IS_USER_CONFIGURABLE: boolean;
-
-export const autoUpdatingAvailable = AUTO_UPDATING_AVAILABLE;
-export const keychainAccessIsUserConfigurable = KEYCHAIN_ACCESS_IS_USER_CONFIGURABLE;
-
 export function isDev(): boolean {
   return process.env.NODE_ENV === 'development';
 }

app/javascripts/main/window.ts

@@ -51,13 +51,82 @@ export async function createWindowState({
 }): Promise<WindowState> {
   const window = await createWindow(appState.store);
   const services = createWindowServices(window, appState, appLocale);
-  registerWindowEventListeners({
-    shell,
-    appState,
-    window,
-    backupsManager: services.backupsManager,
-    trayManager: services.trayManager,
-    onClosed: teardown,
+
+  const shouldOpenUrl = (url: string) =>
+    url.startsWith('http') || url.startsWith('mailto');
+
+  window.on('closed', teardown);
+
+  window.on('show', () => {
+    checkForUpdate(appState, appState.updates, false);
+  });
+
+  window.on('focus', () => {
+    window.webContents.send(IpcMessages.WindowFocused, null);
+  });
+
+  window.on('blur', () => {
+    window.webContents.send(IpcMessages.WindowBlurred, null);
+    services.backupsManager.applicationDidBlur();
+  });
+
+  window.once('ready-to-show', () => {
+    window.show();
+  });
+
+  window.webContents.on('ipc-message', async (_event, message) => {
+    if (message === IpcMessages.SigningOut) {
+      await window.webContents.session.clearStorageData();
+      window.webContents.session.flushStorageData();
+    }
+  });
+
+  window.on('close', (event) => {
+    if (
+      !appState.willQuitApp &&
+      (isMac() || services.trayManager.shouldMinimizeToTray())
+    ) {
+      /**
+       * On MacOS, closing a window does not quit the app. On Window and Linux,
+       * it only does if you haven't enabled minimize to tray.
+       */
+      event.preventDefault();
+      /**
+       * Handles Mac full screen issue where pressing close results
+       * in a black screen.
+       */
+      if (window.isFullScreen()) {
+        window.setFullScreen(false);
+      }
+      window.hide();
+    }
+  });
+
+  /** handle link clicks */
+  window.webContents.on('new-window', (event, url) => {
+    if (shouldOpenUrl(url)) {
+      shell.openExternal(url);
+    }
+    event.preventDefault();
+  });
+
+  /**
+   * handle link clicks (this event is fired instead of 'new-window' when
+   * target is not set to _blank)
+   */
+  window.webContents.on('will-navigate', (event, url) => {
+    /** Check for windowUrl equality in the case of window.reload() calls. */
+    if (fileUrlsAreEqual(url, appState.startUrl)) {
+      return;
+    }
+    if (shouldOpenUrl(url)) {
+      shell.openExternal(url);
+    }
+    event.preventDefault();
+  });
+
+  window.webContents.on('context-menu', (_event, params) => {
+    buildContextMenu(window.webContents, params).popup();
   });
 
   return {
@@ -98,6 +167,15 @@ async function createWindow(store: Store): Promise<Electron.BrowserWindow> {
     handle(MessageType.SpellCheckerLanguages, () =>
       window.webContents.session.getSpellCheckerLanguages()
     );
+    handle(MessageType.SetLocalStorageValue, async (key, value) => {
+      await window.webContents.executeJavaScript(
+        `localStorage.setItem("${key}", "${value}")`
+      );
+      window.webContents.session.flushStorageData();
+    });
+    handle(MessageType.ExecuteJavaScript, (code) =>
+      window.webContents.executeJavaScript(code)
+    );
     window.webContents.once('did-finish-load', () => {
       send(AppMessageType.WindowLoaded);
     });
@@ -171,92 +249,6 @@ function fileUrlsAreEqual(a: string, b: string): boolean {
   }
 }
 
-function registerWindowEventListeners({
-  shell,
-  appState,
-  window,
-  backupsManager,
-  trayManager,
-  onClosed,
-}: {
-  shell: Shell;
-  appState: AppState;
-  window: Electron.BrowserWindow;
-  backupsManager: BackupsManager;
-  trayManager: TrayManager;
-  onClosed: () => void;
-}) {
-  const shouldOpenUrl = (url: string) =>
-    url.startsWith('http') || url.startsWith('mailto');
-
-  window.on('closed', onClosed);
-
-  window.on('show', () => {
-    checkForUpdate(appState, appState.updates, false);
-  });
-
-  window.on('focus', () => {
-    window.webContents.send(IpcMessages.WindowFocused, null);
-  });
-
-  window.on('blur', () => {
-    window.webContents.send(IpcMessages.WindowBlurred, null);
-    backupsManager.applicationDidBlur();
-  });
-
-  window.once('ready-to-show', () => {
-    window.show();
-  });
-
-  window.on('close', (event) => {
-    if (
-      !appState.willQuitApp &&
-      (isMac() || trayManager.shouldMinimizeToTray())
-    ) {
-      /**
-       * On MacOS, closing a window does not quit the app. On Window and Linux,
-       * it only does if you haven't enabled minimize to tray.
-       */
-      event.preventDefault();
-      /**
-       * Handles Mac full screen issue where pressing close results
-       * in a black screen.
-       */
-      if (window.isFullScreen()) {
-        window.setFullScreen(false);
-      }
-      window.hide();
-    }
-  });
-
-  /** handle link clicks */
-  window.webContents.on('new-window', (event, url) => {
-    if (shouldOpenUrl(url)) {
-      shell.openExternal(url);
-    }
-    event.preventDefault();
-  });
-
-  /**
-   * handle link clicks (this event is fired instead of 'new-window' when
-   * target is not set to _blank)
-   */
-  window.webContents.on('will-navigate', (event, url) => {
-    /** Check for windowUrl equality in the case of window.reload() calls. */
-    if (fileUrlsAreEqual(url, appState.startUrl)) {
-      return;
-    }
-    if (shouldOpenUrl(url)) {
-      shell.openExternal(url);
-    }
-    event.preventDefault();
-  });
-
-  window.webContents.on('context-menu', (_event, params) => {
-    buildContextMenu(window.webContents, params).popup();
-  });
-}
-
 interface WindowPosition {
   bounds: Rectangle;
   isMaximized: boolean;

app/javascripts/renderer/preload.js

@@ -42,7 +42,7 @@ process.once('loaded', function () {
 function loadTransmitter() {
   transmitter.expose({
     extServerHost: Store.get(StoreKeys.ExtServerHost),
-    useNativeKeychain: Store.get(StoreKeys.UseNativeKeychain),
+    useNativeKeychain: Store.get(StoreKeys.UseNativeKeychain) ?? true,
     rendererPath,
     isMacOS: process.platform === 'darwin',
     appVersion: remote.app.getVersion(),

app/javascripts/renderer/renderer.ts

@@ -17,6 +17,7 @@ declare global {
     electronAppVersion: string;
     zip: any;
     startApplication: StartApplication;
+    bridge: Bridge;
   }
 }
 
@@ -37,17 +38,17 @@ window._bugsnag_api_key = BUGSNAG_API_KEY;
 
   await configureWindow(mainThread);
 
-  const webBridge = await createWebBridge(mainThread);
+  window.bridge = await createWebBridge(mainThread);
   window.startApplication(
     // eslint-disable-next-line no-undef
     DEFAULT_SYNC_SERVER || 'https://sync.standardnotes.org',
-    webBridge
+    window.bridge
   );
 
   await new Promise((resolve) =>
     window.angular.element(document).ready(resolve)
   );
-  registerIpcMessageListener(webBridge);
+  registerIpcMessageListener(window.bridge);
 })();
 loadZipLibrary();
 
@@ -127,6 +128,9 @@ async function createWebBridge(mainThread: any): Promise<Bridge> {
     onInitialDataLoad() {
       mainThread.sendIpcMessage(IpcMessages.InitialDataLoaded, {});
     },
+    onSignOut() {
+      mainThread.sendIpcMessage(IpcMessages.SigningOut, {});
+    },
     async downloadBackup() {
       const desktopManager = window.desktopManager;
       desktopManager.desktop_didBeginBackup();

app/javascripts/shared/ipcMessages.ts

@@ -17,4 +17,5 @@ export enum IpcMessages {
   Quit = 'Quit',
   UseLocalstorageForKeychain = 'UseLocalstorageForKeychain',
   LearnMoreAboutKeychainAccess = 'LearnMoreAboutKeychainAccess',
+  SigningOut = 'SigningOut',
 }

app/package.json

@@ -3,7 +3,7 @@
   "productName": "Standard Notes",
   "description": "A simple and private place for your notes, thoughts, and life's work.",
   "author": "Standard Notes <[email protected]>",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "main": "./dist/index.js",
   "dependencies": {
     "keytar": "^7.4.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "standard-notes",
   "main": "./app/dist/index.js",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "repository": {
     "type": "git",
     "url": "git://github.com/standardnotes/desktop"

test/TestIpcMessage.ts

@@ -26,6 +26,7 @@ export enum MessageType {
   StoreData,
   StoreSettingsLocation,
   StoreSet,
+  SetLocalStorageValue,
   AppMenuItems,
   SpellCheckerManager,
   SpellCheckerLanguages,
@@ -46,4 +47,5 @@ export enum MessageType {
   AutoUpdateEnabled,
   HasReloadedMenu,
   AppStateCall,
+  ExecuteJavaScript,
 }

test/driver.ts

@@ -110,7 +110,12 @@ class Driver {
   appStateCall = (methodName: string, ...args: any): Promise<any> =>
     this.send(MessageType.AppStateCall, methodName, ...args);
 
-  readonly store = {
+  readonly window = {
+    executeJavascript: (code: string): Promise<unknown> =>
+      this.send(MessageType.ExecuteJavaScript, code),
+  };
+
+  readonly storage = {
     dataOnDisk: async (): Promise<{ [key in StoreKeys]: any }> => {
       const location = await this.send(MessageType.StoreSettingsLocation);
       return readJSONFile(location);
@@ -119,6 +124,8 @@ class Driver {
       this.send(MessageType.StoreSettingsLocation),
     setZoomFactor: (factor: number) =>
       this.send(MessageType.StoreSet, 'zoomFactor', factor),
+    setLocalStorageValue: (key: string, value: string): Promise<void> =>
+      this.send(MessageType.SetLocalStorageValue, key, value),
   };
 
   readonly appMenu = {