sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-20 07:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace openRoute with Event.Emit for needsLogin

Browse Source
This commit is contained in:
Eduard Gert
2026-05-18 10:39:03 +02:00
parent 32f62f3ed8
commit a6278936af
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/ui/tray.go
View File

@@ -325,16 +325,19 @@ func (t *Tray) openRoute(route string) {
func (t *Tray) handleConnect() {
// NeedsLogin/SessionExpired/LoginFailed mean the daemon won't honor a
// plain Up RPC ("up already in progress: current status NeedsLogin") —
// it needs the Login → WaitSSOLogin → Up sequence instead. The
// frontend's /login route already drives that flow, so route the
// click there rather than re-implementing the SSO dance in the tray.
// it needs the Login → WaitSSOLogin → Up sequence instead. Hand off
// to the React-side startLogin() (which owns the browser-login window
// and SSO orchestration) by showing the main window and emitting
// EventTriggerLogin. The frontend subscribes in
// layouts/ConnectionStatusSwitch.tsx.
t.mu.Lock()
needsLogin := strings.EqualFold(t.lastStatus, services.StatusNeedsLogin) ||
strings.EqualFold(t.lastStatus, services.StatusSessionExpired) ||
strings.EqualFold(t.lastStatus, services.StatusLoginFailed)
t.mu.Unlock()
if needsLogin {
t.openRoute("/login")
t.ShowWindow()
t.app.Event.Emit(services.EventTriggerLogin)
return
}
t.upItem.SetEnabled(false)