First batch of SonarCube reported issues fixed. (#1287)

This commit fixes some of SonarCube reported issues with major and
minor levels including:
- Effective move of passed by value parameters.
- Moved ougth to be static methods to anonymous namespace.
- Pass parameters as reference if they are not copied or moved.
- Initialize variables and members before usage.
- Add check for out-of-bound array access.

Relates-To: OAM-1366

Signed-off-by: Andrei Popescu <[email protected]>

Author: Andrei Popescu

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

@@ -215,7 +215,7 @@ class AUTHENTICATION_API UserAccountInfoResponse {
    * @param phone_number The phone number.
    */
   void SetPhoneNumber(std::string phone_number) {
-    phone_number_ = phone_number;
+    phone_number_ = std::move(phone_number);
   }
 
   /**

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

@@ -140,6 +140,22 @@ client::OlpClient::RequestBodyType GenerateAppleSignInBody(
   return std::make_shared<RequestBodyData>(content, content + data.GetSize());
 }
 
+std::string GenerateBearerHeader(const std::string& bearer_token) {
+  return std::string(http::kBearer + std::string(" ") + bearer_token);
+}
+
+client::HttpResponse CallApi(const client::OlpClient& client,
+                             const std::string& endpoint,
+                             client::CancellationContext context,
+                             const std::string& auth_header,
+                             client::OlpClient::RequestBodyType body) {
+  client::OlpClient::ParametersType headers{
+      {http::kAuthorizationHeader, auth_header}};
+
+  return client.CallApi(endpoint, "POST", {}, std::move(headers), {},
+                        std::move(body), kApplicationJson, std::move(context));
+}
+
 }  // namespace
 
 AuthenticationClientImpl::RequestTimer::RequestTimer()
@@ -187,17 +203,6 @@ olp::client::HttpResponse AuthenticationClientImpl::CallAuth(
                         std::move(body), kApplicationJson, std::move(context));
 }
 
-olp::client::HttpResponse AuthenticationClientImpl::CallAuth(
-    const client::OlpClient& client, const std::string& endpoint,
-    client::CancellationContext context, const std::string& auth_header,
-    client::OlpClient::RequestBodyType body) {
-  client::OlpClient::ParametersType headers{
-      {http::kAuthorizationHeader, auth_header}};
-
-  return client.CallApi(endpoint, "POST", {}, std::move(headers), {},
-                        std::move(body), kApplicationJson, std::move(context));
-}
-
 SignInResult AuthenticationClientImpl::ParseAuthResponse(
     int status, std::stringstream& auth_response) {
   auto document = std::make_shared<rapidjson::Document>();
@@ -435,8 +440,8 @@ client::CancellationToken AuthenticationClientImpl::SignInApple(
 
     client::OlpClient client = CreateOlpClient(settings_, boost::none);
 
-    auto auth_response = CallAuth(client, kOauthEndpoint, context,
-                                  properties.GetAccessToken(), request_body);
+    auto auth_response = CallApi(client, kOauthEndpoint, context,
+                                 properties.GetAccessToken(), request_body);
 
     auto status = auth_response.GetStatus();
     if (status < 0) {
@@ -837,13 +842,6 @@ client::CancellationToken AuthenticationClientImpl::GetMyAccount(
                  std::move(callback));
 }
 
-std::string AuthenticationClientImpl::GenerateBearerHeader(
-    const std::string& bearer_token) {
-  std::string authorization = http::kBearer + std::string(" ");
-  authorization += bearer_token;
-  return authorization;
-}
-
 client::OlpClient::RequestBodyType AuthenticationClientImpl::GenerateClientBody(
     const SignInProperties& properties) {
   rapidjson::StringBuffer data;
@@ -1041,7 +1039,8 @@ AuthenticationClientImpl::GenerateAcceptTermBody(
 }
 
 client::OlpClient::RequestBodyType
-AuthenticationClientImpl::GenerateAuthorizeBody(AuthorizeRequest properties) {
+AuthenticationClientImpl::GenerateAuthorizeBody(
+    const AuthorizeRequest& properties) {
   rapidjson::StringBuffer data;
   rapidjson::Writer<rapidjson::StringBuffer> writer(data);
   writer.StartObject();

olp-cpp-sdk-authentication/src/AuthenticationClientImpl.h

@@ -144,8 +144,6 @@ class AuthenticationClientImpl {
 
   static TimeResponse ParseTimeResponse(std::stringstream& payload);
 
-  std::string GenerateBearerHeader(const std::string& bearer_token);
-
   client::OlpClient::RequestBodyType GenerateClientBody(
       const SignInProperties& properties);
   client::OlpClient::RequestBodyType GenerateUserBody(
@@ -159,20 +157,14 @@ class AuthenticationClientImpl {
   client::OlpClient::RequestBodyType GenerateAcceptTermBody(
       const std::string& reacceptance_token);
   client::OlpClient::RequestBodyType GenerateAuthorizeBody(
-      AuthorizeRequest properties);
+      const AuthorizeRequest& properties);
 
   virtual olp::client::HttpResponse CallAuth(
       const client::OlpClient& client, const std::string& endpoint,
       client::CancellationContext context,
       const AuthenticationCredentials& credentials,
       client::OlpClient::RequestBodyType body, std::time_t timestamp);
 
-  olp::client::HttpResponse CallAuth(const client::OlpClient& client,
-                                     const std::string& endpoint,
-                                     client::CancellationContext context,
-                                     const std::string& auth_header,
-                                     client::OlpClient::RequestBodyType body);
-
   SignInResult ParseAuthResponse(int status, std::stringstream& auth_response);
 
   SignInUserResult ParseUserAuthResponse(int status,

olp-cpp-sdk-authentication/src/ResponseFromJsonBuilder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2021 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.
@@ -110,12 +110,11 @@ class ResponseFromJsonBuilder {
 
       // in the ideal scenario all fields should be processed
       for (const auto& field : fields_) {
-        OLP_SDK_LOG_WARNING_F(kLogTag,
-                              "Absent value, response=%s, field=%s",
+        OLP_SDK_LOG_WARNING_F(kLogTag, "Absent value, response=%s, field=%s",
                               kTargetTypeName.c_str(), field.first.c_str());
       }
 
-      return std::move(result);
+      return result;
     }
 
    private:

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

@@ -38,7 +38,9 @@ SignInResultImpl::SignInResultImpl() noexcept
 SignInResultImpl::SignInResultImpl(
     int status, std::string error,
     std::shared_ptr<rapidjson::Document> json_document) noexcept
-    : BaseResult(status, error, json_document), expiry_time_(), expires_in_() {
+    : BaseResult(status, std::move(error), json_document),
+      expiry_time_(),
+      expires_in_() {
   is_valid_ = this->BaseResult::IsValid() &&
               json_document->HasMember(Constants::ACCESS_TOKEN) &&
               json_document->HasMember(kTokenType) &&

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

@@ -41,7 +41,7 @@ SignInUserResultImpl::SignInUserResultImpl() noexcept
 SignInUserResultImpl::SignInUserResultImpl(
     int status, std::string error,
     std::shared_ptr<rapidjson::Document> json_document) noexcept
-    : SignInResultImpl(status, error, json_document) {
+    : SignInResultImpl(status, std::move(error), json_document) {
   if (BaseResult::IsValid()) {
     if (json_document->HasMember(kTermsReacceptanceToken))
       term_acceptance_token_ =

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 HERE Europe B.V.
+ * Copyright (C) 2019-2021 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.
@@ -32,7 +32,7 @@ SignOutResultImpl::SignOutResultImpl() noexcept
 SignOutResultImpl::SignOutResultImpl(
     int status, std::string error,
     std::shared_ptr<rapidjson::Document> json_document) noexcept
-    : BaseResult(status, error, json_document) {}
+    : BaseResult(status, std::move(error), json_document) {}
 
 SignOutResultImpl::~SignOutResultImpl() = default;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 HERE Europe B.V.
+ * Copyright (C) 2019-2021 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.
@@ -36,7 +36,7 @@ SignUpResultImpl::SignUpResultImpl() noexcept
 SignUpResultImpl::SignUpResultImpl(
     int status, std::string error,
     std::shared_ptr<rapidjson::Document> json_document) noexcept
-    : BaseResult(status, error, json_document) {
+    : BaseResult(status, std::move(error), json_document) {
   if (BaseResult::IsValid()) {
     if (json_document->HasMember(kUserId))
       user_identifier_ = (*json_document)[kUserId].GetString();

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

@@ -96,10 +96,9 @@ void RetryDelay(const client::RetrySettings& retry_settings, size_t retry) {
       retry));
 }
 
-TimeResponse ParseTimeResponse(std::stringstream& payload) {
+TimeResponse ParseTimeResponse(const std::string& payload) {
   rapidjson::Document document;
-  rapidjson::IStreamWrapper stream(payload);
-  document.ParseStream(stream);
+  document.Parse(payload.c_str());
 
   if (!document.IsObject()) {
     return AuthenticationError(client::ErrorCode::InternalFailure,
@@ -143,6 +142,35 @@ client::OlpClient::RequestBodyType GenerateClientBody(
   auto content = data.GetString();
   return std::make_shared<RequestBodyData>(content, content + data.GetSize());
 }
+
+TimeResponse GetTimeFromServer(client::CancellationContext& context,
+                               const client::OlpClient& client) {
+  auto http_result = client.CallApi(kTimestampEndpoint, "GET", {}, {}, {},
+                                    nullptr, {}, context);
+
+  std::string response;
+  http_result.GetResponse(response);
+
+  if (http_result.status != http::HttpStatusCode::OK) {
+    OLP_SDK_LOG_WARNING_F(
+        kLogTag, "Failed to get time from server, status=%d, response='%s'",
+        http_result.GetStatus(), response.c_str());
+
+    return AuthenticationError(http_result.GetStatus(), std::move(response));
+  }
+
+  auto server_time = ParseTimeResponse(response);
+  if (!server_time) {
+    const auto& error = server_time.GetError();
+    const auto& message = error.GetMessage();
+    OLP_SDK_LOG_WARNING_F(kLogTag,
+                          "Failed to decode time from server, message='%s'",
+                          message.c_str());
+  }
+
+  return server_time;
+}
+
 }  // namespace
 
 TokenEndpointImpl::TokenEndpointImpl(Settings settings)
@@ -328,33 +356,6 @@ TokenEndpointImpl::RequestTimer TokenEndpointImpl::CreateRequestTimer(
   return RequestTimer(server_time.GetResult());
 }
 
-TimeResponse TokenEndpointImpl::GetTimeFromServer(
-    client::CancellationContext& context,
-    const client::OlpClient& client) const {
-  auto http_result = client.CallApi(kTimestampEndpoint, "GET", {}, {}, {},
-                                    nullptr, {}, context);
-
-  if (http_result.status != http::HttpStatusCode::OK) {
-    auto response = http_result.response.str();
-    OLP_SDK_LOG_WARNING_F(
-        kLogTag, "Failed to get time from server, status=%d, response='%s'",
-        http_result.status, response.c_str());
-    return AuthenticationError(http_result.status, http_result.response.str());
-  }
-
-  auto server_time = ParseTimeResponse(http_result.response);
-
-  if (!server_time) {
-    const auto& error = server_time.GetError();
-    const auto& message = error.GetMessage();
-    OLP_SDK_LOG_WARNING_F(kLogTag,
-                          "Failed to decode time from server, message='%s'",
-                          message.c_str());
-  }
-
-  return server_time;
-}
-
 TokenEndpointImpl::RequestTimer::RequestTimer()
     : timer_start_{std::chrono::steady_clock::now()},
       time_{std::chrono::system_clock::to_time_t(

olp-cpp-sdk-authentication/src/TokenEndpointImpl.h

@@ -86,9 +86,6 @@ class TokenEndpointImpl {
   RequestTimer CreateRequestTimer(const client::OlpClient& client,
                                   client::CancellationContext& context) const;
 
-  Response<time_t> GetTimeFromServer(client::CancellationContext& context,
-                                     const client::OlpClient& client) const;
-
   const AuthenticationCredentials credentials_;
   const AuthenticationSettings settings_;
   AuthenticationClient auth_client_;