From 9697ea01b79cde6c8901d7853dc0b414acf84fa7 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Wed, 6 Sep 2023 15:55:26 +0200 Subject: Server: Have separate implementations for refreshing endpoints --- internal/server/server.go | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'internal/server/server.go') diff --git a/internal/server/server.go b/internal/server/server.go index e8b046f..b6f3b30 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -31,6 +31,9 @@ type Server interface { // Public returns the representation that will be passed over the CGO barrier Public() (interface{}, error) + + // RefreshEndpoints refreshes the endpoints for the server + RefreshEndpoints(context.Context, *discovery.Discovery) error } // Name gets the name for the server and falls back to a default of "Unknown Server" @@ -227,28 +230,6 @@ func HasValidProfile(ctx context.Context, srv Server, wireguardSupport bool) (bo return true, nil } -func RefreshEndpoints(ctx context.Context, srv Server) error { - // Get the base struct - b, err := srv.Base() - if err != nil { - return err - } - - // update the base struct - err = api.Endpoints(ctx, b) - if err != nil { - return err - } - - // update OAuth - auth := srv.OAuth() - if auth != nil { - auth.BaseAuthorizationURL = b.Endpoints.API.V3.Authorization - auth.TokenURL = b.Endpoints.API.V3.Token - } - return nil -} - func Config(ctx context.Context, server Server, wireguardSupport bool, preferTCP bool) (*ConfigData, error) { p, err := CurrentProfile(server) if err != nil { -- cgit v1.2.3