go-packages/paypale
1
0
Fork 0
forked from go-packages/paypal
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: get access token automatically (#261)

Browse Source
This commit is contained in:
Penny 2024-02-01 17:07:34 +08:00 committed by GitHub
parent 26473c3630
commit 5fddf59f71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -119,8 +119,6 @@ import "github.com/plutov/paypal/v4"
// Create a client instance // Create a client instance
c, err := paypal.NewClient("clientID", "secretID", paypal.APIBaseSandBox) c, err := paypal.NewClient("clientID", "secretID", paypal.APIBaseSandBox)
c.SetLog(os.Stdout) // Set log to terminal stdout c.SetLog(os.Stdout) // Set log to terminal stdout
accessToken, err := c.GetAccessToken(context.Background())
``` ```
## Get authorization by ID ## Get authorization by ID

18
client.go
View File

@ -143,18 +143,16 @@ func (c *Client) SendWithAuth(req *http.Request, v interface{}) error {
// Note: Here we do not want to `defer c.Unlock()` because we need `c.Send(...)` // Note: Here we do not want to `defer c.Unlock()` because we need `c.Send(...)`
// to happen outside of the locked section. // to happen outside of the locked section.
if c.Token != nil { if c.Token == nil || (!c.tokenExpiresAt.IsZero() && time.Until(c.tokenExpiresAt) < RequestNewTokenBeforeExpiresIn) {
if !c.tokenExpiresAt.IsZero() && c.tokenExpiresAt.Sub(time.Now()) < RequestNewTokenBeforeExpiresIn { // c.Token will be updated in GetAccessToken call
// c.Token will be updated in GetAccessToken call if _, err := c.GetAccessToken(req.Context()); err != nil {
if _, err := c.GetAccessToken(req.Context()); err != nil { // c.Unlock()
// c.Unlock() c.mu.Unlock()
c.mu.Unlock() return err
return err
}
} }
req.Header.Set("Authorization", "Bearer "+c.Token.Token)
} }
req.Header.Set("Authorization", "Bearer "+c.Token.Token)
// Unlock the client mutex before sending the request, this allows multiple requests // Unlock the client mutex before sending the request, this allows multiple requests
// to be in progress at the same time. // to be in progress at the same time.
// c.Unlock() // c.Unlock()

18
client_test.go
View File

@ -65,19 +65,15 @@ func (c *Client) sendWithAuth(req *http.Request, v interface{}) error {
err := errors.New("TryLock succeeded inside sendWithAuth with mutex locked") err := errors.New("TryLock succeeded inside sendWithAuth with mutex locked")
return err return err
} }
if c.Token == nil || (!c.tokenExpiresAt.IsZero() && time.Until(c.tokenExpiresAt) < RequestNewTokenBeforeExpiresIn) {
if c.Token != nil { // c.Token will be updated in GetAccessToken call
if !c.tokenExpiresAt.IsZero() && c.tokenExpiresAt.Sub(time.Now()) < RequestNewTokenBeforeExpiresIn { if _, err := c.GetAccessToken(req.Context()); err != nil {
// c.Token will be updated in GetAccessToken call // c.Unlock()
if _, err := c.GetAccessToken(req.Context()); err != nil { c.mu.Unlock()
// c.Unlock() return err
c.mu.Unlock()
return err
}
} }
req.Header.Set("Authorization", "Bearer "+c.Token.Token)
} }
req.Header.Set("Authorization", "Bearer "+c.Token.Token)
// Unlock the client mutex before sending the request, this allows multiple requests // Unlock the client mutex before sending the request, this allows multiple requests
// to be in progress at the same time. // to be in progress at the same time.
// c.Unlock() // c.Unlock()