improve: 拆分登录函数

v1/config.go

@@ -1,17 +0,0 @@
-package BitSrun
-
-func GenerateLoginInfo(Form *LoginForm, Meta *LoginMeta) *LoginContext {
-	return &LoginContext{
-		Meta: Meta,
-		Form: &LoginForm{
-			UserName: func() string {
-				if Form.UserType == "" {
-					return Form.UserName
-				} else {
-					return Form.UserName + "@" + Form.UserType
-				}
-			}(),
-			PassWord: Form.PassWord,
-		},
-	}
-}

v1/login.go

@@ -6,81 +6,79 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func Login(c *Conf) error {
+func LoginStatus(c *Conf) (online bool, ip string, e error) {
 	c.initApi()
-	G := GenerateLoginInfo(c.LoginInfo.Form, c.LoginInfo.Meta)
-
-	log.Debugln("正在检查登录状态")
 
 	res, e := c.api.GetUserInfo()
 	if e != nil {
-		return e
+		return false, "", e
 	}
+
 	err, ok := res["error"]
-	if err == "ok" {
-		log.Debugln("已登录~")
-		return nil
-	}
-	log.Infoln("检测到用户未登录，开始尝试登录...")
-
-	log.Debugln("正在获取客户端 IP")
-
-	var ip interface{}
-	ip, ok = res["client_ip"]
 	if !ok {
-		ip, ok = res["online_ip"]
+		return false, "", ErrResultCannotFound
+	}
+
+	ipInterface, ok := res["client_ip"]
+	if !ok {
+		ipInterface, ok = res["online_ip"]
 		if !ok {
-			return ErrResultCannotFound
+			return false, "", ErrResultCannotFound
 		}
 	}
-	G.Ip = ip.(string)
-	log.Debugln("ip: ", G.Ip)
 
+	return err.(string) == "ok", ipInterface.(string), nil
+}
+
+func DoLogin(clientIP string, c *Conf) error {
 	log.Debugln("正在获取 Token")
 
-	res, e = c.api.GetChallenge(G.Form.UserName, G.Ip)
+	if c.LoginInfo.Form.UserType != "" {
+		c.LoginInfo.Form.UserName += "@" + c.LoginInfo.Form.UserType
+	}
+
+	res, e := c.api.GetChallenge(c.LoginInfo.Form.UserName, clientIP)
 	if e != nil {
 		return e
 	}
-	var token interface{}
+	token, ok := res["challenge"]
-	token, ok = res["challenge"]
 	if !ok {
 		return ErrResultCannotFound
 	}
-	G.Token = token.(string)
+	tokenStr := token.(string)
-	log.Debugln("token: ", G.Token)
+	log.Debugln("token: ", tokenStr)
 
 	log.Debugln("发送登录请求")
 
 	info, e := json.Marshal(map[string]string{
-		"username": G.Form.UserName,
+		"username": c.LoginInfo.Form.UserName,
-		"password": G.Form.PassWord,
+		"password": c.LoginInfo.Form.PassWord,
-		"ip":       G.Ip,
+		"ip":       clientIP,
-		"acid":     G.Meta.Acid,
+		"acid":     c.LoginInfo.Meta.Acid,
-		"enc_ver":  G.Meta.Enc,
+		"enc_ver":  c.LoginInfo.Meta.Enc,
 	})
 	if e != nil {
 		return e
 	}
-	G.EncryptedInfo = "{SRBX1}" + Base64(XEncode(string(info), G.Token))
+	EncryptedInfo := "{SRBX1}" + Base64(XEncode(string(info), tokenStr))
-	G.Md5 = Md5(G.Token)
+	Md5Str := Md5(tokenStr)
-	G.EncryptedMd5 = "{MD5}" + G.Md5
+	EncryptedMd5 := "{MD5}" + Md5Str
-
+	EncryptedChkstr := Sha1(
-	var chkstr = G.Token + G.Form.UserName + G.Token + G.Md5
+		tokenStr + c.LoginInfo.Form.UserName + tokenStr + Md5Str +
-	chkstr += G.Token + G.Meta.Acid + G.Token + G.Ip
+			tokenStr + c.LoginInfo.Meta.Acid + tokenStr + clientIP +
-	chkstr += G.Token + G.Meta.N + G.Token + G.Meta.Type
+			tokenStr + c.LoginInfo.Meta.N + tokenStr + c.LoginInfo.Meta.Type +
-	chkstr += G.Token + G.EncryptedInfo
+			tokenStr + EncryptedInfo,
-	G.EncryptedChkstr = Sha1(chkstr)
+	)
 
 	res, e = c.api.Login(
-		G.Form.UserName,
+		c.LoginInfo.Form.UserName,
-		G.EncryptedMd5,
+		EncryptedMd5,
-		G.Meta.Acid,
+		c.LoginInfo.Meta.Acid,
-		G.Ip,
+		clientIP,
-		G.EncryptedInfo,
+		EncryptedInfo,
-		G.EncryptedChkstr,
+		EncryptedChkstr,
-		G.Meta.N,
+		c.LoginInfo.Meta.N,
-		G.Meta.Type,
+		c.LoginInfo.Meta.Type,
 	)
 	if e != nil {
 		return e
@@ -90,10 +88,10 @@ func Login(c *Conf) error {
 	if !ok {
 		return ErrResultCannotFound
 	}
-	G.LoginResult = result.(string)
+	LoginResult := result.(string)
 
-	if G.LoginResult != "ok" {
+	if LoginResult != "ok" {
-		return errors.New(G.LoginResult)
+		return errors.New(LoginResult)
 	}
 
 	return nil

v1/models.go

@@ -38,16 +38,3 @@ type Conf struct {
 func (a *Conf) initApi() {
 	a.api.Init(a.Https, a.LoginInfo.Form.Domain, a.Client)
 }
-
-type LoginContext struct {
-	Ip              string
-	Token           string
-	EncryptedInfo   string
-	Md5             string
-	EncryptedMd5    string
-	EncryptedChkstr string
-	LoginResult     string
-
-	Form *LoginForm
-	Meta *LoginMeta
-}