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

- fk

Browse Source
This commit is contained in:
gazebo
2019-03-05 11:43:40 +08:00
parent 12827d08a3
commit f925049983
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/auth2/auth2.go
View File

@@ -177,7 +177,7 @@ func Login(authType, authID, authIDType, authSecret string) (authInfo *AuthInfo,
if handler := authers[authType]; handler != nil { if handler := authers[authType]; handler != nil {
var authBind *model.AuthBind var authBind *model.AuthBind
var user IUser var user IUser
realauthID := authID realAuthID := authID
if authIDType == AuthTypePassword { if authIDType == AuthTypePassword {
if authID == "" { if authID == "" {
return nil, ErrInvalidParams return nil, ErrInvalidParams
@@ -185,9 +185,9 @@ func Login(authType, authID, authIDType, authSecret string) (authInfo *AuthInfo,
if user = userProvider.GetUser(authID, authIDType); user == nil { if user = userProvider.GetUser(authID, authIDType); user == nil {
return nil, ErrUserNotExist return nil, ErrUserNotExist
} }
realauthID = user.GetID() realAuthID = user.GetID()
} }
if authBind, err = handler.VerifySecret(realauthID, authSecret); err == nil { if authBind, err = handler.VerifySecret(realAuthID, authSecret); err == nil {
if authBind == nil { // mobile, email会返回nil（表示不会新建AuthBind实体） if authBind == nil { // mobile, email会返回nil（表示不会新建AuthBind实体）
user = userProvider.GetUser(authID, authIDType) user = userProvider.GetUser(authID, authIDType)
authBind = &model.AuthBind{ authBind = &model.AuthBind{

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

@@ -10,6 +10,7 @@ import (
"git.rosy.net.cn/jx-callback/business/auth2/authprovider" "git.rosy.net.cn/jx-callback/business/auth2/authprovider"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
) )
const ( const (
@@ -34,6 +35,7 @@ func init() {
} }
func (a *Auther) VerifySecret(userID, passMD5 string) (authBind *model.AuthBind, err error) { func (a *Auther) VerifySecret(userID, passMD5 string) (authBind *model.AuthBind, err error) {
globals.SugarLogger.Debugf("localpass VerifySecret userID:%s", userID)
if authBind, err = dao.GetAuthBind(dao.GetDB(), "", AuthType, userID); err == nil { if authBind, err = dao.GetAuthBind(dao.GetDB(), "", AuthType, userID); err == nil {
err = a.checkPassword(authBind, passMD5) err = a.checkPassword(authBind, passMD5)
} else if dao.IsNoRowsError(err) { } else if dao.IsNoRowsError(err) {

2
business/model/dao/dao_auth2.go
View File

@@ -5,6 +5,7 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
) )
func GetAuthBind(db *DaoDB, userID, authType, authID string) (authBind *model.AuthBind, err error) { func GetAuthBind(db *DaoDB, userID, authType, authID string) (authBind *model.AuthBind, err error) {
@@ -31,6 +32,7 @@ func GetAuthBind(db *DaoDB, userID, authType, authID string) (authBind *model.Au
sql += " AND t1.auth_id = ?" sql += " AND t1.auth_id = ?"
sqlParams = append(sqlParams, authID) sqlParams = append(sqlParams, authID)
} }
globals.SugarLogger.Debugf("GetAuthBind sql:%s, sqlParams:%s", sql, utils.Format4Output(sqlParams, false))
err = GetRow(db, &authBind, sql, sqlParams...) err = GetRow(db, &authBind, sql, sqlParams...)
return authBind, err return authBind, err
} }