From d67f09007dd074f7ec7ddbb368a49a96679f3f8b Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 4 Mar 2019 12:01:59 +0800 Subject: [PATCH] - add GetBindAuthInfo --- business/model/dao/dao_user2.go | 10 ++++++++++ controllers/auth2.go | 8 ++++---- controllers/cms_user2.go | 17 +++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/business/model/dao/dao_user2.go b/business/model/dao/dao_user2.go index f21d58a7e..9d95f789e 100644 --- a/business/model/dao/dao_user2.go +++ b/business/model/dao/dao_user2.go @@ -16,3 +16,13 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err err = GetRows(db, &user, sql, utils.DefaultTimeValue, fieldValue) return user, err } + +func GetUserBindAuthInfo(db *DaoDB, userID string) (authList []*model.AuthBind, err error) { + sql := ` + SELECT * + FROM auth_bind t1 + WHERE t1.deleted_at = ? AND t1.user_id = ? + ` + err = GetRows(db, &authList, sql, utils.DefaultTimeValue, userID) + return authList, err +} diff --git a/controllers/auth2.go b/controllers/auth2.go index 1107e7d61..1d707efa5 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -157,7 +157,7 @@ func (c *Auth2Controller) Logout() { // @router /AddAuthBind [post] func (c *Auth2Controller) AddAuthBind() { c.callAddAuthBind(func(params *tAuth2AddAuthBindParams) (retVal interface{}, errCode string, err error) { - authInfo, err2 := c.getAuth2Info(params.Ctx) + authInfo, err2 := getAuth2Info(params.Ctx) if err := err2; err == nil { newAuthInfo, err2 := auth2.GetTokenInfo(params.AuthToken) if err = err2; err == nil { @@ -177,7 +177,7 @@ func (c *Auth2Controller) AddAuthBind() { // @router /RemoveAuthBind [post] func (c *Auth2Controller) RemoveAuthBind() { c.callRemoveAuthBind(func(params *tAuth2RemoveAuthBindParams) (retVal interface{}, errCode string, err error) { - authInfo, err2 := c.getAuth2Info(params.Ctx) + authInfo, err2 := getAuth2Info(params.Ctx) if err := err2; err == nil { err = auth2.UnbindAuth(authInfo, params.AuthType) } @@ -195,7 +195,7 @@ func (c *Auth2Controller) RemoveAuthBind() { // @router /ChangePassword [put] func (c *Auth2Controller) ChangePassword() { c.callChangePassword(func(params *tAuth2ChangePasswordParams) (retVal interface{}, errCode string, err error) { - authInfo, err := c.getAuth2Info(params.Ctx) + authInfo, err := getAuth2Info(params.Ctx) if err == nil { err = password.AutherObj.ChangePassword(authInfo.GetID(), params.OldPwd, params.NewPwd) } @@ -203,7 +203,7 @@ func (c *Auth2Controller) ChangePassword() { }) } -func (c *Auth2Controller) getAuth2Info(ctx *jxcontext.Context) (authInfo *auth2.AuthInfo, err error) { +func getAuth2Info(ctx *jxcontext.Context) (authInfo *auth2.AuthInfo, err error) { if authInfo, ok := ctx.GetLoginInfo().(*auth2.AuthInfo); ok { return authInfo, err } diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go index bc596d79c..b3c14be89 100644 --- a/controllers/cms_user2.go +++ b/controllers/cms_user2.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "github.com/astaxie/beego" ) @@ -39,3 +40,19 @@ func (c *User2Controller) RegisterUser() { return retVal, "", err }) } + +// @Title 得到用户已经成功绑定的认证信息 +// @Description 得到用户已经成功绑定的认证信息 +// @Param token header string true "认证token" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetBindAuthInfo [get] +func (c *User2Controller) GetBindAuthInfo() { + c.callGetBindAuthInfo(func(params *tUser2GetBindAuthInfoParams) (retVal interface{}, errCode string, err error) { + authInfo, err := getAuth2Info(params.Ctx) + if err == nil { + retVal, err = dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.GetID()) + } + return retVal, "", err + }) +}