From e74551d7750492c142d8a92cd68841dcbc4de93f Mon Sep 17 00:00:00 2001 From: Frederic Jahn Date: Mon, 6 Jan 2025 15:11:46 +0100 Subject: [PATCH 1/3] fix: use lowered id to get third party provider --- backend/thirdparty/provider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/thirdparty/provider.go b/backend/thirdparty/provider.go index adab1bbee..defd55011 100644 --- a/backend/thirdparty/provider.go +++ b/backend/thirdparty/provider.go @@ -94,7 +94,7 @@ func GetProvider(config config.ThirdParty, id string) (OAuthProvider, error) { if strings.HasPrefix(idLower, "custom_") { return getCustomThirdPartyProvider(config, idLower) } else { - return getThirdPartyProvider(config, id) + return getThirdPartyProvider(config, idLower) } } From d567438b3265a7193b01cf1bfd666d0528a705d8 Mon Sep 17 00:00:00 2001 From: Frederic Jahn Date: Mon, 6 Jan 2025 15:43:04 +0100 Subject: [PATCH 2/3] test: fix test --- backend/handler/thirdparty_auth_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/handler/thirdparty_auth_test.go b/backend/handler/thirdparty_auth_test.go index e1a54cdf1..0cfb63c1d 100644 --- a/backend/handler/thirdparty_auth_test.go +++ b/backend/handler/thirdparty_auth_test.go @@ -101,7 +101,7 @@ func (s *thirdPartySuite) TestThirdPartyHandler_Auth() { requestedRedirectTo: "https://app.test.example", expectedBaseURL: "https://login.test.example", expectedError: thirdparty.ErrorCodeInvalidRequest, - expectedErrorDescription: "unknownProvider", + expectedErrorDescription: "unknown provider", }, { name: "error redirect when requesting a redirectTo that is not allowed", From e4c9fac499a4469802e6a9d9f4236a80f6ac258a Mon Sep 17 00:00:00 2001 From: Frederic Jahn Date: Mon, 6 Jan 2025 15:44:27 +0100 Subject: [PATCH 3/3] test: increase db max lifetime --- backend/test/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/test/database.go b/backend/test/database.go index 375c1dbca..5cc4969e5 100644 --- a/backend/test/database.go +++ b/backend/test/database.go @@ -57,7 +57,7 @@ func StartDB(name string, dialect string) (*TestDB, error) { hostAndPort := resource.GetHostPort(getPortID(dialect)) dsn := getDsn(dialect, hostAndPort) - _ = resource.Expire(120) + _ = resource.Expire(300) pool.MaxWait = 120 * time.Second if err = pool.Retry(func() error {