[client] Close Re-Auth Window If Client Is Already Connected #4525
Conversation
|
There was a problem hiding this comment.
Pull Request Overview
This PR updates the re-authentication UI flow so that the login prompt automatically closes when the client is already connected.
- showLoginURL now returns a CancelFunc and spins up a background goroutine to poll connection status.
- The login window registers an OnClosed handler to cancel the goroutine.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| case <-ctx.Done(): | ||
| return | ||
| case <-ticker.C: | ||
| status, err := conn.Status(s.ctx, &proto.StatusRequest{}) |
There was a problem hiding this comment.
The Status RPC uses s.ctx instead of the cancellable ctx created for this goroutine, meaning in-flight calls won’t be canceled when cancel() is invoked or when the window closes. Use ctx so the RPC respects cancellation.
| status, err := conn.Status(s.ctx, &proto.StatusRequest{}) | |
| status, err := conn.Status(ctx, &proto.StatusRequest{}) |
Copilot uses AI. Check for mistakes.
| conn, err := s.getSrvClient(failFastTimeout) | ||
| if err != nil { | ||
| return |
There was a problem hiding this comment.
If acquiring the service client fails once, the goroutine exits and the auto-close behavior never runs. This makes the feature inert under transient startup/network conditions. Consider retrying acquisition inside the loop (or continuing until ctx.Done()) so it recovers from transient failures.
| conn, err := s.getSrvClient(failFastTimeout) | |
| if err != nil { | |
| return | |
| var conn proto.ClientServiceClient | |
| for { | |
| select { | |
| case <-ctx.Done(): | |
| return | |
| default: | |
| } | |
| var err error | |
| conn, err = s.getSrvClient(failFastTimeout) | |
| if err != nil { | |
| // Retry after a short delay if acquiring the client fails | |
| time.Sleep(2 * time.Second) | |
| continue | |
| } | |
| break |
Copilot uses AI. Check for mistakes.
[client] Close Re-Auth Window If Client Is Already Connected
Describe your changes
Issue ticket number and link
Stack
Checklist
Documentation
Select exactly one:
Docs PR URL (required if "docs added" is checked)
Paste the PR link from https://github.com/netbirdio/docs here:
https://github.com/netbirdio/docs/pull/__