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

- auth2.AddAuthBind的第一个参数从*AuthInfo改为IUser

Browse Source
This commit is contained in:
gazebo
2019-08-06 11:18:38 +08:00
parent 88ebbbf9e7
commit 407844aa81
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/auth2/auth2.go
View File

@@ -258,8 +258,8 @@ func BindUser(inauthInfo *AuthInfo, user IUser) (outauthInfo *AuthInfo, err erro
} }
// 添加新绑定 // 添加新绑定
func AddAuthBind(authInfo *AuthInfo, newAuthInfo *AuthInfo) (err error) { func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) {
if authInfo == nil || newAuthInfo == nil { if user == nil || newAuthInfo == nil {
return ErrInternalErrror return ErrInternalErrror
} }
if !newAuthInfo.IsUserEmpty() { if !newAuthInfo.IsUserEmpty() {
@@ -267,12 +267,12 @@ func AddAuthBind(authInfo *AuthInfo, newAuthInfo *AuthInfo) (err error) {
} }
RemoveUserInfo(newAuthInfo.Token) RemoveUserInfo(newAuthInfo.Token)
if newAuthInfo.AuthBindInfo.Type == AuthTypeMobile { if newAuthInfo.AuthBindInfo.Type == AuthTypeMobile {
err = userProvider.UpdateUserMobile(authInfo.GetID(), newAuthInfo.AuthBindInfo.AuthID) err = userProvider.UpdateUserMobile(user.GetID(), newAuthInfo.AuthBindInfo.AuthID)
} else if newAuthInfo.AuthBindInfo.Type == AuthTypeEmail { } else if newAuthInfo.AuthBindInfo.Type == AuthTypeEmail {
err = userProvider.UpdateUserEmail(authInfo.GetID(), newAuthInfo.AuthBindInfo.AuthID) err = userProvider.UpdateUserEmail(user.GetID(), newAuthInfo.AuthBindInfo.AuthID)
} else { } else {
newAuthInfo.AuthBindInfo.UserID = authInfo.GetID() newAuthInfo.AuthBindInfo.UserID = user.GetID()
err = authers[newAuthInfo.AuthBindInfo.Type].AddAuthBind(newAuthInfo.AuthBindInfo, authInfo.GetName()) err = authers[newAuthInfo.AuthBindInfo.Type].AddAuthBind(newAuthInfo.AuthBindInfo, user.GetName())
} }
return err return err
} }

2
business/auth2/authprovider/weixin/weixin.go
View File

@@ -48,7 +48,7 @@ func (a *Auther) VerifySecret(state, code string) (authBindEx *auth2.AuthBindEx,
if err = err2; err == nil { if err = err2; err == nil {
wxUserinfo, err2 := api.WeixinPageAPI.SNSGetUserInfo(token.AccessToken, token.OpenID) wxUserinfo, err2 := api.WeixinPageAPI.SNSGetUserInfo(token.AccessToken, token.OpenID)
if err = err2; err == nil { if err = err2; err == nil {
if authBindEx, err = a.UnionFindAuthBind(a.authType, []string{AuthTypeWeixin, AuthTypeMini, AuthTypeMini}, wxUserinfo.OpenID, wxUserinfo.UnionID, wxUserinfo); err == nil { if authBindEx, err = a.UnionFindAuthBind(a.authType, []string{AuthTypeWeixin, AuthTypeMP, AuthTypeMini}, wxUserinfo.OpenID, wxUserinfo.UnionID, wxUserinfo); err == nil {
authBindEx.UserHint = &auth2.UserBasic{ authBindEx.UserHint = &auth2.UserBasic{
Name: wxUserinfo.NickName, Name: wxUserinfo.NickName,
} }

2
business/auth2/authprovider/weixin/weixin_mini.go
View File

@@ -34,7 +34,7 @@ func (a *MiniAuther) VerifySecret(dummy, jsCode string) (authBindEx *auth2.AuthB
if err == nil { if err == nil {
sessionKey := sessionInfo.SessionKey sessionKey := sessionInfo.SessionKey
sessionInfo.SessionKey = "" sessionInfo.SessionKey = ""
if authBindEx, err = a.UnionFindAuthBind(AuthTypeMini, []string{AuthTypeWeixin, AuthTypeMini, AuthTypeMini}, sessionInfo.OpenID, sessionInfo.UnionID, sessionInfo); err == nil { if authBindEx, err = a.UnionFindAuthBind(AuthTypeMini, []string{AuthTypeWeixin, AuthTypeMP, AuthTypeMini}, sessionInfo.OpenID, sessionInfo.UnionID, sessionInfo); err == nil {
authBindEx.UserData = sessionKey authBindEx.UserData = sessionKey
} }
} }