Refactor: Structures changed and added Token refresh function

1 files changed, 3 insertions, 37 deletions

diff --git a/src/api.go b/src/api.go
index ef07dd4..43e92d7 100644
--- a/src/api.go
+++ b/src/api.go
@@ -1,47 +1,13 @@
 package eduvpn
 
 import (
-	"encoding/json"
 	"net/http"
 )
 
-type endpointList struct {
-	API           string `json:"api_endpoint"`
-	Authorization string `json:"authorization_endpoint"`
-	Token         string `json:"token_endpoint"`
-}
-
-// Struct that defines the json format for /.well-known/vpn-user-portal"
-type EduVPNEndpoints struct {
-	API struct {
-		V2 endpointList `json:"http://eduvpn.org/api#2"`
-		V3 endpointList `json:"http://eduvpn.org/api#3"`
-	} `json:"api"`
-	V string `json:"v"`
-}
-
-func APIGetEndpoints(vpnState *EduVPNState) (*EduVPNEndpoints, error) {
-	url := vpnState.Server + "/.well-known/vpn-user-portal"
-	body, bodyErr := HTTPGet(url)
-
-	if bodyErr != nil {
-		return nil, bodyErr
-	}
-
-	structure := &EduVPNEndpoints{}
-	jsonErr := json.Unmarshal(body, &structure)
-
-	if jsonErr != nil {
-		return nil, jsonErr
-	}
-
-	return structure, nil
-}
-
-func APIAuthenticatedInfo(vpnState *EduVPNState) (string, error) {
-	url := vpnState.Endpoints.API.V3.API + "/info"
+func (eduvpn *VPNState) APIAuthenticatedInfo() (string, error) {
+	url := eduvpn.Server.Endpoints.API.V3.API + "/info"
 
-	headers := &http.Header{"Authorization": {"Bearer " + vpnState.OAuthToken.Access}}
+	headers := &http.Header{"Authorization": {"Bearer " + eduvpn.Server.OAuth.Token.Access}}
 	body, bodyErr := HTTPGetWithOptionalParams(url, &HTTPOptionalParams{Headers: headers})
 	if bodyErr != nil {
 		return "", bodyErr