From ae56b2b60344c48126106d07062de3ddda1fa397 Mon Sep 17 00:00:00 2001 From: Gil Shapira Date: Tue, 19 Dec 2023 14:15:43 +0200 Subject: [PATCH] Update config --- descope/api/client_test.go | 3 ++- descope/client/client.go | 8 +++++++- descope/client/config.go | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/descope/api/client_test.go b/descope/api/client_test.go index faeca0fb..7be47c6a 100644 --- a/descope/api/client_test.go +++ b/descope/api/client_test.go @@ -255,7 +255,8 @@ func TestRoutesSignInOTP(t *testing.T) { func TestSkipVerifyValue(t *testing.T) { require.True(t, CertificateVerifyNever.SkipVerifyValue("foo")) require.False(t, CertificateVerifyAlways.SkipVerifyValue("foo")) - require.False(t, CertificateVerifyAutomatic.SkipVerifyValue("https://api.descope.com")) + require.False(t, CertificateVerifyAutomatic.SkipVerifyValue(defaultURL)) + require.False(t, CertificateVerifyAutomatic.SkipVerifyValue(defaultURL+"/v1/auth")) require.False(t, CertificateVerifyAutomatic.SkipVerifyValue(" http")) require.True(t, CertificateVerifyAutomatic.SkipVerifyValue("https://localhost")) require.True(t, CertificateVerifyAutomatic.SkipVerifyValue("https://127.0.0.1")) diff --git a/descope/client/client.go b/descope/client/client.go index 659836c8..51e350ba 100644 --- a/descope/client/client.go +++ b/descope/client/client.go @@ -49,7 +49,13 @@ func NewWithConfig(config *Config) (*DescopeClient, error) { } config.setManagementKey() - c := api.NewClient(api.ClientParams{BaseURL: config.DescopeBaseURL, CustomDefaultHeaders: config.CustomDefaultHeaders, DefaultClient: config.DefaultClient, ProjectID: config.ProjectID, VerifyServerCertificate: config.VerifyServerCertificate}) + c := api.NewClient(api.ClientParams{ + ProjectID: config.ProjectID, + BaseURL: config.DescopeBaseURL, + DefaultClient: config.DefaultClient, + CustomDefaultHeaders: config.CustomDefaultHeaders, + CertificateVerify: config.CertificateVerify, + }) authService, err := auth.NewAuth(auth.AuthParams{ ProjectID: config.ProjectID, diff --git a/descope/client/config.go b/descope/client/config.go index bab6e4cb..6a59c556 100644 --- a/descope/client/config.go +++ b/descope/client/config.go @@ -24,8 +24,8 @@ type Config struct { DescopeBaseURL string // DefaultClient (optional, http.DefaultClient) - override the default client used to Do the actual http request. DefaultClient api.IHttpClient - // VerifyServerCertificate (optional) - verify the server certificate - VerifyServerCertificate bool + // CertificateVerifyMode (optional, CertificateVerifyAutomatic) - override the default server certificate verification behavior + CertificateVerify api.CertificateVerifyMode // CustomDefaultHeaders (optional, nil) - add custom headers to all requests used to communicate with descope services. CustomDefaultHeaders map[string]string // LogLevel (optional, LogNone) - set a log level (Debug/Info/None) for the sdk to use when logging.