From 5e6a774bd8219de835f2dc331817b1d0cd19a7c4 Mon Sep 17 00:00:00 2001 From: NI Date: Tue, 13 Aug 2019 17:37:06 +0800 Subject: [PATCH] Fixed typo Passpharse => Passphrase #2 Thanks for reporting. --- application/commands/ssh.go | 10 +++++----- ui/app.js | 8 ++++---- ui/auth.vue | 22 +++++++++++----------- ui/commands/ssh.js | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/application/commands/ssh.go b/application/commands/ssh.go index 0e834bf..14ed471 100644 --- a/application/commands/ssh.go +++ b/application/commands/ssh.go @@ -62,7 +62,7 @@ const ( // Auth methods const ( SSHAuthMethodNone byte = 0x00 - SSHAuthMethodPasspharse byte = 0x01 + SSHAuthMethodPassphrase byte = 0x01 SSHAuthMethodPrivateKey byte = 0x02 ) @@ -205,7 +205,7 @@ func (d *sshClient) buildAuthMethod( return nil }, nil - case SSHAuthMethodPasspharse: + case SSHAuthMethodPassphrase: return func(b []byte) []ssh.AuthMethod { return []ssh.AuthMethod{ ssh.PasswordCallback(func() (string, error) { @@ -218,13 +218,13 @@ func (d *sshClient) buildAuthMethod( return "", wErr } - passpharseBytes, passpharseReceived := <-d.credentialReceive + passphraseBytes, passphraseReceived := <-d.credentialReceive - if !passpharseReceived { + if !passphraseReceived { return "", ErrSSHAuthCancelled } - return string(passpharseBytes), nil + return string(passphraseBytes), nil }), } }, nil diff --git a/ui/app.js b/ui/app.js index d25af0b..b103f56 100644 --- a/ui/app.js +++ b/ui/app.js @@ -240,17 +240,17 @@ function startApp(rootEl) { date: serverDate ? new Date(serverDate) : null }; }, - async submitAuth(passpharse) { + async submitAuth(passphrase) { this.authErr = ""; try { - let result = await this.doAuth(passpharse); + let result = await this.doAuth(passphrase); switch (result.result) { case 200: this.socket = this.buildSocket( { - data: passpharse, + data: passphrase, fetch() { return this.data; } @@ -262,7 +262,7 @@ function startApp(rootEl) { break; case 403: - this.authErr = "Authentication has failed. Wrong passpharse?"; + this.authErr = "Authentication has failed. Wrong passphrase?"; break; default: diff --git a/ui/auth.vue b/ui/auth.vue index 240585d..d2455d5 100644 --- a/ui/auth.vue +++ b/ui/auth.vue @@ -28,13 +28,13 @@
- Passpharse + Passphrase
A valid password is required in order to use this @@ -53,7 +53,7 @@ instance
- {{ passpharseErr || error }} + {{ passphraseErr || error }}
@@ -91,8 +91,8 @@ export default { data() { return { submitting: false, - passpharse: "", - passpharseErr: "" + passphrase: "", + passphraseErr: "" }; }, watch: { @@ -105,8 +105,8 @@ export default { mounted() {}, methods: { auth() { - if (this.passpharse.length <= 0) { - this.passpharseErr = "Passpharse cannot be empty"; + if (this.passphrase.length <= 0) { + this.passphraseErr = "Passphrase cannot be empty"; return; } @@ -117,9 +117,9 @@ export default { this.submitting = true; - this.passpharseErr = ""; + this.passphraseErr = ""; - this.$emit("auth", this.passpharse); + this.$emit("auth", this.passphrase); } } }; diff --git a/ui/commands/ssh.js b/ui/commands/ssh.js index e1a9483..4e905df 100644 --- a/ui/commands/ssh.js +++ b/ui/commands/ssh.js @@ -28,7 +28,7 @@ import * as strings from "./string.js"; import Exception from "./exception.js"; const AUTHMETHOD_NONE = 0x01; -const AUTHMETHOD_PASSPHARSE = 0x01; +const AUTHMETHOD_PASSPHRASE = 0x01; const AUTHMETHOD_PRIVATE_KEY = 0x02; const COMMAND_ID = 0x01; @@ -301,15 +301,15 @@ const initialFieldDef = { return ""; } }, - Passpharse: { - name: "Passpharse", + Passphrase: { + name: "Passphrase", description: "", type: "password", value: "", example: "----------", verify(d) { if (d.length <= 0) { - throw new Error("Passpharse must be specified"); + throw new Error("Passphrase must be specified"); } if (d.length > MAX_PASSWORD_LEN) { @@ -318,7 +318,7 @@ const initialFieldDef = { ); } - return "We'll login with this passpharse"; + return "We'll login with this passphrase"; } }, "Private Key": { @@ -396,7 +396,7 @@ function getAuthMethodFromStr(d) { return AUTHMETHOD_NONE; case "Password": - return AUTHMETHOD_PASSPHARSE; + return AUTHMETHOD_PASSPHRASE; case "Private Key": return AUTHMETHOD_PRIVATE_KEY; @@ -694,8 +694,8 @@ class Wizard { fieldName = ""; switch (config.auth) { - case AUTHMETHOD_PASSPHARSE: - fieldName = "Passpharse"; + case AUTHMETHOD_PASSPHRASE: + fieldName = "Passphrase"; break; case AUTHMETHOD_PRIVATE_KEY: