owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add legacy auth support

Browse Source
This commit is contained in:
Drew Weymouth
2023-03-09 17:22:41 -08:00
committed by Drew Weymouth
parent c8fd7038fb
commit f14dda8f45
4 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/controller/controller.go
+5 -4
View File
@@ -102,7 +102,7 @@ func (m *Controller) PromptForFirstServer() {
if m.testConnectionAndUpdateDialogText(d) {
// connection is good
pop.Hide()
server := m.App.Config.AddServer(d.Nickname, d.Host, d.Username)
server := m.App.Config.AddServer(d.Nickname, d.Host, d.Username, d.LegacyAuth)
if err := m.App.ServerManager.SetServerPassword(server, d.Password); err != nil {
log.Printf("error setting keyring credentials: %v", err)
// TODO: handle?
@@ -172,7 +172,7 @@ func (m *Controller) PromptForLoginAndConnect() {
d.DisableSubmit()
d.SetInfoText("Testing connection...")
go func() {
err := m.App.ServerManager.TestConnectionAndAuth(server.Hostname, server.Username, password, 5*time.Second)
err := m.App.ServerManager.TestConnectionAndAuth(server.Hostname, server.Username, password, server.LegacyAuth, 5*time.Second)
if err == backend.ErrUnreachable {
d.SetErrorText("Server unreachable")
} else if err != nil {
@@ -197,6 +197,7 @@ func (m *Controller) PromptForLoginAndConnect() {
server.Hostname = editD.Host
server.Nickname = editD.Nickname
server.Username = editD.Username
server.LegacyAuth = editD.LegacyAuth
m.trySetPasswordAndConnectToServer(server, editD.Password)
}
d.EnableSubmit()
@@ -226,7 +227,7 @@ func (c *Controller) trySetPasswordAndConnectToServer(server *backend.ServerConf
}
func (c *Controller) tryConnectToServer(server *backend.ServerConfig, password string) error {
if err := c.App.ServerManager.TestConnectionAndAuth(server.Hostname, server.Username, password, 10*time.Second); err != nil {
if err := c.App.ServerManager.TestConnectionAndAuth(server.Hostname, server.Username, password, server.LegacyAuth, 10*time.Second); err != nil {
return err
}
if err := c.App.ServerManager.ConnectToServer(server, password); err != nil {
@@ -238,7 +239,7 @@ func (c *Controller) tryConnectToServer(server *backend.ServerConfig, password s
func (c *Controller) testConnectionAndUpdateDialogText(dlg *dialogs.AddEditServerDialog) bool {
dlg.SetInfoText("Testing connection...")
err := c.App.ServerManager.TestConnectionAndAuth(dlg.Host, dlg.Username, dlg.Password, 5*time.Second)
err := c.App.ServerManager.TestConnectionAndAuth(dlg.Host, dlg.Username, dlg.Password, dlg.LegacyAuth, 5*time.Second)
if err == backend.ErrUnreachable {
dlg.SetErrorText("Could not reach server (wrong hostname?)")
return false
ui/dialogs/addeditserverdialog.go
+10 -5
View File
@@ -14,11 +14,12 @@ import (
type AddEditServerDialog struct {
widget.BaseWidget
Nickname string
Host string
Username string
Password string
OnSubmit func()
Nickname string
Host string
Username string
Password string
LegacyAuth bool
OnSubmit func()
submitBtn *widget.Button
promptText *widget.RichText
@@ -34,6 +35,7 @@ func NewAddEditServerDialog(title string, prefillServer *backend.ServerConfig) *
a.Nickname = prefillServer.Nickname
a.Host = prefillServer.Hostname
a.Username = prefillServer.Username
a.LegacyAuth = prefillServer.LegacyAuth
}
titleLabel := widget.NewLabel(title)
@@ -53,6 +55,8 @@ func NewAddEditServerDialog(title string, prefillServer *backend.ServerConfig) *
a.promptText = widget.NewRichTextWithText("")
a.promptText.Hidden = true
legacyAuthCheck := widget.NewCheckWithData("Use legacy authentication", binding.BindBool(&a.LegacyAuth))
a.container = container.NewVBox(
container.NewHBox(layout.NewSpacer(), titleLabel, layout.NewSpacer()),
container.New(layout.NewFormLayout(),
@@ -65,6 +69,7 @@ func NewAddEditServerDialog(title string, prefillServer *backend.ServerConfig) *
widget.NewLabel("Password"),
passField,
),
container.NewHBox(layout.NewSpacer(), legacyAuthCheck),
widget.NewSeparator(),
container.NewHBox(
a.promptText,