From b1d92b395322f2164ccfb44b0f7caebbaece6b62 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Fri, 22 Apr 2022 16:29:59 +0200
Subject: Refactor: Restructure project

- Add an internal folder where all the internal code lives
- Make a state.go and state_test.go for the public interface

This gives a more clear separation between functions and modules. It
also makes this a more typical Go project setup.
---
 src/api.go | 110 -------------------------------------------------------------
 1 file changed, 110 deletions(-)
 delete mode 100644 src/api.go

(limited to 'src/api.go')

diff --git a/src/api.go b/src/api.go
deleted file mode 100644
index 93c1c42..0000000
--- a/src/api.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package eduvpn
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-)
-
-// Authenticated wrappers on top of HTTP
-func (server *Server) apiAuthenticated(method string, endpoint string, opts *HTTPOptionalParams) (http.Header, []byte, error) {
-	// Ensure optional is not nil as we will fill it with headers
-	if opts == nil {
-		opts = &HTTPOptionalParams{}
-	}
-	url := server.Endpoints.API.V3.API + endpoint
-
-	// Ensure we have valid tokens
-	oauthErr := server.OAuth.EnsureTokens()
-
-	if oauthErr != nil {
-		return nil, nil, oauthErr
-	}
-
-	headerKey := "Authorization"
-	headerValue := fmt.Sprintf("Bearer %s", server.OAuth.Token.Access)
-	if opts.Headers != nil {
-		opts.Headers.Add(headerKey, headerValue)
-	} else {
-		opts.Headers = http.Header{headerKey: {headerValue}}
-	}
-	return HTTPMethodWithOpts(method, url, opts)
-}
-
-func (server *Server) apiAuthenticatedRetry(method string, endpoint string, opts *HTTPOptionalParams) (http.Header, []byte, error) {
-	header, body, bodyErr := server.apiAuthenticated(method, endpoint, opts)
-	if bodyErr != nil {
-		var error *HTTPStatusError
-
-		// Only retry authenticated if we get a HTTP 401
-		if errors.As(bodyErr, &error) && error.Status == 401 {
-			GetVPNState().Log(LOG_INFO, fmt.Sprintf("API: Got HTTP error %v, retrying authenticated", error))
-			// Tell the method that the token is expired
-			server.OAuth.Token.ExpiredTimestamp = GenerateTimeSeconds()
-			return server.apiAuthenticated(method, endpoint, opts)
-		}
-		return header, nil, bodyErr
-	}
-	return header, body, bodyErr
-}
-
-func (server *Server) APIInfo() error {
-	_, body, bodyErr := server.apiAuthenticatedRetry(http.MethodGet, "/info", nil)
-	if bodyErr != nil {
-		return bodyErr
-	}
-	structure := ServerProfileInfo{}
-	jsonErr := json.Unmarshal(body, &structure)
-
-	if jsonErr != nil {
-		return jsonErr
-	}
-
-	server.Profiles = structure
-	server.ProfilesRaw = string(body)
-	return nil
-}
-
-func (server *Server) APIConnectWireguard(profile_id string, pubkey string) (string, string, error) {
-	headers := http.Header{
-		"content-type": {"application/x-www-form-urlencoded"},
-		"accept":       {"application/x-wireguard-profile"},
-	}
-
-	urlForm := url.Values{
-		"profile_id": {profile_id},
-		"public_key": {pubkey},
-	}
-	header, connectBody, connectErr := server.apiAuthenticatedRetry(http.MethodPost, "/connect", &HTTPOptionalParams{Headers: headers, Body: urlForm})
-	if connectErr != nil {
-		return "", "", connectErr
-	}
-
-	expires := header.Get("expires")
-	return string(connectBody), expires, nil
-}
-
-func (server *Server) APIConnectOpenVPN(profile_id string) (string, string, error) {
-	headers := http.Header{
-		"content-type": {"application/x-www-form-urlencoded"},
-		"accept":       {"application/x-openvpn-profile"},
-	}
-
-	urlForm := url.Values{
-		"profile_id": {profile_id},
-	}
-	header, connectBody, connectErr := server.apiAuthenticatedRetry(http.MethodPost, "/connect", &HTTPOptionalParams{Headers: headers, Body: urlForm})
-	if connectErr != nil {
-		return "", "", connectErr
-	}
-
-	expires := header.Get("expires")
-	return string(connectBody), expires, nil
-}
-
-// This needs no further return value as it's best effort
-func (server *Server) APIDisconnect() {
-	server.apiAuthenticatedRetry(http.MethodPost, "/disconnect", nil)
-}
-- 
cgit v1.2.3