prefer saved password to keyboard interactive auth

Eugeny · Jan 29, 2025 · 5d2d179 · 5d2d179
1 parent 4197cef
commit 5d2d179
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/tabby-ssh/src/session/ssh.ts b/tabby-ssh/src/session/ssh.ts
@@ -194,13 +194,6 @@ export class SSHSession {
                 })
             }
         }
-        if (!this.profile.options.auth || this.profile.options.auth === 'keyboardInteractive') {
-            const savedPassword = this.profile.options.password ?? await this.passwordStorage.loadPassword(this.profile)
-            if (savedPassword) {
-                this.allAuthMethods.push({ type: 'keyboard-interactive', savedPassword })
-            }
-            this.allAuthMethods.push({ type: 'keyboard-interactive' })
-        }
         if (!this.profile.options.auth || this.profile.options.auth === 'password') {
             if (this.profile.options.password) {
                 this.allAuthMethods.push({ type: 'saved-password', password: this.profile.options.password })
@@ -209,6 +202,15 @@ export class SSHSession {
             if (password) {
                 this.allAuthMethods.push({ type: 'saved-password', password })
             }
+        }
+        if (!this.profile.options.auth || this.profile.options.auth === 'keyboardInteractive') {
+            const savedPassword = this.profile.options.password ?? await this.passwordStorage.loadPassword(this.profile)
+            if (savedPassword) {
+                this.allAuthMethods.push({ type: 'keyboard-interactive', savedPassword })
+            }
+            this.allAuthMethods.push({ type: 'keyboard-interactive' })
+        }
+        if (!this.profile.options.auth || this.profile.options.auth === 'password') {
             this.allAuthMethods.push({ type: 'prompt-password' })
         }
         this.allAuthMethods.push({ type: 'hostbased' })