github/sub2api
4
0 Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-11-08 08:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: align grok oauth exchange with xai

Browse Source
This commit is contained in:
Heatherm Huang committed 2026-06-26 10:36:09 +08:00
1 parent 39be1ec97f
commit b3a07aeae7
6 files changed
+9 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backend/internal/repository/grok_oauth_client.go
+1 -3
View File
@@ -21,7 +21,7 @@ func NewGrokOAuthClient() service.GrokOAuthClient {
return &grokOAuthClient{tokenURL: xai.EffectiveTokenURL()}
}
func (c *grokOAuthClient) ExchangeCode(ctx context.Context, code, codeVerifier, codeChallenge, redirectURI, proxyURL, clientID string) (*xai.TokenResponse, error) {
func (c *grokOAuthClient) ExchangeCode(ctx context.Context, code, codeVerifier, redirectURI, proxyURL, clientID string) (*xai.TokenResponse, error) {
client, err := createGrokReqClient(proxyURL)
if err != nil {
return nil, infraerrors.Newf(http.StatusBadGateway, "GROK_OAUTH_CLIENT_INIT_FAILED", "create HTTP client: %v", err)
@@ -38,8 +38,6 @@ func (c *grokOAuthClient) ExchangeCode(ctx context.Context, code, codeVerifier,
formData.Set("code", code)
formData.Set("redirect_uri", xai.EffectiveRedirectURI(redirectURI))
formData.Set("code_verifier", codeVerifier)
formData.Set("code_challenge", codeChallenge)
formData.Set("code_challenge_method", "S256")
var tokenResp xai.TokenResponse
resp, err := client.R().
backend/internal/repository/grok_oauth_client_test.go
+2 -3
View File
@@ -25,8 +25,8 @@ func TestGrokOAuthClientExchangeAndRefreshUseFormFields(t *testing.T) {
require.Equal(t, "auth-code", r.Form.Get("code"))
require.Equal(t, "http://127.0.0.1:56121/callback", r.Form.Get("redirect_uri"))
require.Equal(t, "verifier", r.Form.Get("code_verifier"))
require.Equal(t, "challenge", r.Form.Get("code_challenge"))
require.Equal(t, "S256", r.Form.Get("code_challenge_method"))
require.Empty(t, r.Form.Get("code_challenge"))
require.Empty(t, r.Form.Get("code_challenge_method"))
_ = json.NewEncoder(w).Encode(map[string]any{
"access_token": "exchange-access",
"refresh_token": "exchange-refresh",
@@ -55,7 +55,6 @@ func TestGrokOAuthClientExchangeAndRefreshUseFormFields(t *testing.T) {
context.Background(),
"auth-code",
"verifier",
"challenge",
"http://127.0.0.1:56121/callback",
"",
"client-id",