From 3618f2337bf0099d1fe8e4782cda3677ea4175be Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 20 Mar 2023 13:59:06 +0100 Subject: Types: Split discovery into its own package --- internal/server/secureinternet.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/server/secureinternet.go') 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 -- cgit v1.2.3