From dee552433120ff2fcea923fc689bdf4860eecd8e Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 5 Mar 2019 09:20:13 +0800
Subject: [PATCH] - ErrAuthTypeAlreadyExist

---
 business/auth2/auth2.go                           | 1 +
 business/auth2/authprovider/password/password.go  | 2 +-
 business/auth2/authprovider/weixin/weixin.go      | 2 ++
 business/auth2/authprovider/weixin/weixin_mini.go | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go
index b88409dc7..4505807ee 100644
--- a/business/auth2/auth2.go
+++ b/business/auth2/auth2.go
@@ -89,6 +89,7 @@ var (
 	ErrUserMobileAlreadyExist = errors.New("用户手机已经存在")
 	ErrUserID2AlreadyExist    = errors.New("用户标识已经存在")
 	ErrUserNotExist           = errors.New("用户不存在")
+	ErrUserAuthTypeNotExist   = errors.New("用户登录类型不存在")
 	ErrIllegalAuthType        = errors.New("非法的登录类型")
 	ErrAuthTypeAlreadyExist   = errors.New("要登录类型已经存在")
 	ErrCaptchaIsNotOk         = errors.New("图形校验码不正确")
diff --git a/business/auth2/authprovider/password/password.go b/business/auth2/authprovider/password/password.go
index 140976686..c051ab4b5 100644
--- a/business/auth2/authprovider/password/password.go
+++ b/business/auth2/authprovider/password/password.go
@@ -37,7 +37,7 @@ func (a *Auther) VerifySecret(userID, passMD5 string) (authBind *model.AuthBind,
 	if authBind, err = dao.GetAuthBind(dao.GetDB(), "", AuthType, userID); err == nil {
 		err = a.checkPassword(authBind, passMD5)
 	} else if dao.IsNoRowsError(err) {
-		err = auth2.ErrUserNotExist
+		err = auth2.ErrUserAuthTypeNotExist
 	}
 	return authBind, err
 }
diff --git a/business/auth2/authprovider/weixin/weixin.go b/business/auth2/authprovider/weixin/weixin.go
index 4213b4c48..18c5c20ce 100644
--- a/business/auth2/authprovider/weixin/weixin.go
+++ b/business/auth2/authprovider/weixin/weixin.go
@@ -61,6 +61,8 @@ func (a *Auther) VerifySecret(state, code string) (authBind *model.AuthBind, err
 							authBind.AuthID = wxUserinfo.OpenID
 							authBind.DetailData = string(utils.MustMarshal(wxUserinfo))
 							err = a.AddAuthBind(authBind, wxUserinfo.NickName)
+						} else if dao.IsNoRowsError(err) {
+							err = auth2.ErrUserAuthTypeNotExist
 						}
 					}
 					if err == nil && len(authBindList) == 0 {
diff --git a/business/auth2/authprovider/weixin/weixin_mini.go b/business/auth2/authprovider/weixin/weixin_mini.go
index e4fb0d56f..7e7617fbf 100644
--- a/business/auth2/authprovider/weixin/weixin_mini.go
+++ b/business/auth2/authprovider/weixin/weixin_mini.go
@@ -48,6 +48,8 @@ func (a *MiniAuther) VerifySecret(dummy, jsCode string) (authBind *model.AuthBin
 					authBind.DetailData = string(utils.MustMarshal(sessionInfo))
 					authBind.UserData = sessionKey
 					err = a.AddAuthBind(authBind, "admin")
+				} else if dao.IsNoRowsError(err) {
+					err = auth2.ErrUserAuthTypeNotExist
 				}
 			}
 			if err == nil && len(authBindList) == 0 {