diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/client.go | 16 | ||||
| -rw-r--r-- | client/client_test.go | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/client/client.go b/client/client.go index ae468ed..ed1f673 100644 --- a/client/client.go +++ b/client/client.go @@ -12,13 +12,13 @@ import ( "time" "codeberg.org/eduVPN/eduvpn-common/i18n/err" - "codeberg.org/eduVPN/eduvpn-common/internal/api" "codeberg.org/eduVPN/eduvpn-common/internal/config" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi" "codeberg.org/eduVPN/eduvpn-common/internal/failover" "codeberg.org/eduVPN/eduvpn-common/internal/fsm" - "codeberg.org/eduVPN/eduvpn-common/internal/http" - "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/httpwrap" + "codeberg.org/eduVPN/eduvpn-common/internal/loglevel" "codeberg.org/eduVPN/eduvpn-common/internal/server" "codeberg.org/eduVPN/eduvpn-common/types/cookie" srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" @@ -165,7 +165,7 @@ func New(name string, version string, directory string, stateCallback func(FSMSt // Initialize provided logger or use default if logger == nil { - logger = &log.Logger{} + logger = &loglevel.Logger{} } c.logr = logger slogger, err := c.logr.Init(directory) @@ -178,7 +178,7 @@ func New(name string, version string, directory string, stateCallback func(FSMSt c.Name = name // register HTTP agent - http.RegisterAgent(userAgentName(name), version) + httpwrap.RegisterAgent(userAgentName(name), version) // Initialize the FSM c.FSM = newFSM(stateCallback) @@ -398,7 +398,7 @@ func (c *Client) AddServer(ck *cookie.Cookie, identifier string, _type srvtypes. } if _type != srvtypes.TypeSecureInternet { // Convert to an identifier - identifier, err = http.EnsureValidURL(identifier, true) + identifier, err = httpwrap.EnsureValidURL(identifier, true) if err != nil { return i18nerr.WrapInternalf(err, "failed to convert identifier: %v", identifier) } @@ -432,7 +432,7 @@ func (c *Client) convertIdentifier(identifier string, t srvtypes.Type) (string, return identifier, nil } // Convert to an identifier, this also converts the scheme to HTTPS - identifier, err := http.EnsureValidURL(identifier, true) + identifier, err := httpwrap.EnsureValidURL(identifier, true) if err != nil { return "", i18nerr.Wrapf(err, "The input: '%s' is not a valid URL", identifier) } @@ -511,7 +511,7 @@ func (c *Client) GetConfig(ck *cookie.Cookie, identifier string, _type srvtypes. } if err != nil { if startup { - if errors.Is(err, api.ErrAuthorizeDisabled) { + if errors.Is(err, eduvpnapi.ErrAuthorizeDisabled) { return nil, i18nerr.Newf("The client tried to autoconnect to the VPN server: '%s', but you need to authorize again. Please manually connect again.", identifier) } return nil, i18nerr.Wrapf(err, "The client tried to autoconnect to the VPN server: '%s', but the operation failed to complete", identifier) diff --git a/client/client_test.go b/client/client_test.go index dd69688..6d34da3 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/httpwrap" "codeberg.org/eduVPN/eduvpn-common/internal/test" "codeberg.org/eduVPN/eduvpn-common/types/cookie" "codeberg.org/eduVPN/eduvpn-common/types/protocol" @@ -98,7 +98,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 := httpw.EnsureValidURL(serverURI, true) + serverURI, parseErr := httpwrap.EnsureValidURL(serverURI, true) if parseErr != nil { t.Skip("Skipping server test as the server uri is not valid") } |