Merge pull request #57 from deadblue/develop

Bump version to 0.7.6.

Author: deadblue

README.md

@@ -25,7 +25,7 @@ func main()  {
   agent := elevengo.Default()
   // Import credential
   credential := &elevengo.Credential{
-    UID: "", CID: "", SEID: "",
+    UID: "", CID: "", KID: "", SEID: "",
   }
   if err := agent.CredentialImport(credential); err != nil {
     log.Fatalf("Import credentail error: %s", err)
@@ -66,7 +66,7 @@ func main()  {
   agent := elevengo.Default()
   // Import credential
   credential := &elevengo.Credential{
-    UID: "", CID: "", SEID: "",
+    UID: "", CID: "", KID: "", SEID: "",
   }
   if err := agent.CredentialImport(credential); err != nil {
     log.Fatalf("Import credentail error: %s", err)

example_test.go

@@ -18,6 +18,7 @@ func ExampleAgent_CredentialImport() {
 	if err := agent.CredentialImport(&Credential{
 		UID:  "UID-From-Cookie",
 		CID:  "CID-From-Cookie",
+		KID:  "KID-From-Cookie",
 		SEID: "SEID-From-Cookie",
 	}); err != nil {
 		log.Fatalf("Import credentail error: %s", err)

internal/protocol/cookie.go

@@ -8,6 +8,7 @@ const (
 	CookieNameUID  = "UID"
 	CookieNameCID  = "CID"
 	CookieNameSEID = "SEID"
+	CookieNameKID  = "KID"
 )
 
 var (

login.go

@@ -9,11 +9,12 @@ import (
 
 // Credential contains required information which 115 server uses to
 // authenticate a signed-in user.
-// In detail, three cookies are required: "UID", "CID", "SEID", caller can
-// find them from browser cookie storage.
+// In detail, these cookies are required: "UID", "CID", "KID", "SEID".
+// Caller can find them from browser cookie storage.
 type Credential struct {
 	UID  string
 	CID  string
+	KID  string
 	SEID string
 }
 
@@ -34,6 +35,9 @@ func (a *Agent) CredentialImport(cr *Credential) (err error) {
 		protocol.CookieNameCID:  cr.CID,
 		protocol.CookieNameSEID: cr.SEID,
 	}
+	if cr.KID != "" {
+		cookies[protocol.CookieNameKID] = cr.KID
+	}
 	a.llc.ImportCookies(cookies, protocol.CookieDomains...)
 	return a.afterSignIn(cr.UID)
 }
@@ -43,6 +47,7 @@ func (a *Agent) CredentialExport(cr *Credential) {
 	cookies := a.llc.ExportCookies(protocol.CookieUrl)
 	cr.UID = cookies[protocol.CookieNameUID]
 	cr.CID = cookies[protocol.CookieNameCID]
+	cr.KID = cookies[protocol.CookieNameKID]
 	cr.SEID = cookies[protocol.CookieNameSEID]
 }
 

lowlevel/types/qrcode.go

@@ -14,9 +14,10 @@ type QrcodeStatusResult struct {
 
 type QrcodeLoginResult struct {
 	Cookie struct {
+		UID  string `json:"UID"`
 		CID  string `json:"CID"`
+		KID  string `json:"KID"`
 		SEID string `json:"SEID"`
-		UID  string `json:"UID"`
 	} `json:"cookie"`
 	UserId   int    `json:"user_id"`
 	UserName string `json:"user_name"`

version.go

@@ -7,7 +7,7 @@ import (
 
 const (
 	libName = "elevengo"
-	libVer  = "0.7.5"
+	libVer  = "0.7.6"
 )
 
 var (