added dialog informing browser tab closing

This commit is contained in:
John O'Keefe 2024-08-13 20:05:25 -04:00
parent a0e193e343
commit 0f647e85cb
3 changed files with 30 additions and 9 deletions

View File

@ -57,7 +57,7 @@ func (a *App) AniListLogin() {
serverDone := &sync.WaitGroup{} serverDone := &sync.WaitGroup{}
serverDone.Add(1) serverDone.Add(1)
handleAniListCallback(serverDone) a.handleAniListCallback(serverDone)
serverDone.Wait() serverDone.Wait()
} else { } else {
aniListJwt.TokenType = string(tokenType.Data) 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() mux := http.NewServeMux()
srv := &http.Server{Addr: ":6734", Handler: mux} srv := &http.Server{Addr: ":6734", Handler: mux}
mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) {
@ -98,9 +98,16 @@ func handleAniListCallback(wg *sync.WaitGroup) {
Key: "anilistRefreshToken", Key: "anilistRefreshToken",
Data: []byte(aniListJwt.RefreshToken), 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...") fmt.Println("Shutting down...")
aniCancel() aniCancel()
err := srv.Shutdown(context.Background()) err = srv.Shutdown(context.Background())
if err != nil { if err != nil {
log.Println("server.Shutdown:", err) log.Println("server.Shutdown:", err)
} }

View File

@ -101,7 +101,7 @@ func (a *App) MyAnimeListLogin() {
runtime.BrowserOpenURL(a.ctx, getMyAnimeListCodeUrl) runtime.BrowserOpenURL(a.ctx, getMyAnimeListCodeUrl)
serverDone := &sync.WaitGroup{} serverDone := &sync.WaitGroup{}
serverDone.Add(1) serverDone.Add(1)
handleMyAnimeListCallback(serverDone, verifier) a.handleMyAnimeListCallback(serverDone, verifier)
serverDone.Wait() serverDone.Wait()
} else { } else {
myAnimeListJwt.TokenType = string(tokenType.Data) 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() mux := http.NewServeMux()
srv := &http.Server{Addr: ":6734", Handler: mux} srv := &http.Server{Addr: ":6734", Handler: mux}
mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) {
@ -145,9 +145,16 @@ func handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifier) {
Key: "MyAnimeListRefreshToken", Key: "MyAnimeListRefreshToken",
Data: []byte(myAnimeListJwt.RefreshToken), 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...") fmt.Println("Shutting down...")
myAnimeListCancel() myAnimeListCancel()
err := srv.Shutdown(context.Background()) err = srv.Shutdown(context.Background())
if err != nil { if err != nil {
log.Println("server.Shutdown:", err) log.Println("server.Shutdown:", err)
} }

View File

@ -52,7 +52,7 @@ func (a *App) SimklLogin() {
serverDone := &sync.WaitGroup{} serverDone := &sync.WaitGroup{}
serverDone.Add(1) serverDone.Add(1)
handleSimklCallback(serverDone) a.handleSimklCallback(serverDone)
serverDone.Wait() serverDone.Wait()
} else { } else {
simklJwt.TokenType = string(tokenType.Data) 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() mux := http.NewServeMux()
srv := &http.Server{Addr: ":6734", Handler: mux} srv := &http.Server{Addr: ":6734", Handler: mux}
mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/callback", func(w http.ResponseWriter, r *http.Request) {
@ -88,9 +88,16 @@ func handleSimklCallback(wg *sync.WaitGroup) {
Key: "SimklScope", Key: "SimklScope",
Data: []byte(simklJwt.Scope), 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...") fmt.Println("Shutting down...")
simklCancel() simklCancel()
err := srv.Shutdown(context.Background()) err = srv.Shutdown(context.Background())
if err != nil { if err != nil {
log.Println("server.Shutdown:", err) log.Println("server.Shutdown:", err)
} }