login: Fix nil Session

sunshineplan · Dec 13, 2021 · 2851aeb · 2851aeb
1 parent 14cc7c4
commit 2851aeb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/login/kaptcha.go b/login/kaptcha.go
@@ -3,15 +3,17 @@ package login
 import (
 	"fmt"
 	"time"
+
+	"github.com/sunshineplan/gohttp"
 )
 
 func (s *Session) Kaptcha(kaptcha func(*Session) (string, error)) error {
-	if s == nil {
-		s = New()
-	}
 	if s.login == nil {
 		return ErrNilLogin
 	}
+	if s.Session == nil {
+		s.Session = gohttp.NewSession()
+	}
 
 	data, err := kaptcha(s)
 	if err != nil {

diff --git a/login/login.go b/login/login.go
@@ -50,5 +50,11 @@ func (s *Session) SetLogin(fn func(*Session, interface{}) error) *Session {
 }
 
 func (s *Session) Login() error {
+	if s.login == nil {
+		return ErrNilLogin
+	}
+	if s.Session == nil {
+		s.Session = gohttp.NewSession()
+	}
 	return s.login(s, nil)
 }