Use custom token endpoint url from credentials (#1433)

The token provider read from a credentials file in the method
`AuthenticationCredentials::ReadFromStream()` was not used for
the authentication request.

Relates-To: OLPEDGE-2834

Signed-off-by: Mykola Malik <[email protected]>

Author: mykolamalik

olp-cpp-sdk-authentication/include/olp/authentication/Settings.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 HERE Europe B.V.
+ * Copyright (C) 2019-2023 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,8 +53,7 @@ struct AUTHENTICATION_API Settings {
    *
    * @param credentials Your access credentials to the HERE platform.
    */
-  Settings(AuthenticationCredentials credentials)
-      : credentials(std::move(credentials)) {}
+  explicit Settings(AuthenticationCredentials credentials);
 
   /**
    * @brief The access key ID and access key secret that you got from the HERE
@@ -86,7 +85,7 @@ struct AUTHENTICATION_API Settings {
    * @note Only standard OAuth2 Token URLs (those ending in `oauth2/token`) are
    * supported.
    */
-  std::string token_endpoint_url{kHereAccountProductionTokenUrl};
+  std::string token_endpoint_url;
 
   /**
    * @brief Uses system system time in authentication requests rather than

olp-cpp-sdk-authentication/src/Settings.cpp

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 HERE Europe B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * License-Filename: LICENSE
+ */
+
+#include "olp/authentication/Settings.h"
+
+#include <utility>
+
+namespace olp {
+namespace authentication {
+
+Settings::Settings(AuthenticationCredentials credentials)
+    : credentials(std::move(credentials)),
+      token_endpoint_url{this->credentials.GetEndpointUrl().empty()
+                             ? kHereAccountProductionTokenUrl
+                             : this->credentials.GetEndpointUrl()} {}
+
+}  // namespace authentication
+}  // namespace olp

tests/integration/olp-cpp-sdk-authentication/TokenProviderTest.cpp

@@ -482,4 +482,68 @@ TEST_F(TokenProviderTest, CancellableProvider) {
   }
 }
 
+TEST_F(TokenProviderTest, CustomEndpoint) {
+  const std::string kCustomTokenEndpoint{
+      "https://custom.token.endpoint/oauth2/token"};
+  const std::string kAnotherCustomTokenEndpoint{
+      "https://another.custom.token.endpoint/oauth2/token"};
+  const int kOkStatusCode = http::HttpStatusCode::OK;
+  authentication::Settings token_provider_settings(
+      {"fake.key.id", "fake.key.secret", kCustomTokenEndpoint});
+  token_provider_settings.task_scheduler = settings_.task_scheduler;
+  token_provider_settings.network_request_handler =
+      settings_.network_request_handler;
+  token_provider_settings.use_system_time = true;
+  token_provider_settings.retry_settings.max_attempts = 1;  // Disable retries
+
+  {
+    SCOPED_TRACE("Use URL from credentials");
+
+    EXPECT_CALL(*network_mock_,
+                Send(IsPostRequest(kCustomTokenEndpoint), _, _, _, _))
+        .WillOnce(
+            ReturnHttpResponse(GetResponse(kOkStatusCode), kResponseValidJson));
+
+    const authentication::TokenProviderDefault token_provider(
+        token_provider_settings);
+
+    client::CancellationContext context;
+    const auto token_response = token_provider(context);
+    ASSERT_TRUE(token_response);
+    EXPECT_EQ(token_response.GetResult().GetAccessToken(), kResponseToken);
+
+    EXPECT_TRUE(token_provider);
+    EXPECT_EQ(token_provider.GetHttpStatusCode(), kOkStatusCode);
+
+    EXPECT_EQ(token_provider.GetErrorResponse().code, 0);
+
+    testing::Mock::VerifyAndClearExpectations(network_mock_.get());
+  }
+
+  {
+    SCOPED_TRACE("Override URL");
+
+    EXPECT_CALL(*network_mock_,
+                Send(IsPostRequest(kAnotherCustomTokenEndpoint), _, _, _, _))
+        .WillOnce(
+            ReturnHttpResponse(GetResponse(kOkStatusCode), kResponseValidJson));
+
+    token_provider_settings.token_endpoint_url = kAnotherCustomTokenEndpoint;
+    const authentication::TokenProviderDefault token_provider(
+        token_provider_settings);
+
+    client::CancellationContext context;
+    const auto token_response = token_provider(context);
+    ASSERT_TRUE(token_response);
+    EXPECT_EQ(token_response.GetResult().GetAccessToken(), kResponseToken);
+
+    EXPECT_TRUE(token_provider);
+    EXPECT_EQ(token_provider.GetHttpStatusCode(), kOkStatusCode);
+
+    EXPECT_EQ(token_provider.GetErrorResponse().code, 0);
+
+    testing::Mock::VerifyAndClearExpectations(network_mock_.get());
+  }
+}
+
 }  // namespace