refactor login workflow, can now re-prompt for password if missing

This commit is contained in:
Drew Weymouth
2023-02-12 17:21:47 -08:00
parent 198b84b9c1
commit b5aa8e61f0
5 changed files with 91 additions and 41 deletions
+2 -20
View File
@@ -48,16 +48,9 @@ func main() {
time.Sleep(250 * time.Millisecond)
defaultServer := myApp.Config.GetDefaultServer()
if defaultServer == nil {
mainWindow.PromptForFirstServer(func(nick, host, user, pass string) {
server := myApp.Config.AddServer(nick, host, user)
if err := myApp.ServerManager.SetServerPassword(server, pass); err != nil {
log.Printf("error setting keyring credentials: %v", err)
// TODO: handle?
}
setupServer(myApp, server)
})
mainWindow.Controller.PromptForFirstServer()
} else {
setupServer(myApp, defaultServer)
mainWindow.Controller.DoConnectToServerWorkflow(defaultServer)
}
}()
@@ -73,14 +66,3 @@ func main() {
myApp.Config.WriteConfigFile(configPath())
myApp.Shutdown()
}
func setupServer(app *backend.App, server *backend.ServerConfig) {
pass, err := app.ServerManager.GetServerPassword(server)
if err != nil {
log.Printf("error getting password from keyring: %v", err)
}
if err := app.ServerManager.ConnectToServer(server, pass); err != nil {
log.Printf("error connecting to server: %v", err)
// TODO: surface error to user
}
}