- refactor defauther.UnionFindAuthBind

business/auth2/authprovider/weixin/weixin_mini.go

@@ -4,11 +4,8 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"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/dao"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
@@ -35,36 +32,10 @@ func (a *MiniAuther) VerifySecret(dummy, jsCode string) (authBindEx *auth2.AuthB
 
 	sessionInfo, err := api.WeixinMiniAPI.SNSCode2Session(jsCode)
 	if err == nil {
-		db := dao.GetDB()
-		var authBind *model.AuthBind
-		if authBind, err = dao.GetAuthBind(db, "", AuthTypeMini, sessionInfo.OpenID); dao.IsNoRowsError(err) && sessionInfo.UnionID != "" {
-			var authBindList []*model.AuthBind
-			sessionKey := sessionInfo.SessionKey
-			sessionInfo.SessionKey = ""
-			if authBindList, err = dao.GetAuthBindsByAuthID2(db, sessionInfo.UnionID, []string{AuthTypeWeixin, AuthTypeMini, AuthTypeMini}); err == nil && len(authBindList) > 0 {
-				authBind = authBindList[0]
-				authBind.Type = AuthTypeMini
-				authBind.AuthID = sessionInfo.OpenID
-				authBind.DetailData = string(utils.MustMarshal(sessionInfo))
-				authBindEx = &auth2.AuthBindEx{
-					AuthBind: *authBind,
-					UserData: sessionKey,
-				}
-				err = a.AddAuthBind(authBindEx, "admin")
-			} else if dao.IsNoRowsError(err) {
-				err = nil
-			}
-			if err == nil && authBindEx == nil {
-				authBindEx = &auth2.AuthBindEx{
-					AuthBind: model.AuthBind{
-						Type:       AuthTypeMini,
-						AuthID:     sessionInfo.OpenID,
-						AuthID2:    sessionInfo.UnionID,
-						DetailData: string(utils.MustMarshal(sessionInfo)),
-					},
-					UserData: sessionKey,
-				}
-			}
+		sessionKey := sessionInfo.SessionKey
+		sessionInfo.SessionKey = ""
+		if authBindEx, err = a.UnionFindAuthBind(AuthTypeMini, []string{AuthTypeWeixin, AuthTypeMini, AuthTypeMini}, sessionInfo.OpenID, sessionInfo.UnionID, sessionInfo); err == nil {
+			authBindEx.UserData = sessionKey
 		}
 	}
 	return authBindEx, err