Commit 15dfca6

author

Sandy

authored

Merge pull request #23 from openset/develop

Add: saveCredential

2 parents d9567aa + e3ecf43 commit 15dfca6Copy full SHA for 15dfca6

File tree

+30

-4

lines changed

+30

-4

lines changed

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
`1`	`1`	`package leetcode`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "bytes"`
`4`	`5`	`"encoding/json"`
`5`	`6`	`"io/ioutil"`
`6`	`7`	`"net/http"`
	`8`	`+ "net/http/cookiejar"`
	`9`	`+ "net/url"`
`7`	`10`	`"os"`
`8`	`11`	`"os/user"`
`9`	`12`	`"path"`
`@@ -15,6 +18,15 @@ func checkErr(err error) {`
`15`	`18`	`}`
`16`	`19`	`}`
`17`	`20`
	`21`	`+func client() *http.Client {`
	`22`	`+ jar, err := cookiejar.New(nil)`
	`23`	`+ // jar.SetCookies()`
	`24`	`+ checkErr(err)`
	`25`	`+ return &http.Client{`
	`26`	`+ Jar: jar,`
	`27`	`+ }`
	`28`	`+}`
	`29`	`+`
`18`	`30`	`func getCsrfToken(cookies []*http.Cookie) string {`
`19`	`31`	`for _, cookie := range cookies {`
`20`	`32`	`if cookie.Name == "csrftoken" {`
`@@ -38,7 +50,10 @@ func getPath(f string) string {`
`38`	`50`	`func saveCookies(cookies []*http.Cookie) {`
`39`	`51`	`data, err := json.Marshal(cookies)`
`40`	`52`	`checkErr(err)`
`41`		`- err = ioutil.WriteFile(getPath(cookiesFile), data, 0755)`
	`53`	`+ dst := bytes.Buffer{}`
	`54`	`+ err = json.Indent(&dst, data, "", "\t")`
	`55`	`+ checkErr(err)`
	`56`	`+ err = ioutil.WriteFile(getPath(cookiesFile), dst.Bytes(), 0755)`
`42`	`57`	`checkErr(err)`
`43`	`58`	`}`
`44`	`59`
`@@ -49,3 +64,9 @@ func getCookies() (cookies []*http.Cookie) {`
`49`	`64`	`checkErr(err)`
`50`	`65`	`return`
`51`	`66`	`}`
	`67`	`+`
	`68`	`+func saveCredential(data url.Values) {`
	`69`	`+ u := url.UserPassword(data.Get("login"), data.Get("password"))`
	`70`	`+ err := ioutil.WriteFile(getPath(credentialsFile), []byte(u.String()), 0755)`
	`71`	`+ checkErr(err)`
	`72`	`+}`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,16 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`	`)`
`8`	`8`
`9`		`-func AccountsLogin(userstring, pwd string) (*http.Response, error) {`
	`9`	`+func AccountsLogin(username, password string) (*http.Response, error) {`
`10`	`10`	`resp, err := http.Head(AccountsLoginUrl)`
`11`	`11`	`checkErr(err)`
	`12`	`+ defer resp.Body.Close()`
`12`	`13`	`cookies := resp.Cookies()`
`13`	`14`	`saveCookies(cookies)`
`14`	`15`	`csrftoken := getCsrfToken(cookies)`
`15`	`16`	`data := url.Values{`
`16`		`- "login": {user},`
`17`		`- "password": {pwd},`
	`17`	`+ "login": {username},`
	`18`	`+ "password": {password},`
`18`	`19`	`"csrfmiddlewaretoken": {csrftoken},`
`19`	`20`	`}`
`20`	`21`	`req, err := http.NewRequest("POST", AccountsLoginUrl, strings.NewReader(data.Encode()))`
`@@ -26,6 +27,10 @@ func AccountsLogin(user string, pwd string) (*http.Response, error) {`
`26`	`27`	`}`
`27`	`28`	`resp, err = http.DefaultClient.Do(req)`
`28`	`29`	`checkErr(err)`
	`30`	`+ defer resp.Body.Close()`
`29`	`31`	`saveCookies(resp.Cookies())`
	`32`	`+ if resp.StatusCode == 200 {`
	`33`	`+ saveCredential(data)`
	`34`	`+ }`
`30`	`35`	`return resp, err`
`31`	`36`	`}`

Comments

(0)