summaryrefslogtreecommitdiff
path: root/internal/server/secureinternet.go
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2023-03-20 13:59:06 +0100
committerJeroen Wijenbergh <46386452+jwijenbergh@users.noreply.github.com>2023-09-25 09:43:37 +0200
commit3618f2337bf0099d1fe8e4782cda3677ea4175be (patch)
tree638fa68f28c20178a729ef991e470d8d8aa9ee64 /internal/server/secureinternet.go
parent8ccb4486cdb03cd3b10606b4bd77b7bcb4107e6d (diff)
Types: Split discovery into its own package
Diffstat (limited to 'internal/server/secureinternet.go')
-rw-r--r--internal/server/secureinternet.go6
1 files changed, 3 insertions, 3 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