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/server.go | 178 ----------------------------------------------------------
 1 file changed, 178 deletions(-)
 delete mode 100644 src/server.go

(limited to 'src/server.go')

diff --git a/src/server.go b/src/server.go
deleted file mode 100644
index 3dca26b..0000000
--- a/src/server.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package eduvpn
-
-import (
-	"encoding/json"
-	"errors"
-)
-
-type Server struct {
-	BaseURL     string            `json:"base_url"`
-	Endpoints   ServerEndpoints   `json:"endpoints"`
-	OAuth       OAuth             `json:"oauth"`
-	Profiles    ServerProfileInfo `json:"profiles"`
-	ProfilesRaw string            `json:"profiles_raw"`
-}
-
-type Servers struct {
-	List    map[string]*Server `json:"list"`
-	Current string             `json:"current"`
-}
-
-func (servers *Servers) GetCurrentServer() (*Server, error) {
-	if servers.List == nil {
-		return nil, errors.New("No map found to get Current Server")
-	}
-	server, exists := servers.List[servers.Current]
-
-	if !exists || server == nil {
-		return nil, errors.New("Current Server not found")
-	}
-	return server, nil
-}
-
-func (servers *Servers) EnsureServer(url string) *Server {
-	if servers.List == nil {
-		servers.List = make(map[string]*Server)
-	}
-
-	server, exists := servers.List[url]
-
-	if !exists || server == nil {
-		server = &Server{}
-		server.Initialize(url)
-		servers.List[url] = server
-	}
-	servers.Current = url
-	return server
-}
-
-type ServerProfile struct {
-	ID             string   `json:"profile_id"`
-	DisplayName    string   `json:"display_name"`
-	VPNProtoList   []string `json:"vpn_proto_list"`
-	DefaultGateway bool     `json:"default_gateway"`
-}
-
-type ServerProfileInfo struct {
-	Current string `json:"current_profile"`
-	Info    struct {
-		ProfileList []ServerProfile `json:"profile_list"`
-	} `json:"info"`
-}
-
-type ServerEndpointList 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 ServerEndpoints struct {
-	API struct {
-		V2 ServerEndpointList `json:"http://eduvpn.org/api#2"`
-		V3 ServerEndpointList `json:"http://eduvpn.org/api#3"`
-	} `json:"api"`
-	V string `json:"v"`
-}
-
-func (server *Server) Initialize(url string) error {
-	server.BaseURL = url
-	endpointsErr := server.GetEndpoints()
-	if endpointsErr != nil {
-		return endpointsErr
-	}
-	return nil
-}
-
-func (server *Server) NeedsRelogin() bool {
-	// Check if OAuth needs relogin
-	return server.OAuth.NeedsRelogin()
-}
-
-func (server *Server) GetEndpoints() error {
-	url := server.BaseURL + "/.well-known/vpn-user-portal"
-	_, body, bodyErr := HTTPGet(url)
-
-	if bodyErr != nil {
-		return bodyErr
-	}
-
-	endpoints := ServerEndpoints{}
-	jsonErr := json.Unmarshal(body, &endpoints)
-
-	if jsonErr != nil {
-		return jsonErr
-	}
-
-	server.Endpoints = endpoints
-
-	return nil
-}
-
-func (profile *ServerProfile) supportsWireguard() bool {
-	for _, proto := range profile.VPNProtoList {
-		if proto == "wireguard" {
-			return true
-		}
-	}
-	return false
-}
-
-func (server *Server) getCurrentProfile() (*ServerProfile, error) {
-	profile_id := server.Profiles.Current
-	for _, profile := range server.Profiles.Info.ProfileList {
-		if profile.ID == profile_id {
-			return &profile, nil
-		}
-	}
-	return nil, errors.New("no profile found for id")
-}
-
-func (server *Server) getConfigWithProfile() (string, error) {
-	if !GetVPNState().HasTransition(HAS_CONFIG) {
-		return "", errors.New("cannot get a config with a profile, invalid state")
-	}
-	profile, profileErr := server.getCurrentProfile()
-
-	if profileErr != nil {
-		return "", profileErr
-	}
-
-	if profile.supportsWireguard() {
-		return server.WireguardGetConfig()
-	}
-	return server.OpenVPNGetConfig()
-}
-
-func (server *Server) askForProfileID() error {
-	if !GetVPNState().HasTransition(ASK_PROFILE) {
-		return errors.New("cannot ask for a profile id, invalid state")
-	}
-	GetVPNState().GoTransitionWithData(ASK_PROFILE, server.ProfilesRaw)
-	return nil
-}
-
-func (server *Server) GetConfig() (string, error) {
-	if !GetVPNState().InState(REQUEST_CONFIG) {
-		return "", errors.New("cannot get a config, invalid state")
-	}
-	infoErr := server.APIInfo()
-
-	if infoErr != nil {
-		return "", infoErr
-	}
-
-	// Set the current profile if there is only one profile
-	if len(server.Profiles.Info.ProfileList) == 1 {
-		server.Profiles.Current = server.Profiles.Info.ProfileList[0].ID
-		return server.getConfigWithProfile()
-	}
-
-	profileErr := server.askForProfileID()
-
-	if profileErr != nil {
-		return "", nil
-	}
-
-	return server.getConfigWithProfile()
-}
-- 
cgit v1.2.3