Revert "Remove connectordata from other structs"

This reverts commit 27f33516db343bd79b56a47ecef0fe514a35082d.

server/api_test.go

@@ -259,6 +259,7 @@ func TestRefreshToken(t *testing.T) {
 			EmailVerified: true,
 			Groups:        []string{"a", "b"},
 		},
+		ConnectorData: []byte(`{"some":"data"}`),
 	}
 
 	if err := s.CreateRefresh(r); err != nil {

server/handlers.go

@@ -490,6 +490,7 @@ func (s *Server) finalizeLogin(identity connector.Identity, authReq storage.Auth
 	updater := func(a storage.AuthRequest) (storage.AuthRequest, error) {
 		a.LoggedIn = true
 		a.Claims = claims
+		a.ConnectorData = identity.ConnectorData
 		return a, nil
 	}
 	if err := s.storage.UpdateAuthRequest(authReq.ID, updater); err != nil {
@@ -629,6 +630,7 @@ func (s *Server) sendCodeResponse(w http.ResponseWriter, r *http.Request, authRe
 				Claims:        authReq.Claims,
 				Expiry:        s.now().Add(time.Minute * 30),
 				RedirectURI:   authReq.RedirectURI,
+				ConnectorData: authReq.ConnectorData,
 			}
 			if err := s.storage.CreateAuthCode(code); err != nil {
 				s.logger.Errorf("Failed to create auth code: %v", err)
@@ -831,6 +833,7 @@ func (s *Server) handleAuthCode(w http.ResponseWriter, r *http.Request, client s
 			Scopes:        authCode.Scopes,
 			Claims:        authCode.Claims,
 			Nonce:         authCode.Nonce,
+			ConnectorData: authCode.ConnectorData,
 			CreatedAt:     s.now(),
 			LastUsed:      s.now(),
 		}

storage/storage.go

@@ -182,6 +182,7 @@ type AuthRequest struct {
 	// The connector used to login the user and any data the connector wishes to persists.
 	// Set when the user authenticates.
 	ConnectorID   string
+	ConnectorData []byte
 }
 
 // AuthCode represents a code which can be exchanged for an OAuth2 token response.
@@ -213,6 +214,7 @@ type AuthCode struct {
 
 	// Authentication data provided by an upstream source.
 	ConnectorID   string
+	ConnectorData []byte
 	Claims        Claims
 
 	Expiry time.Time
@@ -236,6 +238,7 @@ type RefreshToken struct {
 
 	// Authentication data provided by an upstream source.
 	ConnectorID   string
+	ConnectorData []byte
 	Claims        Claims
 
 	// Scopes present in the initial request. Refresh requests may specify a set