From 75ac9ee246e7d3be5890b972a241855da875f4b0 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Thu, 16 Feb 2023 15:44:08 +0100 Subject: HTTP: Incorporate util ensure valid url with clean path --- client/client_test.go | 3 +-- client/server.go | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'client') diff --git a/client/client_test.go b/client/client_test.go index 4356736..5a5a39e 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -13,7 +13,6 @@ import ( httpw "github.com/eduvpn/eduvpn-common/internal/http" "github.com/eduvpn/eduvpn-common/internal/oauth" - "github.com/eduvpn/eduvpn-common/internal/util" "github.com/go-errors/errors" ) @@ -22,7 +21,7 @@ func getServerURI(t *testing.T) string { if serverURI == "" { t.Skip("Skipping server test as no SERVER_URI env var has been passed") } - serverURI, parseErr := util.EnsureValidURL(serverURI) + serverURI, parseErr := httpw.EnsureValidURL(serverURI) if parseErr != nil { t.Skip("Skipping server test as the server uri is not valid") } diff --git a/client/server.go b/client/server.go index 4070705..64f1d25 100644 --- a/client/server.go +++ b/client/server.go @@ -2,9 +2,9 @@ package client import ( "github.com/eduvpn/eduvpn-common/internal/failover" + "github.com/eduvpn/eduvpn-common/internal/http" "github.com/eduvpn/eduvpn-common/internal/oauth" "github.com/eduvpn/eduvpn-common/internal/server" - "github.com/eduvpn/eduvpn-common/internal/util" "github.com/eduvpn/eduvpn-common/types" "github.com/go-errors/errors" ) @@ -331,7 +331,7 @@ func (c *Client) AddCustomServer(url string) (srv server.Server, err error) { } }() - if url, err = util.EnsureValidURL(url); err != nil { + if url, err = http.EnsureValidURL(url); err != nil { return nil, err } @@ -457,7 +457,7 @@ func (c *Client) GetConfigCustomServer(url string, preferTCP bool, t oauth.Token } }() - if url, err = util.EnsureValidURL(url); err != nil { + if url, err = http.EnsureValidURL(url); err != nil { return nil, err } -- cgit v1.2.3