refactor auth api
This commit is contained in:
parent
2de5a50e74
commit
f257b131ff
3 changed files with 71 additions and 31 deletions
89
api.go
89
api.go
|
|
@ -14,36 +14,11 @@ const bearerToken string = "AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K
|
|||
func (s *Scraper) RequestAPI(req *http.Request, target interface{}) error {
|
||||
s.wg.Wait()
|
||||
if s.delay > 0 {
|
||||
defer func() {
|
||||
s.wg.Add(1)
|
||||
go func() {
|
||||
time.Sleep(time.Second * time.Duration(s.delay))
|
||||
s.wg.Done()
|
||||
}()
|
||||
}()
|
||||
defer s.delayRequest()
|
||||
}
|
||||
|
||||
if !s.isLogged {
|
||||
if !s.IsGuestToken() || s.guestCreatedAt.Before(time.Now().Add(-time.Hour*3)) {
|
||||
err := s.GetGuestToken()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
req.Header.Set("X-Guest-Token", s.guestToken)
|
||||
}
|
||||
|
||||
if s.oAuthToken != "" && s.oAuthSecret != "" {
|
||||
req.Header.Set("Authorization", s.sign(req.Method, req.URL))
|
||||
} else {
|
||||
req.Header.Set("Authorization", "Bearer "+s.bearerToken)
|
||||
}
|
||||
|
||||
for _, cookie := range s.client.Jar.Cookies(req.URL) {
|
||||
if cookie.Name == "ct0" {
|
||||
req.Header.Set("X-CSRF-Token", cookie.Value)
|
||||
break
|
||||
}
|
||||
if err := s.prepareRequest(req); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
resp, err := s.client.Do(req)
|
||||
|
|
@ -52,13 +27,66 @@ func (s *Scraper) RequestAPI(req *http.Request, target interface{}) error {
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
return s.handleResponse(resp, target)
|
||||
}
|
||||
|
||||
func (s *Scraper) delayRequest() {
|
||||
s.wg.Add(1)
|
||||
go func() {
|
||||
time.Sleep(time.Second * time.Duration(s.delay))
|
||||
s.wg.Done()
|
||||
}()
|
||||
}
|
||||
|
||||
func (s *Scraper) prepareRequest(req *http.Request) error {
|
||||
req.Header.Set("User-Agent", s.userAgent)
|
||||
|
||||
if !s.isLogged {
|
||||
if err := s.setGuestToken(req); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
s.setAuthorizationHeader(req)
|
||||
s.setCSRFToken(req)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Scraper) setGuestToken(req *http.Request) error {
|
||||
if !s.IsGuestToken() || s.guestCreatedAt.Before(time.Now().Add(-time.Hour*3)) {
|
||||
if err := s.GetGuestToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
req.Header.Set("X-Guest-Token", s.guestToken)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Scraper) setAuthorizationHeader(req *http.Request) {
|
||||
if s.oAuthToken != "" && s.oAuthSecret != "" {
|
||||
req.Header.Set("Authorization", s.sign(req.Method, req.URL))
|
||||
} else {
|
||||
req.Header.Set("Authorization", "Bearer "+s.bearerToken)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Scraper) setCSRFToken(req *http.Request) {
|
||||
for _, cookie := range s.client.Jar.Cookies(req.URL) {
|
||||
if cookie.Name == "ct0" {
|
||||
req.Header.Set("X-CSRF-Token", cookie.Value)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Scraper) handleResponse(resp *http.Response, target interface{}) error {
|
||||
content, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
statusOK := resp.StatusCode >= 200 && resp.StatusCode < 300
|
||||
if !statusOK {
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return fmt.Errorf("response status %s: %s", resp.Status, content)
|
||||
}
|
||||
|
||||
|
|
@ -69,6 +97,7 @@ func (s *Scraper) RequestAPI(req *http.Request, target interface{}) error {
|
|||
if target == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return json.Unmarshal(content, target)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue