From a89808ecae38969c6452bdd586b531d6b4d87551 Mon Sep 17 00:00:00 2001
From: Bethuel <bethuelmbaga12@gmail.com>
Date: Fri, 14 Apr 2023 12:17:28 +0300
Subject: [PATCH] initialize jwt validator with keys rotation state

---
 management/cmd/management.go    | 2 ++
 management/server/grpcserver.go | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/management/cmd/management.go b/management/cmd/management.go
index d956fcff5..d740423d7 100644
--- a/management/cmd/management.go
+++ b/management/cmd/management.go
@@ -80,6 +80,7 @@ var (
 			if err != nil {
 				return fmt.Errorf("failed reading provided config file: %s: %v", mgmtConfig, err)
 			}
+			config.HttpConfig.KeyRotationEnabled = UseKeyCacheHeaders
 
 			tlsEnabled := false
 			if mgmtLetsencryptDomain != "" || (config.HttpConfig.CertFile != "" && config.HttpConfig.CertKey != "") {
@@ -186,6 +187,7 @@ var (
 				config.HttpConfig.AuthIssuer,
 				config.GetAuthAudiences(),
 				config.HttpConfig.AuthKeysLocation,
+				config.HttpConfig.KeyRotationEnabled,
 			)
 			if err != nil {
 				return fmt.Errorf("failed creating JWT validator: %v", err)
diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go
index f63a55d65..a93a03353 100644
--- a/management/server/grpcserver.go
+++ b/management/server/grpcserver.go
@@ -52,7 +52,9 @@ func NewServer(config *Config, accountManager AccountManager, peersUpdateManager
 		jwtValidator, err = jwtclaims.NewJWTValidator(
 			config.HttpConfig.AuthIssuer,
 			config.GetAuthAudiences(),
-			config.HttpConfig.AuthKeysLocation)
+			config.HttpConfig.AuthKeysLocation,
+			config.HttpConfig.KeyRotationEnabled,
+		)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "unable to create new jwt middleware, err: %v", err)
 		}