From ef573336d86793d21c9a749bbe2fd5e0f81cce02 Mon Sep 17 00:00:00 2001 From: antelle Date: Wed, 21 Apr 2021 19:31:37 +0200 Subject: [PATCH] moved isDev to utils --- desktop/main.js | 3 +-- desktop/scripts/ipc-handlers/hardware-crypto.js | 2 +- desktop/scripts/util/app-info.js | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 desktop/scripts/util/app-info.js diff --git a/desktop/main.js b/desktop/main.js index 0cac5200..14ed3b15 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -10,6 +10,7 @@ const path = require('path'); const fs = require('fs'); const url = require('url'); const { Logger } = require('./scripts/logger'); +const { isDev } = require('./scripts/util/app-info'); perfTimestamps?.push({ name: 'loading app requires', ts: process.hrtime() }); @@ -28,8 +29,6 @@ let mainWindowMaximized = false; const windowPositionFileName = 'window-position.json'; const portableConfigFileName = 'keeweb-portable.json'; -const isDev = !__dirname.endsWith('.asar'); - const startupLogging = process.argv.some((arg) => arg.startsWith('--startup-logging')) || process.env.KEEWEB_STARTUP_LOGGING === '1'; diff --git a/desktop/scripts/ipc-handlers/hardware-crypto.js b/desktop/scripts/ipc-handlers/hardware-crypto.js index 08293d48..0abdaeba 100644 --- a/desktop/scripts/ipc-handlers/hardware-crypto.js +++ b/desktop/scripts/ipc-handlers/hardware-crypto.js @@ -1,6 +1,7 @@ const { ipcMain } = require('electron'); const { readXoredValue, makeXoredValue } = require('../util/byte-utils'); const { reqNative } = require('../util/req-native'); +const { isDev } = require('../util/app-info'); ipcMain.handle('hardwareCryptoDeleteKey', hardwareCryptoDeleteKey); ipcMain.handle('hardwareEncrypt', hardwareEncrypt); @@ -40,7 +41,6 @@ async function hardwareCrypto(value, encrypt, touchIdPrompt) { const data = readXoredValue(value); let res; - const isDev = !__dirname.includes('.asar'); if (isDev && process.env.KEEWEB_EMULATE_HARDWARE_ENCRYPTION) { const crypto = require('crypto'); if (!testCipherParams) { diff --git a/desktop/scripts/util/app-info.js b/desktop/scripts/util/app-info.js new file mode 100644 index 00000000..cf369467 --- /dev/null +++ b/desktop/scripts/util/app-info.js @@ -0,0 +1 @@ +export const isDev = !__dirname.includes('.asar');