From d6b10d67deb142ad7dedeee9eebb66079b69e328 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 17 Oct 2022 12:03:04 +0200
Subject: Client + Server: Delete tokens before attempting a login for renew

---
 client.go                 | 1 +
 internal/server/common.go | 4 ++++
 2 files changed, 5 insertions(+)

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 {
-- 
cgit v1.2.3