libs/auth/storage: use CLI's FileTokenCache in ResolveCache

The file factory was calling the SDK's cache.NewFileTokenCache(), which
is being phased out in favor of the CLI's own storage.NewFileTokenCache(ctx)
imported in #5056. Route ResolveCache through it so that legacy and
plaintext modes share a single file cache implementation owned by the CLI.

Co-authored-by: Isaac

Author: simonfaltum

libs/auth/storage/cache.go

@@ -11,17 +11,14 @@ import (
 // so unit tests can inject stubs without hitting the real OS keyring or
 // filesystem. Production code uses defaultCacheFactories().
 type cacheFactories struct {
-	newFile    func() (cache.TokenCache, error)
+	newFile    func(context.Context) (cache.TokenCache, error)
 	newKeyring func() cache.TokenCache
 }
 
 // defaultCacheFactories returns the production factory set.
-// newFile is wrapped in a closure because cache.NewFileTokenCache is variadic
-// (func(...FileTokenCacheOption)) and cannot satisfy the non-variadic field type
-// by direct reference. The closure calls it with no options (SDK defaults).
 func defaultCacheFactories() cacheFactories {
 	return cacheFactories{
-		newFile:    func() (cache.TokenCache, error) { return cache.NewFileTokenCache() },
+		newFile:    func(ctx context.Context) (cache.TokenCache, error) { return NewFileTokenCache(ctx) },
 		newKeyring: NewKeyringCache,
 	}
 }
@@ -53,7 +50,7 @@ func resolveCacheWith(ctx context.Context, override StorageMode, f cacheFactorie
 	case StorageModeLegacy, StorageModePlaintext:
 		// Plaintext currently maps to the file cache; a dedicated
 		// plaintext backend (no host-keyed dual-writes) is a follow-up.
-		c, err := f.newFile()
+		c, err := f.newFile(ctx)
 		if err != nil {
 			return nil, "", fmt.Errorf("open file token cache: %w", err)
 		}

libs/auth/storage/cache_test.go

@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"context"
 	"errors"
 	"path/filepath"
 	"testing"
@@ -22,7 +23,7 @@ func (stubCache) Lookup(string) (*oauth2.Token, error) { return nil, cache.ErrNo
 func fakeFactories(t *testing.T) cacheFactories {
 	t.Helper()
 	return cacheFactories{
-		newFile:    func() (cache.TokenCache, error) { return stubCache{source: "file"}, nil },
+		newFile:    func(context.Context) (cache.TokenCache, error) { return stubCache{source: "file"}, nil },
 		newKeyring: func() cache.TokenCache { return stubCache{source: "keyring"} },
 	}
 }
@@ -104,7 +105,7 @@ func TestResolveCache_FileFactoryErrorPropagates(t *testing.T) {
 	ctx := t.Context()
 	boom := errors.New("disk full")
 	factories := cacheFactories{
-		newFile:    func() (cache.TokenCache, error) { return nil, boom },
+		newFile:    func(context.Context) (cache.TokenCache, error) { return nil, boom },
 		newKeyring: func() cache.TokenCache { return stubCache{source: "keyring"} },
 	}