Skip to content

fix(oauth): fall back to system proxy when OAuth session has no proxy_url #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeliciousBuding wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −3
Open

fix(oauth): fall back to system proxy when OAuth session has no proxy_url #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions admin/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ func (h *Handler) ExchangeOAuthCode(c *gin.Context) {
if trimmed := strings.TrimSpace(req.ProxyURL); trimmed != "" {
proxyURL = trimmed
}
if proxyURL == "" {
proxyURL = h.store.GetProxyURL()
}

// Resin 临时身份用于 OAuth 兑换（新账号尚无 DBID）
resinTempID := "oauth-" + req.SessionID
Expand Down Expand Up @@ -391,8 +394,12 @@ func (h *Handler) OAuthCallback(c *gin.Context) {
sess.CallbackAt = time.Now()

// 执行 code exchange（Resin 临时身份）
proxyURL := sess.ProxyURL
if proxyURL == "" {
proxyURL = h.store.GetProxyURL()
}
resinTempID := "oauth-" + sessionID
tokenResp, accountInfo, err := doOAuthCodeExchange(c.Request.Context(), code, sess.CodeVerifier, sess.RedirectURI, sess.ProxyURL, resinTempID)
tokenResp, accountInfo, err := doOAuthCodeExchange(c.Request.Context(), code, sess.CodeVerifier, sess.RedirectURI, proxyURL, resinTempID)
if err != nil {
sess.ExchangeResult = &oauthExchangeResult{
Success: false,
Expand Down Expand Up @@ -429,7 +436,7 @@ func (h *Handler) OAuthCallback(c *gin.Context) {
ctx, cancel := context.WithTimeout(c.Request.Context(), 30*time.Second)
defer cancel()

id, err := h.db.InsertAccount(ctx, name, tokenResp.RefreshToken, sess.ProxyURL)
id, err := h.db.InsertAccount(ctx, name, tokenResp.RefreshToken, proxyURL)
if err != nil {
sess.ExchangeResult = &oauthExchangeResult{
Success: false,
Expand All @@ -453,7 +460,7 @@ func (h *Handler) OAuthCallback(c *gin.Context) {
go proxy.InheritLease(resinTempID, fmt.Sprintf("%d", id))
}

newAcc := accountFromCredentialSeed(id, sess.ProxyURL, seed)
newAcc := accountFromCredentialSeed(id, proxyURL, seed)
h.store.AddAccount(newAcc)

email := ""
Expand Down
Loading