From 3ac1d35257b56cca92ad0eb7f4d18abb366cf105 Mon Sep 17 00:00:00 2001
From: Aleksandar Pesic <peske.nis@gmail.com>
Date: Sun, 4 Dec 2022 21:48:20 +0100
Subject: simplify error handling

fixes #6

Signed-off-by: Aleksandar Pesic <peske.nis@gmail.com>
---
 internal/server/base.go | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'internal/server/base.go')

diff --git a/internal/server/base.go b/internal/server/base.go
index bb88eb3..81049cf 100644
--- a/internal/server/base.go
+++ b/internal/server/base.go
@@ -2,11 +2,9 @@ package server
 
 import (
 	"time"
-
-	"github.com/eduvpn/eduvpn-common/types"
 )
 
-// The base type for servers.
+// Base is the base type for servers.
 type Base struct {
 	URL            string            `json:"base_url"`
 	DisplayName    map[string]string `json:"display_name"`
@@ -18,28 +16,27 @@ type Base struct {
 	Type           string            `json:"server_type"`
 }
 
-func (base *Base) InitializeEndpoints() error {
-	errorMessage := "failed initializing endpoints"
-	endpoints, endpointsErr := APIGetEndpoints(base.URL)
-	if endpointsErr != nil {
-		return types.NewWrappedError(errorMessage, endpointsErr)
+func (b *Base) InitializeEndpoints() error {
+	ep, err := APIGetEndpoints(b.URL)
+	if err != nil {
+		return err
 	}
-	base.Endpoints = *endpoints
+	b.Endpoints = *ep
 	return nil
 }
 
-func (base *Base) ValidProfiles(clientSupportsWireguard bool) ProfileInfo {
-	var validProfiles []Profile
-	for _, profile := range base.Profiles.Info.ProfileList {
+func (b *Base) ValidProfiles(wireguardSupport bool) ProfileInfo {
+	var vps []Profile
+	for _, p := range b.Profiles.Info.ProfileList {
 		// Not a valid profile because it does not support openvpn
 		// Also the client does not support wireguard
-		if !profile.supportsOpenVPN() && !clientSupportsWireguard {
+		if !p.supportsOpenVPN() && !wireguardSupport {
 			continue
 		}
-		validProfiles = append(validProfiles, profile)
+		vps = append(vps, p)
 	}
 	return ProfileInfo{
-		Current: base.Profiles.Current,
-		Info:    ProfileListInfo{ProfileList: validProfiles},
+		Current: b.Profiles.Current,
+		Info:    ProfileListInfo{ProfileList: vps},
 	}
 }
-- 
cgit v1.2.3