From 1441449b8135633b86212e28baae7ef347b2951d Mon Sep 17 00:00:00 2001
From: Kevin Kreitner <kevinkreitner@gmail.com>
Date: Sun, 12 Jan 2025 18:14:29 +0100
Subject: [PATCH] Fix tests

---
 providers/cidaas.go      |  2 +-
 providers/cidaas_test.go | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/providers/cidaas.go b/providers/cidaas.go
index fcc955c2..1d526dfc 100644
--- a/providers/cidaas.go
+++ b/providers/cidaas.go
@@ -72,7 +72,7 @@ func (p *CIDAASProvider) EnrichSession(ctx context.Context, s *sessions.SessionS
 
 	// Try to get missing emails or groups from a profileURL
 	if err := p.enrichFromUserinfoEndpoint(ctx, s); err != nil {
-		logger.Errorf("Warning: Profile URL request failed: %w", err)
+		logger.Errorf("Warning: Profile URL request failed: %s", err)
 	}
 
 	// If a mandatory email wasn't set, error at this point.
diff --git a/providers/cidaas_test.go b/providers/cidaas_test.go
index 549d23e5..30c2274a 100644
--- a/providers/cidaas_test.go
+++ b/providers/cidaas_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -46,8 +47,11 @@ func newCidaasProvider(serverURL *url.URL) *CIDAASProvider {
 			&oidc.Config{ClientID: oidcClientID},
 		),
 	}
+	cfg := options.Provider{
+		Type: options.CidaasProvider,
+	}
 
-	p := NewCIDAASProvider(providerData)
+	p := NewCIDAASProvider(providerData, cfg)
 
 	return p
 }
@@ -394,7 +398,11 @@ func TestCidaasProvider_EnrichSession(t *testing.T) {
 			defer server.Close()
 
 			err = provider.EnrichSession(context.Background(), tc.ExistingSession)
-			assert.Equal(t, tc.ExpectedError, err)
+			if tc.ExpectedError != nil {
+				assert.EqualError(t, err, tc.ExpectedError.Error())
+			} else {
+				assert.NoError(t, err)
+			}
 			assert.Equal(t, *tc.ExpectedSession, *tc.ExistingSession)
 		})
 	}
@@ -471,7 +479,11 @@ func TestCidaasProvider_RefreshSession(t *testing.T) {
 			var refreshed bool
 			refreshed, err = provider.RefreshSession(context.Background(), tc.ExistingSession)
 
-			assert.Equal(t, tc.ExpectedError, err)
+			if tc.ExpectedError != nil {
+				assert.EqualError(t, err, tc.ExpectedError.Error())
+			} else {
+				assert.NoError(t, err)
+			}
 			assert.Equal(t, tc.ExpectedRefreshed, refreshed)
 			assert.Equal(t, tc.ExpectedEmail, tc.ExistingSession.Email)
 			assert.Equal(t, tc.ExpectedUser, tc.ExistingSession.User)