opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1185 from trheyi/main

Browse source 
Refactor MFA handling in login process
This commit is contained in:
Max 2025-10-10 14:52:26 +08:00 • committed by GitHub
commit 259b5f5aec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
openapi/user/login.go
View file

@ -164,17 +164,17 @@ func LoginByUserID(userid string, ip string) (*LoginResponse, error) {
// Sign temporary access token for MFA // Sign temporary access token for MFA
var mfaExpire int = 10 * 60 // 10 minutes var mfaExpire int = 10 * 60 // 10 minutes
mfaToken, err := oauth.OAuth.MakeAccessToken(yaoClientConfig.ClientID, ScopeMFAVerification, userid, mfaExpire) accessToken, err := oauth.OAuth.MakeAccessToken(yaoClientConfig.ClientID, ScopeMFAVerification, userid, mfaExpire)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &LoginResponse{ return &LoginResponse{
UserID: userid, UserID: userid,
MFAToken: mfaToken, AccessToken: accessToken,
MFATokenExpiresIn: mfaExpire, ExpiresIn: mfaExpire,
MFAEnabled: mfaEnabled, MFAEnabled: mfaEnabled,
Status: LoginStatusMFA, Status: LoginStatusMFA,
}, nil }, nil
} }
@ -259,7 +259,8 @@ func SendLoginCookies(c *gin.Context, loginResponse *LoginResponse, sessionID st
// MFA Temporary Access Token // MFA Temporary Access Token
if loginResponse.Status == LoginStatusMFA { if loginResponse.Status == LoginStatusMFA {
mfaToken := fmt.Sprintf("Bearer %s", loginResponse.MFAToken) mfaToken := fmt.Sprintf("Bearer %s", loginResponse.AccessToken)
expires := time.Now().Add(time.Duration(loginResponse.ExpiresIn) * time.Second)
response.SendAccessTokenCookieWithExpiry(c, mfaToken, expires) response.SendAccessTokenCookieWithExpiry(c, mfaToken, expires)
return return
} }
@ -272,7 +273,7 @@ func SendLoginCookies(c *gin.Context, loginResponse *LoginResponse, sessionID st
refreshExpires := time.Now().Add(time.Duration(loginResponse.RefreshTokenExpiresIn) * time.Second) refreshExpires := time.Now().Add(time.Duration(loginResponse.RefreshTokenExpiresIn) * time.Second)
// Send access token cookie // Send access token cookie
response.SendAccessTokenCookieWithExpiry(c, accessToken, expires) response.SendAccessTokenCookieWithExpiry(c, accessToken, time.Now().Add(time.Duration(loginResponse.ExpiresIn)*time.Second))
// Send refresh token cookie // Send refresh token cookie
response.SendRefreshTokenCookieWithExpiry(c, refreshToken, refreshExpires) response.SendRefreshTokenCookieWithExpiry(c, refreshToken, refreshExpires)

10
openapi/user/oauth.go
View file

@ -192,11 +192,11 @@ func authback(c *gin.Context) {
// MFA Response // MFA Response
if loginResponse.Status == LoginStatusMFA { if loginResponse.Status == LoginStatusMFA {
response.RespondWithSuccess(c, response.StatusOK, LoginSuccessResponse{ response.RespondWithSuccess(c, response.StatusOK, LoginSuccessResponse{
SessionID: sid, SessionID: sid,
MFAEnabled: loginResponse.MFAEnabled, MFAEnabled: loginResponse.MFAEnabled,
Status: loginResponse.Status, Status: loginResponse.Status,
MFAToken: loginResponse.MFAToken, AccessToken: loginResponse.AccessToken,
MFATokenExpiresIn: loginResponse.MFATokenExpiresIn, ExpiresIn: loginResponse.ExpiresIn,
}) })
return return
} }

4
openapi/user/types.go
View file

@ -188,8 +188,6 @@ type LoginResponse struct {
ExpiresIn int `json:"expires_in,omitempty"` ExpiresIn int `json:"expires_in,omitempty"`
RefreshTokenExpiresIn int `json:"refresh_token_expires_in,omitempty"` RefreshTokenExpiresIn int `json:"refresh_token_expires_in,omitempty"`
TokenType string `json:"token_type,omitempty"` TokenType string `json:"token_type,omitempty"`
MFAToken string `json:"mfa_token,omitempty"` // MFA token verification code
MFATokenExpiresIn int `json:"mfa_token_expires_in,omitempty"` // MFA token verification code expires in
MFAEnabled bool `json:"mfa_enabled,omitempty"` MFAEnabled bool `json:"mfa_enabled,omitempty"`
Scope string `json:"scope,omitempty"` Scope string `json:"scope,omitempty"`
Status LoginStatus `json:"status,omitempty"` Status LoginStatus `json:"status,omitempty"`
@ -199,8 +197,6 @@ type LoginResponse struct {
type LoginSuccessResponse struct { type LoginSuccessResponse struct {
IDToken string `json:"id_token,omitempty"` IDToken string `json:"id_token,omitempty"`
AccessToken string `json:"access_token,omitempty"` AccessToken string `json:"access_token,omitempty"`
MFAToken string `json:"mfa_token,omitempty"` // MFA token verification code
MFATokenExpiresIn int `json:"mfa_token_expires_in,omitempty"` // MFA token verification code expires in
SessionID string `json:"session_id,omitempty"` SessionID string `json:"session_id,omitempty"`
RefreshToken string `json:"refresh_token,omitempty"` RefreshToken string `json:"refresh_token,omitempty"`
ExpiresIn int `json:"expires_in,omitempty"` ExpiresIn int `json:"expires_in,omitempty"`