From d45f5df4dc5fa9ad8abdc47c940f6baf96fdbe45 Mon Sep 17 00:00:00 2001
From: Jeroen Wijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 21 Mar 2022 11:20:34 +0100
Subject: OAuth: Make sure the tokens are not expired

---
 src/api.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/api.go')

diff --git a/src/api.go b/src/api.go
index 43e92d7..d485728 100644
--- a/src/api.go
+++ b/src/api.go
@@ -4,8 +4,15 @@ import (
 	"net/http"
 )
 
-func (eduvpn *VPNState) APIAuthenticatedInfo() (string, error) {
-	url := eduvpn.Server.Endpoints.API.V3.API + "/info"
+func (eduvpn *VPNState) APIAuthenticatedGet(endpoint string) (string, error) {
+	url := eduvpn.Server.Endpoints.API.V3.API + endpoint
+
+	// Ensure we have non-expired tokens
+	oauthErr := eduvpn.EnsureTokensOAuth()
+
+	if oauthErr != nil {
+		return "", oauthErr
+	}
 
 	headers := &http.Header{"Authorization": {"Bearer " + eduvpn.Server.OAuth.Token.Access}}
 	body, bodyErr := HTTPGetWithOptionalParams(url, &HTTPOptionalParams{Headers: headers})
-- 
cgit v1.2.3