SendVerifyCode

business/auth2/auth2.go

@@ -53,7 +53,6 @@ type IUser interface {
 	GetEmail() string
 	GetName() string
 	GetAvatar() string
-	IsAdmin() bool
 }
 
 const (
@@ -196,13 +195,9 @@ func CreateCaptcha(width, height, captchaLen int) (captchaInfo *CaptchaInfo, err
 	return captchaInfo, err
 }
 
-func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (verfifyCode string, err error) {
-	isReturnVerifyCode := false
+func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (verfifyCode string, authInfo *AuthInfo, err error) {
 	if authToken != "" {
-		authInfo, err2 := GetTokenInfo(authToken)
-		if err = err2; err == nil {
-			isReturnVerifyCode = authInfo.IsAdmin()
-		}
+		authInfo, err = GetTokenInfo(authToken)
 	} else if captchaID != "" && captchaValue != "" {
 		if !(TestCaptchaMap[captchaID] == captchaValue || captcha.VerifyString(captchaID, captchaValue)) {
 			err = ErrCaptchaIsNotOk
@@ -215,13 +210,10 @@ func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (verfifyC
 		if handler := authers[authType]; handler == nil {
 			err = ErrIllegalAuthType
 		} else {
-			code, err2 := handler.SendVerifyCode(authID)
-			if err = err2; err == nil && isReturnVerifyCode {
-				verfifyCode = code
-			}
+			verfifyCode, err = handler.SendVerifyCode(authID)
 		}
 	}
-	return verfifyCode, err
+	return verfifyCode, authInfo, err
 }
 
 // 账号密码时：authIDType可能是：UserIDID,UserIDID2,UserIDMobile,UserIDEmail，authSecret是密码的sha1