diff --git a/packages/api/src/utility/crypting.js b/packages/api/src/utility/crypting.js index 491ed39a..d7428df7 100644 --- a/packages/api/src/utility/crypting.js +++ b/packages/api/src/utility/crypting.js @@ -70,14 +70,14 @@ function decryptPasswordField(connection, field) { function encryptConnection(connection) { connection = encryptPasswordField(connection, 'password'); connection = encryptPasswordField(connection, 'sshPassword'); - connection = encryptPasswordField(connection, 'sshKeyFilePassword'); + connection = encryptPasswordField(connection, 'sshKeyfilePassword'); return connection; } function decryptConnection(connection) { connection = decryptPasswordField(connection, 'password'); connection = decryptPasswordField(connection, 'sshPassword'); - connection = decryptPasswordField(connection, 'sshKeyFilePassword'); + connection = decryptPasswordField(connection, 'sshKeyfilePassword'); return connection; } diff --git a/packages/api/src/utility/platformInfo.js b/packages/api/src/utility/platformInfo.js index 2141df45..2025dc72 100644 --- a/packages/api/src/utility/platformInfo.js +++ b/packages/api/src/utility/platformInfo.js @@ -37,7 +37,7 @@ const platformInfo = { environment: process.env.NODE_ENV, platform, runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL, - defaultKeyFile: path.join(os.homedir(), '.ssh/id_rsa'), + defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'), }; module.exports = platformInfo; diff --git a/packages/api/src/utility/sshTunnel.js b/packages/api/src/utility/sshTunnel.js index 25484526..a330821d 100644 --- a/packages/api/src/utility/sshTunnel.js +++ b/packages/api/src/utility/sshTunnel.js @@ -16,9 +16,9 @@ const CONNECTION_FIELDS = [ 'sshLogin', 'sshPassword', 'sshMode', - 'sshKeyFile', + 'sshKeyfile', 'sshBastionHost', - 'sshKeyFilePassword', + 'sshKeyfilePassword', ]; const TUNNEL_FIELDS = [...CONNECTION_FIELDS, 'server', 'port']; @@ -31,7 +31,7 @@ async function getSshConnection(connection) { endPort: connection.sshPort || 22, bastionHost: connection.sshBastionHost || '', agentForward: connection.sshMode == 'agent', - passphrase: connection.sshMode == 'keyFile' ? connection.sshKeyFilePassword : undefined, + passphrase: connection.sshMode == 'keyFile' ? connection.sshKeyfilePassword : undefined, username: connection.sshLogin, password: connection.sshMode == 'userPassword' ? connection.sshPassword : undefined, agentSocket: connection.sshMode == 'agent' ? platformInfo.sshAuthSock : undefined, diff --git a/packages/web/src/modals/ConnectionModalSshTunnelFields.svelte b/packages/web/src/modals/ConnectionModalSshTunnelFields.svelte index 3314b9df..f7df9f57 100644 --- a/packages/web/src/modals/ConnectionModalSshTunnelFields.svelte +++ b/packages/web/src/modals/ConnectionModalSshTunnelFields.svelte @@ -22,7 +22,7 @@ $: { if (!$values.sshMode) setFieldValue('sshMode', 'userPassword'); if (!$values.sshPort) setFieldValue('sshPort', '22'); - if (!$values.sshKeyfile && $platformInfo) setFieldValue('sshKeyfile', $platformInfo.defaultKeyFile); + if (!$values.sshKeyfile && $platformInfo) setFieldValue('sshKeyfile', $platformInfo.defaultKeyfile); }