From 88bcf43c9d47abf836c2be7a1b523d103b2a2433 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 29 Aug 2023 16:22:53 +0200 Subject: Server: Set OAuth endpoints on refresh This fixes OAuth endpoints after e.g. an update from 2.x to 3.x --- internal/server/server.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'internal') diff --git a/internal/server/server.go b/internal/server/server.go index 95c249e..f62b882 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -253,13 +253,23 @@ func HasValidProfile(srv Server, wireguardSupport bool) (bool, error) { func RefreshEndpoints(srv Server) error { // Re-initialize the endpoints - // TODO: Make this a warning instead? b, err := srv.Base() if err != nil { return err } - return b.InitializeEndpoints() + err = b.InitializeEndpoints() + 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(server Server, wireguardSupport bool, preferTCP bool) (*ConfigData, error) { -- cgit v1.2.3