Skip to content

Commit a28d6d5

Browse files
authored
fix(123_open): fix token refresh (#1121)
1 parent e59d223 commit a28d6d5

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

drivers/123_open/util.go

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,24 @@ func (d *Open123) Request(apiInfo *ApiInfo, method string, callback base.ReqCall
8686
}
8787

8888
func (d *Open123) flushAccessToken() error {
89-
if d.Addition.ClientID != "" {
90-
if d.Addition.ClientSecret != "" {
89+
if d.ClientID != "" {
90+
if d.RefreshToken != "" {
91+
var resp RefreshTokenResp
92+
_, err := d.Request(RefreshToken, http.MethodPost, func(req *resty.Request) {
93+
req.SetQueryParam("client_id", d.ClientID)
94+
if d.ClientSecret != "" {
95+
req.SetQueryParam("client_secret", d.ClientSecret)
96+
}
97+
req.SetQueryParam("grant_type", "refresh_token")
98+
req.SetQueryParam("refresh_token", d.RefreshToken)
99+
}, &resp)
100+
if err != nil {
101+
return err
102+
}
103+
d.AccessToken = resp.AccessToken
104+
d.RefreshToken = resp.RefreshToken
105+
op.MustSaveDriverStorage(d)
106+
} else if d.ClientSecret != "" {
91107
var resp AccessTokenResp
92108
_, err := d.Request(AccessToken, http.MethodPost, func(req *resty.Request) {
93109
req.SetBody(base.Json{
@@ -100,19 +116,6 @@ func (d *Open123) flushAccessToken() error {
100116
}
101117
d.AccessToken = resp.Data.AccessToken
102118
op.MustSaveDriverStorage(d)
103-
} else if d.Addition.RefreshToken != "" {
104-
var resp RefreshTokenResp
105-
_, err := d.Request(RefreshToken, http.MethodPost, func(req *resty.Request) {
106-
req.SetQueryParam("client_id", d.ClientID)
107-
req.SetQueryParam("grant_type", "refresh_token")
108-
req.SetQueryParam("refresh_token", d.Addition.RefreshToken)
109-
}, &resp)
110-
if err != nil {
111-
return err
112-
}
113-
d.AccessToken = resp.AccessToken
114-
d.RefreshToken = resp.RefreshToken
115-
op.MustSaveDriverStorage(d)
116119
}
117120
}
118121
return nil

0 commit comments

Comments
 (0)