From 2d5c7dad599b3f8b70ab07382973c51d1de2193d Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Fri, 18 Mar 2022 13:58:08 +0100 Subject: Refactor: Structures changed and added Token refresh function --- cli/main.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'cli/main.go') diff --git a/cli/main.go b/cli/main.go index 42c4b67..ccec3f4 100644 --- a/cli/main.go +++ b/cli/main.go @@ -34,17 +34,23 @@ func main() { state := eduvpn.GetVPNState() - eduvpn.Register(state, "org.eduvpn.app.linux", urlString, logState) - authURL, err := eduvpn.InitializeOAuth(state) + eduvpn.Register(state, "org.eduvpn.app.linux", logState) + state.Server = &eduvpn.Server{} + serverInitializeErr := state.Server.Initialize(urlString) + if serverInitializeErr != nil { + log.Fatal(serverInitializeErr) + } + + authURL, err := state.InitializeOAuth() if err != nil { log.Fatal(err) } openBrowser(authURL) - oauthErr := eduvpn.FinishOAuth(state) + oauthErr := state.FinishOAuth() if oauthErr != nil { log.Fatal(oauthErr) } - infoString, infoErr := eduvpn.APIAuthenticatedInfo(state) + infoString, infoErr := state.APIAuthenticatedInfo() if infoErr != nil { log.Fatal(infoErr) } -- cgit v1.2.3