From 6192f9ab54a805c1fabe6a2c5b8eca622b565082 Mon Sep 17 00:00:00 2001
From: Jeroen Wijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 28 Mar 2022 23:29:43 +0200
Subject: OAuth: Token refresh changes and tests

---
 src/state.go | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/state.go')

diff --git a/src/state.go b/src/state.go
index fcc5930..12ad57a 100644
--- a/src/state.go
+++ b/src/state.go
@@ -39,21 +39,11 @@ func (state *VPNState) Connect(url string) (string, error) {
 	}
 
 	if !state.Server.IsAuthenticated() {
-		authURL, authInitializeErr := state.InitializeOAuth()
+		loginErr := state.LoginOAuth()
 
-		if authInitializeErr != nil {
-			return "", authInitializeErr
+		if loginErr != nil {
+			return "", loginErr
 		}
-
-		go state.StateCallback("Registered", "OAuthInitialized", authURL)
-		oauthErr := state.FinishOAuth()
-
-		if oauthErr != nil {
-			return "", oauthErr
-		}
-
-		state.StateCallback("OAuthInitialized", "OAuthFinished", "finished oauth")
-		state.WriteConfig()
 	}
 
 	return state.Server.GetConfig()
-- 
cgit v1.2.3