From 492b74f2d20697816acc5e60d79f858a1360fb63 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 28 Aug 2023 14:18:42 +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 | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'internal/server/server.go')

diff --git a/internal/server/server.go b/internal/server/server.go
index c971c72..e8b046f 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -17,6 +17,7 @@ import (
 )
 
 type Server interface {
+	// OAuth returns the struct used for OAuth
 	OAuth() *oauth.OAuth
 
 	// TemplateAuth returns the authorization URL template function
@@ -227,14 +228,25 @@ func HasValidProfile(ctx context.Context, srv Server, wireguardSupport bool) (bo
 }
 
 func RefreshEndpoints(ctx context.Context, srv Server) error {
-	// Re-initialize the endpoints
-	// TODO: Make this a warning instead?
+	// Get the base struct
 	b, err := srv.Base()
 	if err != nil {
 		return err
 	}
 
-	return api.Endpoints(ctx, b)
+	// 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) {
-- 
cgit v1.2.3