zfc/sub2api
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(service): handle unexpected default transport type, simplify warning append

Browse Source
This commit is contained in:
ZeroDeng 2026-05-11 11:43:44 +08:00
parent 2a17c0b229
commit f788e6bdba
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/internal/handler/admin/account_codex_import.go
View File

@ -211,9 +211,7 @@ func (h *AccountHandler) importCodexSessions(ctx context.Context, req CodexSessi
}) })
continue continue
} }
for _, warning := range expiryWarnings { item.WarningTexts = append(item.WarningTexts, expiryWarnings...)
item.WarningTexts = append(item.WarningTexts, warning)
}
if credentialExpiresAt != nil { if credentialExpiresAt != nil {
item.Credentials["expires_at"] = credentialExpiresAt.Format(time.RFC3339) item.Credentials["expires_at"] = credentialExpiresAt.Format(time.RFC3339)
} }
@ -565,7 +563,7 @@ func normalizeCodexImportEntry(entry codexImportEntry) (*codexImportAccount, err
} }
if item.IDToken != "" { if item.IDToken != "" {
item.Credentials["id_token"] = item.IDToken item.Credentials["id_token"] = item.IDToken
enrichCodexImportAccountFromJWT(item, item.IDToken, false, now) _ = enrichCodexImportAccountFromJWT(item, item.IDToken, false, now)
} }
if err := enrichCodexImportAccountFromJWT(item, item.AccessToken, true, now); err != nil { if err := enrichCodexImportAccountFromJWT(item, item.AccessToken, true, now); err != nil {
return nil, err return nil, err

6
backend/internal/service/vertex_service_account.go
View File

@ -202,7 +202,11 @@ func newVertexServiceAccountHTTPClient(proxyURL string) (*http.Client, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
transport := http.DefaultTransport.(*http.Transport).Clone() defaultTransport, ok := http.DefaultTransport.(*http.Transport)
if !ok {
return nil, fmt.Errorf("unexpected default transport type %T", http.DefaultTransport)
}
transport := defaultTransport.Clone()
transport.Proxy = nil transport.Proxy = nil
if err := proxyutil.ConfigureTransportProxy(transport, parsedProxy); err != nil { if err := proxyutil.ConfigureTransportProxy(transport, parsedProxy); err != nil {
return nil, err return nil, err