extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-20 09:47:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Send UI notification on peer connection session expiry (#1646)

Browse Source 
notify the user when the peer connection session expires after it switches from connected 
to disconnected and the status is login required
This commit is contained in:
Bethuel Mmbaga 2024-03-01 19:57:17 +03:00 committed by GitHub
parent 17b1099032
commit 452419c4c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
client/ui/client_ui.go
View File

@ -61,7 +61,7 @@ func main() {
flag.Parse() flag.Parse()
a := app.New() a := app.NewWithID("NetBird")
a.SetIcon(fyne.NewStaticResource("netbird", iconDisconnectedPNG)) a.SetIcon(fyne.NewStaticResource("netbird", iconDisconnectedPNG))
client := newServiceClient(daemonAddr, a, showSettings) client := newServiceClient(daemonAddr, a, showSettings)
@ -130,9 +130,10 @@ type serviceClient struct {
mQuit *systray.MenuItem mQuit *systray.MenuItem
// application with main windows. // application with main windows.
app fyne.App app fyne.App
wSettings fyne.Window wSettings fyne.Window
showSettings bool showSettings bool
sendNotification bool
// input elements for settings form // input elements for settings form
iMngURL *widget.Entry iMngURL *widget.Entry
@ -158,9 +159,10 @@ type serviceClient struct {
// This constructor also builds the UI elements for the settings window. // This constructor also builds the UI elements for the settings window.
func newServiceClient(addr string, a fyne.App, showSettings bool) *serviceClient { func newServiceClient(addr string, a fyne.App, showSettings bool) *serviceClient {
s := &serviceClient{ s := &serviceClient{
ctx: context.Background(), ctx: context.Background(),
addr: addr, addr: addr,
app: a, app: a,
sendNotification: false,
showSettings: showSettings, showSettings: showSettings,
update: version.NewUpdate(), update: version.NewUpdate(),
@ -377,9 +379,15 @@ func (s *serviceClient) updateStatus() error {
s.updateIndicationLock.Lock() s.updateIndicationLock.Lock()
defer s.updateIndicationLock.Unlock() defer s.updateIndicationLock.Unlock()
// notify the user when the session has expired
if status.Status == string(internal.StatusNeedsLogin) {
s.onSessionExpire()
}
var systrayIconState bool var systrayIconState bool
if status.Status == string(internal.StatusConnected) && !s.mUp.Disabled() { if status.Status == string(internal.StatusConnected) && !s.mUp.Disabled() {
s.connected = true s.connected = true
s.sendNotification = true
if s.isUpdateIconActive { if s.isUpdateIconActive {
systray.SetIcon(s.icUpdateConnected) systray.SetIcon(s.icUpdateConnected)
} else { } else {
@ -630,6 +638,23 @@ func (s *serviceClient) onUpdateAvailable() {
} }
} }
// onSessionExpire sends a notification to the user when the session expires.
func (s *serviceClient) onSessionExpire() {
if s.sendNotification {
title := "Connection session expired"
if runtime.GOOS == "darwin" {
title = "NetBird connection session expired"
}
s.app.SendNotification(
fyne.NewNotification(
title,
"Please re-authenticate to connect to the network",
),
)
s.sendNotification = false
}
}
func openURL(url string) error { func openURL(url string) error {
var err error var err error
switch runtime.GOOS { switch runtime.GOOS {