oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat: enhance JWT exchange process with proxy support. (close #1087)

Browse Source
This commit is contained in:
CaIon
2025-07-01 13:14:24 +08:00
parent eb265a55e1
commit 53e3b35437
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
relay/channel/vertex/service_account.go
View File

@@ -11,6 +11,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
relaycommon "one-api/relay/common" relaycommon "one-api/relay/common"
"one-api/service"
"strings" "strings"
"fmt" "fmt"
@@ -45,7 +46,7 @@ func getAccessToken(a *Adaptor, info *relaycommon.RelayInfo) (string, error) {
if err != nil { if err != nil {
return "", fmt.Errorf("failed to create signed JWT: %w", err) return "", fmt.Errorf("failed to create signed JWT: %w", err)
} }
newToken, err := exchangeJwtForAccessToken(signedJWT) newToken, err := exchangeJwtForAccessToken(signedJWT, info)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to exchange JWT for access token: %w", err) return "", fmt.Errorf("failed to exchange JWT for access token: %w", err)
} }
@@ -96,14 +97,25 @@ func createSignedJWT(email, privateKeyPEM string) (string, error) {
return signedToken, nil return signedToken, nil
} }
func exchangeJwtForAccessToken(signedJWT string) (string, error) { func exchangeJwtForAccessToken(signedJWT string, info *relaycommon.RelayInfo) (string, error) {
authURL := "https://www.googleapis.com/oauth2/v4/token" authURL := "https://www.googleapis.com/oauth2/v4/token"
data := url.Values{} data := url.Values{}
data.Set("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer") data.Set("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer")
data.Set("assertion", signedJWT) data.Set("assertion", signedJWT)
resp, err := http.PostForm(authURL, data) var client *http.Client
var err error
if proxyURL, ok := info.ChannelSetting["proxy"]; ok {
client, err = service.NewProxyHttpClient(proxyURL.(string))
if err != nil {
return "", fmt.Errorf("new proxy http client failed: %w", err)
}
} else {
client = service.GetHttpClient()
}
resp, err := client.PostForm(authURL, data)
if err != nil { if err != nil {
return "", err return "", err
} }