Clone/aliyunpan
1
0
Fork 0
mirror of https://github.com/tickstep/aliyunpan.git synced 2025-02-02 21:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix webdav token plugin callback error #203

Browse Source
This commit is contained in:
xiaoyaofenfen 2022-12-12 14:07:58 +08:00
parent fb705365b1
commit b6780931cc
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/command/utils.go
View File

@ -134,6 +134,16 @@ func RefreshTokenInNeed(activeUser *config.PanUser) bool {
return false return false
} }
pluginManger := plugins.NewPluginManager(config.GetPluginDir())
plugin, _ := pluginManger.GetPlugin()
params := &plugins.UserTokenRefreshFinishParams{
Result: "success",
Message: "",
OldToken: "",
NewToken: "",
UpdatedAt: utils.NowTimeStr(),
}
// refresh expired token // refresh expired token
if activeUser.PanClient() != nil { if activeUser.PanClient() != nil {
if len(activeUser.WebToken.RefreshToken) > 0 { if len(activeUser.WebToken.RefreshToken) > 0 {
@ -144,24 +154,27 @@ func RefreshTokenInNeed(activeUser *config.PanUser) bool {
// need update refresh token // need update refresh token
logger.Verboseln("access token expired, get new from refresh token") logger.Verboseln("access token expired, get new from refresh token")
if wt, er := aliyunpan.GetAccessTokenFromRefreshToken(activeUser.RefreshToken); er == nil { if wt, er := aliyunpan.GetAccessTokenFromRefreshToken(activeUser.RefreshToken); er == nil {
params.Result = "success"
params.OldToken = activeUser.RefreshToken
params.NewToken = wt.RefreshToken
activeUser.RefreshToken = wt.RefreshToken activeUser.RefreshToken = wt.RefreshToken
activeUser.WebToken = *wt activeUser.WebToken = *wt
activeUser.PanClient().UpdateToken(*wt) activeUser.PanClient().UpdateToken(*wt)
logger.Verboseln("get new access token success") logger.Verboseln("get new access token success")
// plugin callback
if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
}
return true return true
} else { } else {
// token refresh error // token refresh error
// if token has expired, callback plugin api for notify // if token has expired, callback plugin api for notify
if now.Unix() >= expiredTime.Unix() { if now.Unix() >= expiredTime.Unix() {
pluginManger := plugins.NewPluginManager(config.GetPluginDir()) params.Result = "fail"
plugin, _ := pluginManger.GetPlugin() params.Message = er.Error()
params := &plugins.UserTokenRefreshFinishParams{ params.OldToken = activeUser.RefreshToken
Result: "fail",
Message: er.Error(),
OldToken: activeUser.RefreshToken,
NewToken: "",
UpdatedAt: utils.NowTimeStr(),
}
if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil { if er1 := plugin.UserTokenRefreshFinishCallback(plugins.GetContext(activeUser), params); er1 != nil {
logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error()) logger.Verbosef("UserTokenRefreshFinishCallback error: " + er1.Error())
} }