Merge 3e538674e8 into 1f049e5ebd

pkg/middleware/stored_session_test.go

@@ -642,6 +642,8 @@ var _ = Describe("Stored Session Suite", func() {
 			session         *sessionsapi.SessionState
 			expectedErr     error
 			expectSaved     bool
+			expectEnriched  bool
+			sessionEnricher func(context.Context, *sessionsapi.SessionState) error
 		}
 
 		now := time.Now()
@@ -649,6 +651,7 @@ var _ = Describe("Stored Session Suite", func() {
 		DescribeTable("when refreshing with the provider",
 			func(in refreshSessionWithProviderTableInput) {
 				saved := false
+				enriched := false
 
 				s := &storedSessionLoader{
 					store: &fakeSessionStore{
@@ -672,6 +675,13 @@ var _ = Describe("Stored Session Suite", func() {
 							return false, errors.New("error refreshing session")
 						}
 					},
+					sessionEnricher: func(_ context.Context, _ *sessionsapi.SessionState) error {
+						enriched = true
+						if in.sessionEnricher != nil {
+							return in.sessionEnricher(context.Background(), nil)
+						}
+						return nil
+					},
 				}
 
 				req := httptest.NewRequest("", "/", nil)
@@ -683,6 +693,7 @@ var _ = Describe("Stored Session Suite", func() {
 					Expect(err).ToNot(HaveOccurred())
 				}
 				Expect(saved).To(Equal(in.expectSaved))
+				Expect(enriched).To(Equal(in.expectEnriched))
 			},
 			Entry("when the provider does not refresh the session", refreshSessionWithProviderTableInput{
 				session: &sessionsapi.SessionState{
@@ -690,6 +701,7 @@ var _ = Describe("Stored Session Suite", func() {
 				},
 				expectedErr:    nil,
 				expectSaved:    false,
+				expectEnriched: false,
 			}),
 			Entry("when the provider refreshes the session", refreshSessionWithProviderTableInput{
 				session: &sessionsapi.SessionState{
@@ -697,6 +709,7 @@ var _ = Describe("Stored Session Suite", func() {
 				},
 				expectedErr:    nil,
 				expectSaved:    true,
+				expectEnriched: true,
 			}),
 			Entry("when the provider doesn't implement refresh", refreshSessionWithProviderTableInput{
 				session: &sessionsapi.SessionState{
@@ -704,6 +717,7 @@ var _ = Describe("Stored Session Suite", func() {
 				},
 				expectedErr:    nil,
 				expectSaved:    true,
+				expectEnriched: false,
 			}),
 			Entry("when the provider returns an error", refreshSessionWithProviderTableInput{
 				session: &sessionsapi.SessionState{
@@ -713,6 +727,7 @@ var _ = Describe("Stored Session Suite", func() {
 				},
 				expectedErr:    errors.New("error refreshing tokens: error refreshing session"),
 				expectSaved:    false,
+				expectEnriched: false,
 			}),
 			Entry("when the saving the session returns an error", refreshSessionWithProviderTableInput{
 				session: &sessionsapi.SessionState{
@@ -721,6 +736,18 @@ var _ = Describe("Stored Session Suite", func() {
 				},
 				expectedErr:    errors.New("error saving session: unable to save session"),
 				expectSaved:    true,
+				expectEnriched: true,
+			}),
+			Entry("when enriching the session returns an error", refreshSessionWithProviderTableInput{
+				session: &sessionsapi.SessionState{
+					RefreshToken: refresh,
+				},
+				sessionEnricher: func(_ context.Context, _ *sessionsapi.SessionState) error {
+					return errors.New("enrich error")
+				},
+				expectedErr:    errors.New("error enriching session after refresh: enrich error"),
+				expectSaved:    false,
+				expectEnriched: true,
 			}),
 		)
 	})