opensource/sub2api
3
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-09-24 16:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: align grok oauth exchange with xai

Browse Source
This commit is contained in:
Heatherm Huang
2026-06-26 10:36:09 +08:00
parent 39be1ec97f
commit b3a07aeae7
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/pkg/xai/oauth.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
)
const (
OAuthIssuer = "https://auth.x.ai"
OAuthIssuer = "https://accounts.x.ai"
DiscoveryURL = OAuthIssuer + "/.well-known/openid-configuration"
DefaultAuthorizeURL = OAuthIssuer + "/oauth2/authorize"
DefaultTokenURL = OAuthIssuer + "/oauth2/token"
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",
backend/internal/service/grok_oauth_service.go
+1 -1
View File
@@ -135,7 +135,7 @@ func (s *GrokOAuthService) ExchangeCode(ctx context.Context, input *GrokExchange
redirectURI = input.RedirectURI
}
tokenResp, err := s.oauthClient.ExchangeCode(ctx, code, session.CodeVerifier, session.CodeChallenge, redirectURI, proxyURL, session.ClientID)
tokenResp, err := s.oauthClient.ExchangeCode(ctx, code, session.CodeVerifier, redirectURI, proxyURL, session.ClientID)
if err != nil {
return nil, err
}
backend/internal/service/oauth_service.go
+1 -1
View File
@@ -20,7 +20,7 @@ type OpenAIOAuthClient interface {
// GrokOAuthClient interface for xAI/Grok OAuth operations.
type GrokOAuthClient interface {
ExchangeCode(ctx context.Context, code, codeVerifier, codeChallenge, redirectURI, proxyURL, clientID string) (*xai.TokenResponse, error)
ExchangeCode(ctx context.Context, code, codeVerifier, redirectURI, proxyURL, clientID string) (*xai.TokenResponse, error)
RefreshToken(ctx context.Context, refreshToken, proxyURL, clientID string) (*xai.TokenResponse, error)
}
backend/internal/service/openai_gateway_grok.go
+3 -1
View File
@@ -5,6 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"strings"
"time"
@@ -60,9 +61,11 @@ func (s *OpenAIGatewayService) forwardGrokResponses(
if err != nil {
return nil, s.handleOpenAIUpstreamTransportError(ctx, c, account, err, false)
}
defer func() { _ = resp.Body.Close() }()
if resp.StatusCode >= 400 {
respBody := s.readUpstreamErrorBody(resp)
resp.Body = io.NopCloser(bytes.NewReader(respBody))
s.updateGrokUsageSnapshot(ctx, account.ID, xai.ParseQuotaHeaders(resp.Header, resp.StatusCode))
upstreamMsg := sanitizeUpstreamErrorMessage(extractUpstreamErrorMessage(respBody))
if upstreamMsg == "" {
@@ -87,7 +90,6 @@ func (s *OpenAIGatewayService) forwardGrokResponses(
}
return s.handleErrorResponse(ctx, resp, c, account, patchedBody, upstreamModel)
}
defer func() { _ = resp.Body.Close() }()
s.updateGrokUsageSnapshot(ctx, account.ID, xai.ParseQuotaHeaders(resp.Header, resp.StatusCode))