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

- IAuther.UnbindAuth的接口改为userID

Browse Source
This commit is contained in:
gazebo
2019-08-13 11:02:14 +08:00
parent 37b931abe5
commit d59ca265c4
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/auth2/auth2.go
View File

@@ -71,7 +71,7 @@ type IAuther interface {
// 负责验证secret，并找到相应的用户返回（password,email,mobile类型的不负责用户查找）如果找不到用户UserID为空
VerifySecret(authID, authSecret string) (authBindEx *AuthBindEx, err error)
AddAuthBind(authBindEx *AuthBindEx, userName string) (err error)
UnbindAuth(authInfo *AuthInfo, authType string) (err error)
UnbindAuth(userID, authType, userName string) (err error)
Logout(authInfo *AuthInfo) (err error)
}
@@ -277,9 +277,9 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) {
return err
}
func UnbindAuth(authInfo *AuthInfo, authType string) (err error) {
func UnbindAuth(userID, authType, userName string) (err error) {
if handler := authers[authType]; handler != nil {
err = handler.UnbindAuth(authInfo, authType)
err = handler.UnbindAuth(userID, authType, userName)
} else {
err = ErrIllegalAuthType
}

6
business/auth2/authprovider/defauther.go
View File

@@ -35,9 +35,9 @@ func (a *DefAuther) AddAuthBind(authBindEx *auth2.AuthBindEx, userName string) (
return err
}
func (a *DefAuther) UnbindAuth(authInfo *auth2.AuthInfo, authType string) (err error) {
_, err = dao.DeleteEntityLogically(nil, &model.AuthBind{}, nil, authInfo.GetID(), map[string]interface{}{
"UserID": authInfo.GetID(),
func (a *DefAuther) UnbindAuth(userID, authType, userName string) (err error) {
_, err = dao.DeleteEntityLogically(nil, &model.AuthBind{}, nil, userName, map[string]interface{}{
"UserID": userID,
"Type": authType,
model.FieldDeletedAt: utils.DefaultTimeValue,
})

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

@@ -83,6 +83,6 @@ func (a *Auther) AddAuthBind(authBindEx *auth2.AuthBindEx, userName string) (err
}
// 此函数为空
func (a *Auther) UnbindAuth(authInfo *auth2.AuthInfo, authType string) (err error) {
func (a *Auther) UnbindAuth(userID, authType, userName string) (err error) {
return err
}

2
controllers/auth2.go
View File

@@ -248,7 +248,7 @@ func (c *Auth2Controller) RemoveAuthBind() {
c.callRemoveAuthBind(func(params *tAuth2RemoveAuthBindParams) (retVal interface{}, errCode string, err error) {
authInfo, err2 := params.Ctx.GetV2AuthInfo()
if err = err2; err == nil {
err = auth2.UnbindAuth(authInfo, params.AuthType)
err = auth2.UnbindAuth(authInfo.GetID(), params.AuthType, params.Ctx.GetUserName())
}
return retVal, "", err
})