diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/server/custom.go | 6 | ||||
| -rw-r--r-- | internal/server/institute.go | 6 | ||||
| -rw-r--r-- | internal/server/secureinternet.go | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/internal/server/custom.go b/internal/server/custom.go index d2679cf..a35cbab 100644 --- a/internal/server/custom.go +++ b/internal/server/custom.go @@ -5,6 +5,7 @@ import ( "github.com/eduvpn/eduvpn-common/internal/api" "github.com/eduvpn/eduvpn-common/internal/config/v2" + "github.com/eduvpn/eduvpn-common/internal/log" "github.com/eduvpn/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) @@ -35,7 +36,10 @@ func (s *Servers) AddCustom(ctx context.Context, id string, na bool) error { _, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil) if err != nil { // authorization has failed, remove the server again - s.config.RemoveServer(id, server.TypeCustom) + rerr := s.config.RemoveServer(id, server.TypeCustom) + if rerr != nil { + log.Logger.Warningf("could not remove custom server: '%s' after failing authorization: %v", id, rerr) + } return err } return nil diff --git a/internal/server/institute.go b/internal/server/institute.go index 195c2ef..7cb399f 100644 --- a/internal/server/institute.go +++ b/internal/server/institute.go @@ -6,6 +6,7 @@ import ( "github.com/eduvpn/eduvpn-common/internal/api" "github.com/eduvpn/eduvpn-common/internal/config/v2" "github.com/eduvpn/eduvpn-common/internal/discovery" + "github.com/eduvpn/eduvpn-common/internal/log" "github.com/eduvpn/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) @@ -43,7 +44,10 @@ func (s *Servers) AddInstitute(ctx context.Context, disco *discovery.Discovery, _, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil) if err != nil { // authorization has failed, remove the server again - s.config.RemoveServer(dsrv.BaseURL, server.TypeInstituteAccess) + rerr := s.config.RemoveServer(dsrv.BaseURL, server.TypeInstituteAccess) + if rerr != nil { + log.Logger.Warningf("could not remove institute access server: '%s' after failing authorization: %v", dsrv.BaseURL, rerr) + } return err } return nil diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go index 3377650..4b9c29e 100644 --- a/internal/server/secureinternet.go +++ b/internal/server/secureinternet.go @@ -7,6 +7,7 @@ import ( "github.com/eduvpn/eduvpn-common/internal/api" "github.com/eduvpn/eduvpn-common/internal/config/v2" "github.com/eduvpn/eduvpn-common/internal/discovery" + "github.com/eduvpn/eduvpn-common/internal/log" "github.com/eduvpn/eduvpn-common/internal/util" "github.com/eduvpn/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" @@ -54,7 +55,10 @@ func (s *Servers) AddSecure(ctx context.Context, disco *discovery.Discovery, org _, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil) if err != nil { // authorization has failed, remove the server again - s.config.RemoveServer(orgID, server.TypeSecureInternet) + rerr := s.config.RemoveServer(orgID, server.TypeSecureInternet) + if rerr != nil { + log.Logger.Warningf("could not remove secure internet server: '%s' after failing authorization: %v", orgID, rerr) + } return err } return nil |