diff --git a/unit_testing/mock_objects.h b/unit_testing/mock_objects.h index a35514d4f..2185c2856 100644 --- a/unit_testing/mock_objects.h +++ b/unit_testing/mock_objects.h @@ -231,7 +231,7 @@ class MOCK_AUTH_UTIL : public AUTH_UTIL { class MOCK_SAML_HTTP_CLIENT : public SAML_HTTP_CLIENT { public: - MOCK_SAML_HTTP_CLIENT(std::string host) : SAML_HTTP_CLIENT(host) {}; + MOCK_SAML_HTTP_CLIENT(std::string host, int connect_timeout, int socket_timeout, bool enable_ssl) : SAML_HTTP_CLIENT(host, connect_timeout, socket_timeout, enable_ssl) {}; MOCK_METHOD(nlohmann::json, post, (const std::string&, const nlohmann::json&)); MOCK_METHOD(nlohmann::json, get, (const std::string&)); }; diff --git a/unit_testing/okta_proxy_test.cc b/unit_testing/okta_proxy_test.cc index b13291489..0f1051eb5 100644 --- a/unit_testing/okta_proxy_test.cc +++ b/unit_testing/okta_proxy_test.cc @@ -97,7 +97,7 @@ class OktaProxyTest : public testing::Test { ds->opt_AUTH_PORT = TEST_PORT; ds->opt_AUTH_EXPIRATION = TEST_EXPIRATION; - mock_saml_http_client = std::make_shared(TEST_ENDPOINT); + mock_saml_http_client = std::make_shared(TEST_ENDPOINT, 10, 10, true); mock_auth_util = std::make_shared(); } diff --git a/util/installer.cc b/util/installer.cc index 90fab4fe9..d8c8c551b 100644 --- a/util/installer.cc +++ b/util/installer.cc @@ -1057,9 +1057,9 @@ void DataSource::reset() { this->opt_AUTH_PORT.set_default(opt_PORT); this->opt_AUTH_EXPIRATION.set_default(900); // 15 minutes - this->opt_ENABLE_SSL.set_default(true); this->opt_CLIENT_CONNECT_TIMEOUT.set_default(60); this->opt_CLIENT_SOCKET_TIMEOUT.set_default(60); + this->opt_ENABLE_SSL.set_default(true); } SQLWSTRING DataSource::to_kvpair(SQLWCHAR delim) {