This commit is contained in:
richboo111
2022-08-12 15:13:26 +08:00
parent 120c9f0720
commit 4572dcf288

View File

@@ -21,11 +21,12 @@ func init() {
auth2.RegisterAuther(AuthTypeQRCode, AutherObjQRCode) auth2.RegisterAuther(AuthTypeQRCode, AutherObjQRCode)
} }
func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, error) {
globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s", code) globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s", code)
userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code) userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code)
if err == nil { if err != nil {
return nil, err
}
tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID) tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -36,7 +37,10 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB
} }
globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo) globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo)
globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false)) globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false))
if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil { authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo)
if err != nil {
return nil, err
}
authBindEx.UserHint = &auth2.UserBasic{ authBindEx.UserHint = &auth2.UserBasic{
//Name: userQRInfo.Nickname, //Name: userQRInfo.Nickname,
UserID2: tmp_userID.UserID, UserID2: tmp_userID.UserID,
@@ -44,8 +48,6 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB
Email: utils.Interface2String(userInfo["email"]), Email: utils.Interface2String(userInfo["email"]),
Name: utils.Interface2String(userInfo["name"]), Name: utils.Interface2String(userInfo["name"]),
} }
}
}
globals.SugarLogger.Debug("authBindEx.UserHint===============", authBindEx.UserHint) globals.SugarLogger.Debug("authBindEx.UserHint===============", authBindEx.UserHint)
return authBindEx, err return authBindEx, err
} }