From 19ad7daa7f71aaf062dd4f05a15034eed916e11c Mon Sep 17 00:00:00 2001
From: Joel Speed <Joel.speed@hotmail.co.uk>
Date: Tue, 23 Apr 2019 10:59:36 +0100
Subject: [PATCH] Use old ConnectorData before session.ConnectorData

---
 server/handlers.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/handlers.go b/server/handlers.go
index 80965daf..35164717 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -1003,6 +1003,9 @@ func (s *Server) handleRefreshToken(w http.ResponseWriter, r *http.Request, clie
 			s.logger.Errorf("failed to get offline session: %v", err)
 			return
 		}
+	} else if len(refresh.ConnectorData) > 0 {
+		// Use the old connector data if it exists, should be deleted once used
+		connectorData = session.ConnectorData
 	} else {
 		connectorData = session.ConnectorData
 	}
@@ -1087,6 +1090,9 @@ func (s *Server) handleRefreshToken(w http.ResponseWriter, r *http.Request, clie
 		old.Claims.EmailVerified = ident.EmailVerified
 		old.Claims.Groups = ident.Groups
 		old.LastUsed = lastUsed
+
+		// ConnectorData has been moved to OfflineSession
+		old.ConnectorData = []byte{}
 		return old, nil
 	}