Types: Split discovery into its own package

2 files changed, 10 insertions, 10 deletions

diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go
index 3c40253..4b42303 100644
--- a/internal/server/secureinternet.go
+++ b/internal/server/secureinternet.go
@@ -4,7 +4,7 @@ import (
 	"github.com/eduvpn/eduvpn-common/internal/discovery"
 	"github.com/eduvpn/eduvpn-common/internal/oauth"
 	"github.com/eduvpn/eduvpn-common/internal/util"
-	"github.com/eduvpn/eduvpn-common/types"
+	discotypes "github.com/eduvpn/eduvpn-common/types/discovery"
 	"github.com/go-errors/errors"
 )
 
@@ -82,7 +82,7 @@ func (ss *Servers) HasSecureLocation() bool {
 	return ss.SecureInternetHomeServer.CurrentLocation != ""
 }
 
-func (s *SecureInternetHomeServer) addLocation(locSrv *types.DiscoveryServer) (*Base, error) {
+func (s *SecureInternetHomeServer) addLocation(locSrv *discotypes.Server) (*Base, error) {
 	// Initialize the base map if it is non-nil
 	if s.BaseMap == nil {
 		s.BaseMap = make(map[string]*Base)
@@ -109,7 +109,7 @@ func (s *SecureInternetHomeServer) addLocation(locSrv *types.DiscoveryServer) (*
 
 // Initializes the home server and adds its own location.
 func (s *SecureInternetHomeServer) init(
-	homeOrg *types.DiscoveryOrganization, homeLoc *types.DiscoveryServer,
+	homeOrg *discotypes.Organization, homeLoc *discotypes.Server,
 ) error {
 	if s.HomeOrganizationID != homeOrg.OrgID {
 		// New home organisation, clear everything
diff --git a/internal/server/servers.go b/internal/server/servers.go
index 9a9e413..60c993d 100644
--- a/internal/server/servers.go
+++ b/internal/server/servers.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/eduvpn/eduvpn-common/types"
+	discotypes "github.com/eduvpn/eduvpn-common/types/discovery"
 	"github.com/go-errors/errors"
 )
 
@@ -20,8 +20,8 @@ func (ss *Servers) HasSecureInternet() bool {
 }
 
 func (ss *Servers) AddSecureInternet(
-	secureOrg *types.DiscoveryOrganization,
-	secureServer *types.DiscoveryServer,
+	secureOrg *discotypes.Organization,
+	secureServer *discotypes.Server,
 ) (Server, error) {
 	// If we have specified an organization ID
 	// We also need to get an authorization template
@@ -60,7 +60,7 @@ func (ss *Servers) GetCurrentServer() (Server, error) {
 }
 
 func (ss *Servers) addInstituteAndCustom(
-	discoServer *types.DiscoveryServer,
+	discoServer *discotypes.Server,
 	isCustom bool,
 ) (Server, error) {
 	URL := discoServer.BaseURL
@@ -92,13 +92,13 @@ func (ss *Servers) addInstituteAndCustom(
 }
 
 func (ss *Servers) AddInstituteAccessServer(
-	instituteServer *types.DiscoveryServer,
+	instituteServer *discotypes.Server,
 ) (Server, error) {
 	return ss.addInstituteAndCustom(instituteServer, false)
 }
 
 func (ss *Servers) AddCustomServer(
-	customServer *types.DiscoveryServer,
+	customServer *discotypes.Server,
 ) (Server, error) {
 	return ss.addInstituteAndCustom(customServer, true)
 }
@@ -108,7 +108,7 @@ func (ss *Servers) GetSecureLocation() string {
 }
 
 func (ss *Servers) SetSecureLocation(
-	chosenLocationServer *types.DiscoveryServer,
+	chosenLocationServer *discotypes.Server,
 ) error {
 	// Make sure to add the current location