diff --git a/backend/internal/pkg/antigravity/client.go b/backend/internal/pkg/antigravity/client.go index 880db797..fdd7fea1 100644 --- a/backend/internal/pkg/antigravity/client.go +++ b/backend/internal/pkg/antigravity/client.go @@ -767,7 +767,7 @@ func (r *SetUserSettingsResponse) IsSuccess() bool { return false } // userSettings 为 nil 或空 map 均视为成功 - if r.UserSettings == nil || len(r.UserSettings) == 0 { + if len(r.UserSettings) == 0 { return true } // 如果包含 telemetryEnabled 字段,说明未成功清除 diff --git a/backend/internal/service/admin_service.go b/backend/internal/service/admin_service.go index 3ac6a144..10f71bbc 100644 --- a/backend/internal/service/admin_service.go +++ b/backend/internal/service/admin_service.go @@ -2740,4 +2740,3 @@ func (s *adminServiceImpl) ForceAntigravityPrivacy(ctx context.Context, account applyAntigravityPrivacyMode(account, mode) return mode } - diff --git a/backend/internal/service/antigravity_oauth_service.go b/backend/internal/service/antigravity_oauth_service.go index e0caae4c..a300d898 100644 --- a/backend/internal/service/antigravity_oauth_service.go +++ b/backend/internal/service/antigravity_oauth_service.go @@ -322,7 +322,7 @@ func (s *AntigravityOAuthService) RefreshAccountToken(ctx context.Context, accou // loadCodeAssistResult 封装 loadProjectIDWithRetry 的返回结果, // 同时携带从 LoadCodeAssist 响应中提取的 plan_type 信息。 type loadCodeAssistResult struct { - ProjectID string + ProjectID string Subscription *AntigravitySubscriptionResult } diff --git a/backend/internal/service/antigravity_privacy_service_test.go b/backend/internal/service/antigravity_privacy_service_test.go index 11f05ab9..893500a6 100644 --- a/backend/internal/service/antigravity_privacy_service_test.go +++ b/backend/internal/service/antigravity_privacy_service_test.go @@ -2,7 +2,33 @@ package service -import "testing" +import ( + "testing" +) + +func applyAntigravitySubscriptionResult(account *Account, result AntigravitySubscriptionResult) (map[string]any, map[string]any) { + credentials := make(map[string]any) + for k, v := range account.Credentials { + credentials[k] = v + } + credentials["plan_type"] = result.PlanType + + extra := make(map[string]any) + for k, v := range account.Extra { + extra[k] = v + } + if result.SubscriptionStatus != "" { + extra["subscription_status"] = result.SubscriptionStatus + } else { + delete(extra, "subscription_status") + } + if result.SubscriptionError != "" { + extra["subscription_error"] = result.SubscriptionError + } else { + delete(extra, "subscription_error") + } + return credentials, extra +} func TestApplyAntigravityPrivacyMode_SetsInMemoryExtra(t *testing.T) { account := &Account{} diff --git a/backend/internal/service/antigravity_subscription_service.go b/backend/internal/service/antigravity_subscription_service.go index 46904427..04559be8 100644 --- a/backend/internal/service/antigravity_subscription_service.go +++ b/backend/internal/service/antigravity_subscription_service.go @@ -36,27 +36,3 @@ func NormalizeAntigravitySubscription(resp *antigravity.LoadCodeAssistResponse) PlanType: antigravity.TierIDToPlanType(tierID), } } - -func applyAntigravitySubscriptionResult(account *Account, result AntigravitySubscriptionResult) (map[string]any, map[string]any) { - credentials := make(map[string]any) - for k, v := range account.Credentials { - credentials[k] = v - } - credentials["plan_type"] = result.PlanType - - extra := make(map[string]any) - for k, v := range account.Extra { - extra[k] = v - } - if result.SubscriptionStatus != "" { - extra["subscription_status"] = result.SubscriptionStatus - } else { - delete(extra, "subscription_status") - } - if result.SubscriptionError != "" { - extra["subscription_error"] = result.SubscriptionError - } else { - delete(extra, "subscription_error") - } - return credentials, extra -} diff --git a/backend/internal/service/token_refresh_service.go b/backend/internal/service/token_refresh_service.go index f3d7ce58..ac14aa56 100644 --- a/backend/internal/service/token_refresh_service.go +++ b/backend/internal/service/token_refresh_service.go @@ -526,4 +526,3 @@ func (s *TokenRefreshService) ensureAntigravityPrivacy(ctx context.Context, acco ) } } -