From 0f647e85cbdec10caa34f6fffffd64a723ee4f9b Mon Sep 17 00:00:00 2001 From: John O'Keefe Date: Tue, 13 Aug 2024 20:05:25 -0400 Subject: [PATCH] added dialog informing browser tab closing --- AniListUserFunctions.go | 13 ++++++++++--- MALUserFunctions.go | 13 ++++++++++--- SimklUserFunctions.go | 13 ++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/AniListUserFunctions.go b/AniListUserFunctions.go index 4b3d422..1dbe2ee 100644 --- a/AniListUserFunctions.go +++ b/AniListUserFunctions.go @@ -57,7 +57,7 @@ func (a *App) AniListLogin() { serverDone := &sync.WaitGroup{} serverDone.Add(1) - handleAniListCallback(serverDone) + a.handleAniListCallback(serverDone) serverDone.Wait() } else { aniListJwt.TokenType = string(tokenType.Data) @@ -68,7 +68,7 @@ func (a *App) AniListLogin() { } } -func handleAniListCallback(wg *sync.WaitGroup) { +func (a *App) handleAniListCallback(wg *sync.WaitGroup) { mux := http.NewServeMux() srv := &http.Server{Addr: ":6734", Handler: mux} mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) { @@ -98,9 +98,16 @@ func handleAniListCallback(wg *sync.WaitGroup) { Key: "anilistRefreshToken", Data: []byte(aniListJwt.RefreshToken), }) + _, err := runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{ + Title: "AniList Authorization", + Message: "It is now safe to close your browser tab", + }) + if err != nil { + log.Println(err) + } fmt.Println("Shutting down...") aniCancel() - err := srv.Shutdown(context.Background()) + err = srv.Shutdown(context.Background()) if err != nil { log.Println("server.Shutdown:", err) } diff --git a/MALUserFunctions.go b/MALUserFunctions.go index 642d89d..63e133d 100644 --- a/MALUserFunctions.go +++ b/MALUserFunctions.go @@ -101,7 +101,7 @@ func (a *App) MyAnimeListLogin() { runtime.BrowserOpenURL(a.ctx, getMyAnimeListCodeUrl) serverDone := &sync.WaitGroup{} serverDone.Add(1) - handleMyAnimeListCallback(serverDone, verifier) + a.handleMyAnimeListCallback(serverDone, verifier) serverDone.Wait() } else { myAnimeListJwt.TokenType = string(tokenType.Data) @@ -115,7 +115,7 @@ func (a *App) MyAnimeListLogin() { } } -func handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifier) { +func (a *App) handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifier) { mux := http.NewServeMux() srv := &http.Server{Addr: ":6734", Handler: mux} mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) { @@ -145,9 +145,16 @@ func handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifier) { Key: "MyAnimeListRefreshToken", Data: []byte(myAnimeListJwt.RefreshToken), }) + _, err := runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{ + Title: "MyAnimeList Authorization", + Message: "It is now safe to close your browser tab", + }) + if err != nil { + log.Println(err) + } fmt.Println("Shutting down...") myAnimeListCancel() - err := srv.Shutdown(context.Background()) + err = srv.Shutdown(context.Background()) if err != nil { log.Println("server.Shutdown:", err) } diff --git a/SimklUserFunctions.go b/SimklUserFunctions.go index a720506..9265c4e 100644 --- a/SimklUserFunctions.go +++ b/SimklUserFunctions.go @@ -52,7 +52,7 @@ func (a *App) SimklLogin() { serverDone := &sync.WaitGroup{} serverDone.Add(1) - handleSimklCallback(serverDone) + a.handleSimklCallback(serverDone) serverDone.Wait() } else { simklJwt.TokenType = string(tokenType.Data) @@ -62,7 +62,7 @@ func (a *App) SimklLogin() { } } -func handleSimklCallback(wg *sync.WaitGroup) { +func (a *App) handleSimklCallback(wg *sync.WaitGroup) { mux := http.NewServeMux() srv := &http.Server{Addr: ":6734", Handler: mux} mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) { @@ -88,9 +88,16 @@ func handleSimklCallback(wg *sync.WaitGroup) { Key: "SimklScope", Data: []byte(simklJwt.Scope), }) + _, err := runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{ + Title: "Simkl Authorization", + Message: "It is now safe to close your browser tab", + }) + if err != nil { + log.Println(err) + } fmt.Println("Shutting down...") simklCancel() - err := srv.Shutdown(context.Background()) + err = srv.Shutdown(context.Background()) if err != nil { log.Println("server.Shutdown:", err) }