mirror of
https://github.com/OpenListTeam/OpenList.git
synced 2025-09-19 20:26:26 +08:00
add text output for error message (#210)
* mod rank for AccessToken * del alist_v2 * add error message from remote --------- Co-authored-by: Suyunmeng <sumengjing@outlook.com>
This commit is contained in:
@ -26,6 +26,7 @@ func (d *AliyundriveOpen) _refreshToken() (string, string, error) {
|
|||||||
var resp struct {
|
var resp struct {
|
||||||
RefreshToken string `json:"refresh_token"`
|
RefreshToken string `json:"refresh_token"`
|
||||||
AccessToken string `json:"access_token"`
|
AccessToken string `json:"access_token"`
|
||||||
|
ErrorMessage string `json:"text"`
|
||||||
}
|
}
|
||||||
_, err := base.RestyClient.R().
|
_, err := base.RestyClient.R().
|
||||||
SetResult(&resp).
|
SetResult(&resp).
|
||||||
@ -39,6 +40,9 @@ func (d *AliyundriveOpen) _refreshToken() (string, string, error) {
|
|||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
||||||
|
if resp.ErrorMessage != "" {
|
||||||
|
return "", "", fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
|
||||||
|
}
|
||||||
return "", "", fmt.Errorf("empty token returned from official API")
|
return "", "", fmt.Errorf("empty token returned from official API")
|
||||||
}
|
}
|
||||||
d.AccessToken = resp.AccessToken
|
d.AccessToken = resp.AccessToken
|
||||||
|
@ -37,6 +37,7 @@ func (d *BaiduNetdisk) _refreshToken() error {
|
|||||||
var resp struct {
|
var resp struct {
|
||||||
RefreshToken string `json:"refresh_token"`
|
RefreshToken string `json:"refresh_token"`
|
||||||
AccessToken string `json:"access_token"`
|
AccessToken string `json:"access_token"`
|
||||||
|
ErrorMessage string `json:"text"`
|
||||||
}
|
}
|
||||||
_, err := base.RestyClient.R().
|
_, err := base.RestyClient.R().
|
||||||
SetResult(&resp).
|
SetResult(&resp).
|
||||||
@ -50,6 +51,9 @@ func (d *BaiduNetdisk) _refreshToken() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
||||||
|
if resp.ErrorMessage != "" {
|
||||||
|
return fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
|
||||||
|
}
|
||||||
return fmt.Errorf("empty token returned from official API")
|
return fmt.Errorf("empty token returned from official API")
|
||||||
}
|
}
|
||||||
d.AccessToken = resp.AccessToken
|
d.AccessToken = resp.AccessToken
|
||||||
|
@ -44,6 +44,7 @@ func (d *GoogleDrive) refreshToken() error {
|
|||||||
var resp struct {
|
var resp struct {
|
||||||
RefreshToken string `json:"refresh_token"`
|
RefreshToken string `json:"refresh_token"`
|
||||||
AccessToken string `json:"access_token"`
|
AccessToken string `json:"access_token"`
|
||||||
|
ErrorMessage string `json:"text"`
|
||||||
}
|
}
|
||||||
_, err := base.RestyClient.R().
|
_, err := base.RestyClient.R().
|
||||||
SetResult(&resp).
|
SetResult(&resp).
|
||||||
@ -57,6 +58,9 @@ func (d *GoogleDrive) refreshToken() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
||||||
|
if resp.ErrorMessage != "" {
|
||||||
|
return fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
|
||||||
|
}
|
||||||
return fmt.Errorf("empty token returned from official API")
|
return fmt.Errorf("empty token returned from official API")
|
||||||
}
|
}
|
||||||
d.AccessToken = resp.AccessToken
|
d.AccessToken = resp.AccessToken
|
||||||
|
@ -78,6 +78,7 @@ func (d *Onedrive) _refreshToken() error {
|
|||||||
var resp struct {
|
var resp struct {
|
||||||
RefreshToken string `json:"refresh_token"`
|
RefreshToken string `json:"refresh_token"`
|
||||||
AccessToken string `json:"access_token"`
|
AccessToken string `json:"access_token"`
|
||||||
|
ErrorMessage string `json:"text"`
|
||||||
}
|
}
|
||||||
_, err := base.RestyClient.R().
|
_, err := base.RestyClient.R().
|
||||||
SetResult(&resp).
|
SetResult(&resp).
|
||||||
@ -91,6 +92,9 @@ func (d *Onedrive) _refreshToken() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
||||||
|
if resp.ErrorMessage != "" {
|
||||||
|
return fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
|
||||||
|
}
|
||||||
return fmt.Errorf("empty token returned from official API")
|
return fmt.Errorf("empty token returned from official API")
|
||||||
}
|
}
|
||||||
d.AccessToken = resp.AccessToken
|
d.AccessToken = resp.AccessToken
|
||||||
|
@ -20,6 +20,7 @@ func (d *YandexDisk) refreshToken() error {
|
|||||||
var resp struct {
|
var resp struct {
|
||||||
RefreshToken string `json:"refresh_token"`
|
RefreshToken string `json:"refresh_token"`
|
||||||
AccessToken string `json:"access_token"`
|
AccessToken string `json:"access_token"`
|
||||||
|
ErrorMessage string `json:"text"`
|
||||||
}
|
}
|
||||||
_, err := base.RestyClient.R().
|
_, err := base.RestyClient.R().
|
||||||
SetResult(&resp).
|
SetResult(&resp).
|
||||||
@ -33,6 +34,9 @@ func (d *YandexDisk) refreshToken() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
if resp.RefreshToken == "" || resp.AccessToken == "" {
|
||||||
|
if resp.ErrorMessage != "" {
|
||||||
|
return fmt.Errorf("failed to refresh token: %s", resp.ErrorMessage)
|
||||||
|
}
|
||||||
return fmt.Errorf("empty token returned from official API")
|
return fmt.Errorf("empty token returned from official API")
|
||||||
}
|
}
|
||||||
d.AccessToken = resp.AccessToken
|
d.AccessToken = resp.AccessToken
|
||||||
|
Reference in New Issue
Block a user