summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-10-17 12:03:04 +0200
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-10-17 12:03:04 +0200
commitd6b10d67deb142ad7dedeee9eebb66079b69e328 (patch)
tree9b6e93442e637cf4dc5464b21f583b1c40c5fbae
parent8635f8bbf5e4383fb2db6774757157f29195aec1 (diff)
Client + Server: Delete tokens before attempting a login for renew
-rw-r--r--client.go1
-rw-r--r--internal/server/common.go4
2 files changed, 5 insertions, 0 deletions
diff --git a/client.go b/client.go
index c7c6276..4f6de92 100644
--- a/client.go
+++ b/client.go
@@ -1081,6 +1081,7 @@ func (client *Client) RenewSession() error {
return &types.WrappedErrorMessage{Message: errorMessage, Err: currentServerErr}
}
+ server.MarkTokensForRenew(currentServer)
loginErr := client.ensureLogin(currentServer)
if loginErr != nil {
client.Logger.Warning(
diff --git a/internal/server/common.go b/internal/server/common.go
index c4ca0ef..37f9bf2 100644
--- a/internal/server/common.go
+++ b/internal/server/common.go
@@ -282,6 +282,10 @@ func MarkTokenExpired(server Server) {
server.GetOAuth().Token.ExpiredTimestamp = util.GetCurrentTime()
}
+func MarkTokensForRenew(server Server) {
+ server.GetOAuth().Token = oauth.OAuthToken{}
+}
+
func EnsureTokens(server Server) error {
ensureErr := server.GetOAuth().EnsureTokens()
if ensureErr != nil {