From c67b8f64438d439d52a9e4955ff1bdf30363dbb1 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Thu, 7 Jul 2022 16:18:03 +0200 Subject: Secure Internet: Implement the Ask Location transition callback --- internal/discovery/discovery.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'internal/discovery') diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go index 2331491..b4163a8 100644 --- a/internal/discovery/discovery.go +++ b/internal/discovery/discovery.go @@ -73,14 +73,21 @@ func (discovery *Discovery) DetermineOrganizationsUpdate() bool { return discovery.Organizations.Timestamp == 0 } -func (discovery *Discovery) GetSecureLocationList() []string { +func (discovery *Discovery) GetSecureLocationList() (string, error) { var locations []string for _, server := range discovery.Servers.List { if server.Type == "secure_internet" { locations = append(locations, server.CountryCode) } } - return locations + + jsonBytes, jsonErr := json.Marshal(locations) + + if jsonErr != nil { + return "", &types.WrappedErrorMessage{Message: "failed getting Secure Internet locations list", Err: jsonErr} + } + + return string(jsonBytes), nil } func (discovery *Discovery) GetServerByURL(url string, _type string) (*types.DiscoveryServer, error) { -- cgit v1.2.3