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

Fix #163: fallback to single session login if OS keyring is not available

Browse Source
This commit is contained in:
Drew Weymouth
2023-05-13 09:24:13 -07:00
parent eab7842424
commit 4c6d6eb162
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/controller/controller.go
+4 -7
View File
@@ -158,11 +158,9 @@ func (m *Controller) PromptForFirstServer() {
LegacyAuth: d.LegacyAuth, LegacyAuth: d.LegacyAuth,
} }
server := m.App.Config.AddServer(d.Nickname, conn) server := m.App.Config.AddServer(d.Nickname, conn)
if err := m.App.ServerManager.SetServerPassword(server, d.Password); err != nil { if err := m.trySetPasswordAndConnectToServer(server, d.Password); err != nil {
log.Printf("error setting keyring credentials: %v", err) log.Printf("error connecting to server: %s", err.Error())
// TODO: handle?
} }
m.DoConnectToServerWorkflow(server)
} }
d.EnableSubmit() d.EnableSubmit()
}() }()
@@ -362,9 +360,8 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func()) {
func (c *Controller) trySetPasswordAndConnectToServer(server *backend.ServerConfig, password string) error { func (c *Controller) trySetPasswordAndConnectToServer(server *backend.ServerConfig, password string) error {
if err := c.App.ServerManager.SetServerPassword(server, password); err != nil { if err := c.App.ServerManager.SetServerPassword(server, password); err != nil {
log.Printf("error setting keyring credentials: %v", err) log.Printf("error setting keyring credentials: %v", err)
// TODO: how best to handle this unexpected codepath // Don't return an error; fall back to just using the password in-memory
// fall back to prompting for password on each run of the app? // User will need to log in with the password on subsequent runs.
return err
} }
return c.tryConnectToServer(server, password) return c.tryConnectToServer(server, password)
} }
ui/dialogs/logindialog.go
+1
View File
@@ -40,6 +40,7 @@ func NewLoginDialog(servers []*backend.ServerConfig) *LoginDialog {
l.serverSelect.SetSelectedIndex(0) l.serverSelect.SetSelectedIndex(0)
editBtn := widget.NewButtonWithIcon("", theme.DocumentCreateIcon(), l.onEditServer) editBtn := widget.NewButtonWithIcon("", theme.DocumentCreateIcon(), l.onEditServer)
l.passField = widget.NewPasswordEntry() l.passField = widget.NewPasswordEntry()
l.passField.OnSubmitted = func(_ string) { l.onSubmit() }
l.submitBtn = widget.NewButton("OK", l.onSubmit) l.submitBtn = widget.NewButton("OK", l.onSubmit)
l.promptText = widget.NewRichTextWithText("") l.promptText = widget.NewRichTextWithText("")