mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-18 12:20:52 +08:00
refactor(cliproxy): remove unused access provider refresh logic
This commit is contained in:
@@ -167,7 +167,7 @@ func ApplyAccessProviders(manager *sdkaccess.Manager, oldCfg, newCfg *config.Con
|
|||||||
|
|
||||||
if len(added)+len(updated)+len(removed) > 0 {
|
if len(added)+len(updated)+len(removed) > 0 {
|
||||||
log.Debugf("auth providers reconciled (added=%d updated=%d removed=%d)", len(added), len(updated), len(removed))
|
log.Debugf("auth providers reconciled (added=%d updated=%d removed=%d)", len(added), len(updated), len(removed))
|
||||||
log.Debugf("auth provider changes details - added=%v updated=%v removed=%v", added, updated, removed)
|
log.Debugf("auth providers changes details - added=%v updated=%v removed=%v", added, updated, removed)
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Separator used to visually group related log lines.
|
// Separator used to visually group related log lines.
|
||||||
var credentialSeparator = strings.Repeat("-", 70)
|
var credentialSeparator = strings.Repeat("-", 67)
|
||||||
|
|
||||||
// LogSavingCredentials emits a consistent log message when persisting auth material.
|
// LogSavingCredentials emits a consistent log message when persisting auth material.
|
||||||
func LogSavingCredentials(path string) {
|
func LogSavingCredentials(path string) {
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/router-for-me/CLIProxyAPI/v6/internal/access"
|
|
||||||
"github.com/router-for-me/CLIProxyAPI/v6/internal/api"
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/api"
|
||||||
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
|
||||||
geminiwebclient "github.com/router-for-me/CLIProxyAPI/v6/internal/provider/gemini-web"
|
geminiwebclient "github.com/router-for-me/CLIProxyAPI/v6/internal/provider/gemini-web"
|
||||||
@@ -106,19 +105,6 @@ func newDefaultAuthManager() *sdkAuth.Manager {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) refreshAccessProviders(cfg *config.Config) {
|
|
||||||
if s == nil || s.accessManager == nil || cfg == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s.cfgMu.RLock()
|
|
||||||
oldCfg := s.cfg
|
|
||||||
s.cfgMu.RUnlock()
|
|
||||||
|
|
||||||
if _, err := access.ApplyAccessProviders(s.accessManager, oldCfg, cfg); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) ensureAuthUpdateQueue(ctx context.Context) {
|
func (s *Service) ensureAuthUpdateQueue(ctx context.Context) {
|
||||||
if s == nil {
|
if s == nil {
|
||||||
return
|
return
|
||||||
@@ -310,7 +296,6 @@ func (s *Service) Run(ctx context.Context) error {
|
|||||||
// legacy clients removed; no caches to refresh
|
// legacy clients removed; no caches to refresh
|
||||||
|
|
||||||
// handlers no longer depend on legacy clients; pass nil slice initially
|
// handlers no longer depend on legacy clients; pass nil slice initially
|
||||||
s.refreshAccessProviders(s.cfg)
|
|
||||||
s.server = api.NewServer(s.cfg, s.coreManager, s.accessManager, s.configPath, s.serverOptions...)
|
s.server = api.NewServer(s.cfg, s.coreManager, s.accessManager, s.configPath, s.serverOptions...)
|
||||||
|
|
||||||
if s.authManager == nil {
|
if s.authManager == nil {
|
||||||
@@ -347,7 +332,6 @@ func (s *Service) Run(ctx context.Context) error {
|
|||||||
if newCfg == nil {
|
if newCfg == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.refreshAccessProviders(newCfg)
|
|
||||||
if s.server != nil {
|
if s.server != nil {
|
||||||
s.server.UpdateClients(newCfg)
|
s.server.UpdateClients(newCfg)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user