liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-05-27 15:44:38 +08:00
parent cd8c78cc08
commit 6a8aa0cfff
5 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/auth2/auth2.go
View File

@@ -5,7 +5,6 @@ import (
"encoding/base64"
"encoding/json"
"errors"
"git.rosy.net.cn/jx-callback/globals"
"regexp"
"strings"
"time"
@@ -250,8 +249,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
realAuthID = user.GetID()
}
authBindEx, err = handler.VerifySecret(realAuthID, authSecret)
globals.SugarLogger.Debugf("============authBindEx := %s", utils.Format4Output(authBindEx, false))
globals.SugarLogger.Debugf("============authBindEx := %v", err)
if err == nil {
if authBindEx == nil { // mobile, email会返回nil（表示不会新建AuthBind实体）
user = userProvider.GetUser(authID, authIDType)

11
business/auth2/authprovider/dingding/qrcode.go
View File

@@ -4,7 +4,6 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/auth2"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
@@ -23,26 +22,18 @@ func init() {
func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, error) {
userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code)
globals.SugarLogger.Debugf("=========userQRInfo= := %s", utils.Format4Output(userQRInfo, false))
globals.SugarLogger.Debugf("=========err= := %v", err)
if err != nil {
return nil, err
}
tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID)
globals.SugarLogger.Debugf("=========userQRInfo= := %s", utils.Format4Output(tmp_userID, false))
globals.SugarLogger.Debugf("=========err= := %v", err)
if err != nil {
return nil, err
}
userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID)
globals.SugarLogger.Debugf("=========userInfo= := %s", utils.Format4Output(userInfo, false))
globals.SugarLogger.Debugf("=========err= := %v", err)
if err != nil {
return nil, err
}
authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo)
globals.SugarLogger.Debugf("=========authBindEx= := %s", utils.Format4Output(authBindEx, false))
globals.SugarLogger.Debugf("=========err= := %v", err)
if err != nil {
return nil, err
}
@@ -53,7 +44,5 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, erro
Name: utils.Interface2String(userInfo["name"]),
}
globals.SugarLogger.Debugf("=========authBindEx2= := %s", utils.Format4Output(authBindEx, false))
globals.SugarLogger.Debugf("=========err= := %v", err)
return authBindEx, err
}