SCHISANDRA/schisandra-cloud-album
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix jwt token issue

Browse Source
This commit is contained in:
landaiqing
2024-08-20 21:45:14 +08:00
parent 1094957ea4
commit 58ca15768b
7 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/oauth_api/gitee_api.go
View File

@@ -170,7 +170,7 @@ func (OAuthAPI) GiteeCallback(c *gin.Context) {
}
Id := strconv.Itoa(giteeUser.ID)
userSocial, err := userSocialService.QueryUserSocialByUUID(Id)
userSocial, err := userSocialService.QueryUserSocialByUUID(Id, enum.OAuthSourceGitee)
if errors.Is(err, gorm.ErrRecordNotFound) {
// 第一次登录，创建用户
uid := idgen.NextId()
@@ -220,7 +220,7 @@ func (OAuthAPI) GiteeCallback(c *gin.Context) {
formattedScript := fmt.Sprintf(script, tokenData, global.CONFIG.System.Web)
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(formattedScript))
} else {
user, err := userService.QueryUserByUsername(giteeUser.Login)
user, err := userService.QueryUserById(userSocial.UserID)
if err != nil {
global.LOG.Error(err)
return

4
api/oauth_api/github_api.go
View File

@@ -175,7 +175,7 @@ func (OAuthAPI) Callback(c *gin.Context) {
return
}
Id := strconv.Itoa(gitHubUser.ID)
userSocial, err := userSocialService.QueryUserSocialByUUID(Id)
userSocial, err := userSocialService.QueryUserSocialByUUID(Id, enum.OAuthSourceGithub)
if errors.Is(err, gorm.ErrRecordNotFound) {
// 第一次登录，创建用户
uid := idgen.NextId()
@@ -225,7 +225,7 @@ func (OAuthAPI) Callback(c *gin.Context) {
formattedScript := fmt.Sprintf(script, tokenData, global.CONFIG.System.Web)
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(formattedScript))
} else {
user, err := userService.QueryUserByUsername(gitHubUser.Login)
user, err := userService.QueryUserById(userSocial.UserID)
if err != nil {
global.LOG.Error(err)
return

2
api/oauth_api/wechat_api.go
View File

@@ -201,7 +201,7 @@ func wechatLoginHandler(openId string, clientId string) bool {
if openId == "" {
return false
}
authUserSocial, err := userSocialService.QueryUserSocialByOpenID(openId)
authUserSocial, err := userSocialService.QueryUserSocialByOpenID(openId, enum.OAuthSourceWechat)
if errors.Is(err, gorm.ErrRecordNotFound) {
uid := idgen.NextId()
uidStr := strconv.FormatInt(uid, 10)

6
api/user_api/user_api.go
View File

@@ -339,8 +339,10 @@ func (UserAPI) RefreshHandler(c *gin.Context) {
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
return
}
token := redis.Get(constant.UserLoginTokenRedisKey + *parseRefreshToken.UserID).Val()
if token == "" {
token, err := redis.Get(constant.UserLoginTokenRedisKey + *parseRefreshToken.UserID).Result()
if token == "" || err != nil {
global.LOG.Errorln(err)
result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
return
}