tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-09-30 06:16:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化] response 结构调整

Browse Source
This commit is contained in:
ryan
2026-06-05 11:42:25 +08:00
parent 4dc4c745c8
commit 43e8ef154f
29 changed files with 578 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openflare_server/controller/github.go
+13 -12
View File
@@ -8,6 +8,7 @@ import (
"log/slog"
"net/http"
"openflare/common"
"openflare/common/response"
"openflare/model"
"time"
@@ -84,13 +85,13 @@ func GitHubOAuth(c *gin.Context) {
}
if !common.GitHubOAuthEnabled {
respondFailure(c, "管理员未开启通过 GitHub 登录以及注册")
response.RespondFailure(c, "管理员未开启通过 GitHub 登录以及注册")
return
}
code := c.Query("code")
githubUser, err := getGitHubUserInfoByCode(code)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
user := model.User{
@@ -99,16 +100,16 @@ func GitHubOAuth(c *gin.Context) {
if model.IsGitHubIdAlreadyTaken(user.GitHubId) {
err := user.FillUserByGitHubId()
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
} else {
respondFailure(c, "管理员关闭了新用户注册")
response.RespondFailure(c, "管理员关闭了新用户注册")
return
}
if user.Status != common.UserStatusEnabled {
respondFailure(c, "用户已被封禁")
response.RespondFailure(c, "用户已被封禁")
return
}
setupLogin(&user, c)
@@ -116,38 +117,38 @@ func GitHubOAuth(c *gin.Context) {
func GitHubBind(c *gin.Context) {
if !common.GitHubOAuthEnabled {
respondFailure(c, "管理员未开启通过 GitHub 登录以及注册")
response.RespondFailure(c, "管理员未开启通过 GitHub 登录以及注册")
return
}
code := c.Query("code")
githubUser, err := getGitHubUserInfoByCode(code)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
user := model.User{
GitHubId: githubUser.Login,
}
if model.IsGitHubIdAlreadyTaken(user.GitHubId) {
respondFailure(c, "该 GitHub 账户已被绑定")
response.RespondFailure(c, "该 GitHub 账户已被绑定")
return
}
currentUser := currentUserFromOpenFlareToken(c)
if currentUser == nil {
respondFailure(c, "无权进行此操作，未登录或 token 无效")
response.RespondFailure(c, "无权进行此操作，未登录或 token 无效")
return
}
user.Id = currentUser.Id
err = user.FillUserById()
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
user.GitHubId = githubUser.Login
err = user.Update(false)
if err != nil {
respondFailure(c, err.Error())
response.RespondFailure(c, err.Error())
return
}
respondSuccessMessage(c, "bind")
response.RespondSuccessMessage(c, "bind")
}