Refactor: Structures changed and added Token refresh function

1 files changed, 10 insertions, 4 deletions

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)
 	}