refactor: change resync commands creation

Author: adilsitos

packages/cmd/proxy.go

@@ -489,7 +489,7 @@ func startProxyServer(cmd *cobra.Command, args []string) {
 	resyncCtx, resyncCancel := context.WithCancel(context.Background())
 	defer resyncCancel()
 
-	go proxy.StartBackgroundLoops(resyncCtx, cache, domainURL, httpClient, evictionStrategy, accessTokenCheckInterval, staticSecretsRefreshInterval, useSSE)
+	proxy.StartBackgroundLoops(resyncCtx, cache, domainURL, httpClient, evictionStrategy, accessTokenCheckInterval, staticSecretsRefreshInterval, useSSE)
 
 	// Handle graceful shutdown
 	sigCh := make(chan os.Signal, 1)

packages/proxy/resync.go

@@ -289,38 +289,47 @@ func runStaticSecretsRefresh(cache *Cache, domainURL *url.URL, httpClient *http.
 		Msg("Static secrets refresh completed")
 }
 
-// StartBackgroundLoops starts the background loops for token validation and secrets refresh.
-// When sseEnabled is true, the static secrets refresh loop is disabled (SSE handles cache invalidation).
-func StartBackgroundLoops(ctx context.Context, cache *Cache, domainURL *url.URL, httpClient *http.Client, evictionStrategy string, accessTokenCheckInterval time.Duration, staticSecretsRefreshInterval time.Duration, sseEnabled bool) {
+func startAccessTokenValidation(ctx context.Context, cache *Cache, domainURL *url.URL, httpClient *http.Client, accessTokenCheckInterval time.Duration) {
 	tokenTicker := time.NewTicker(accessTokenCheckInterval)
 	defer tokenTicker.Stop()
 
-	var secretsTickerC <-chan time.Time
-	if !sseEnabled {
-		secretsTicker := time.NewTicker(staticSecretsRefreshInterval)
-		defer secretsTicker.Stop()
-		secretsTickerC = secretsTicker.C
-	} else {
-		secretsTickerC = make(chan time.Time)
-		log.Info().Msg("Static secrets refresh disabled (SSE mode active)")
+	for {
+		select {
+		case <-tokenTicker.C:
+			runAccessTokenValidation(cache, domainURL, httpClient)
+		case <-ctx.Done():
+			return
+		}
 	}
+}
 
-	log.Info().
-		Str("evictionStrategy", evictionStrategy).
-		Str("accessTokenCheckInterval", accessTokenCheckInterval.String()).
-		Str("staticSecretsRefreshInterval", staticSecretsRefreshInterval.String()).
-		Bool("sseEnabled", sseEnabled).
-		Msg("Background loops started")
+func startStaticSecretsRefresh(ctx context.Context, cache *Cache, domainURL *url.URL, httpClient *http.Client, staticSecretsRefreshInterval time.Duration) {
+	secretsTicker := time.NewTicker(staticSecretsRefreshInterval)
+	defer secretsTicker.Stop()
 
 	for {
 		select {
-		case <-tokenTicker.C:
-			runAccessTokenValidation(cache, domainURL, httpClient)
-		case <-secretsTickerC:
+		case <-secretsTicker.C:
 			runStaticSecretsRefresh(cache, domainURL, httpClient, staticSecretsRefreshInterval)
 		case <-ctx.Done():
-			log.Info().Msg("Background loops stopped")
 			return
 		}
 	}
 }
+
+// StartBackgroundLoops starts the background loops for token validation and secrets refresh.
+// When sseEnabled is true, the static secrets refresh loop is disabled (SSE handles cache invalidation).
+func StartBackgroundLoops(ctx context.Context, cache *Cache, domainURL *url.URL, httpClient *http.Client, evictionStrategy string, accessTokenCheckInterval time.Duration, staticSecretsRefreshInterval time.Duration, sseEnabled bool) {
+	log.Info().
+		Str("evictionStrategy", evictionStrategy).
+		Str("accessTokenCheckInterval", accessTokenCheckInterval.String()).
+		Str("staticSecretsRefreshInterval", staticSecretsRefreshInterval.String()).
+		Bool("sseEnabled", sseEnabled).
+		Msg("Background loops started")
+
+	if sseEnabled {
+		go startAccessTokenValidation(ctx, cache, domainURL, httpClient, accessTokenCheckInterval)
+	}
+	go startStaticSecretsRefresh(ctx, cache, domainURL, httpClient, staticSecretsRefreshInterval)
+
+}

packages/proxy/sse.go

@@ -96,7 +96,10 @@ func NewSSEAuthState(clientId, clientSecret string, domainURL *url.URL, httpClie
 	}
 
 	// ensure we have a valid token
-	authState.RefreshToken()
+	_, err := authState.RefreshToken()
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to refresh SSE auth token")
+	}
 
 	return authState
 }
@@ -187,6 +190,7 @@ type SSEManager struct {
 }
 
 func NewSSEManager(ctx context.Context, cache *Cache, domainURL *url.URL, httpClient *http.Client, resyncHttpClient *http.Client, authState *SSEAuthState) *SSEManager {
+
 	return &SSEManager{
 		connections:      make(map[string]*SSEConnection),
 		cache:            cache,