Remove deprecated code from Authentication (#1401)

Removed outdated code and adapted to the recommended alternatives

Relates-To: OAM-2009

Signed-off-by: Andrey Kashcheev <ext-andrey.kashcheev@here.com>

Author: andrey-kashcheev

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 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.
@@ -27,7 +27,6 @@
 #include <olp/authentication/AppleSignInProperties.h>
 #include <olp/authentication/AuthenticationApi.h>
 #include <olp/authentication/AuthenticationCredentials.h>
-#include <olp/authentication/AuthenticationError.h>
 #include <olp/authentication/AuthenticationSettings.h>
 #include <olp/authentication/AuthorizeRequest.h>
 #include <olp/authentication/SignInResult.h>
@@ -396,34 +395,6 @@ class AUTHENTICATION_API AuthenticationClient {
       const FederatedProperties& properties,
       const SignInUserCallback& callback);
 
-  /**
-   * @brief Signs in with your valid Google token and requests your user access
-   * token.
-   *
-   * If this is the first time that you use Google to sign in,
-   * a new HERE Account is automatically created and filled in with the data
-   * from your Google account, including your name and email.
-   *
-   * @param credentials The `AuthenticationCredentials` instance.
-   * @param properties The `FederatedProperties` structure.
-   * @param callback The `SignInUserCallback` method that is called when
-   * the user sign-in request is completed. If successful, the returned HTTP
-   * status is 200. If a new account is created as a part of the sign-in request
-   * and terms must be accepted, the returned HTTP status is 201. Otherwise,
-   * check the response error.
-   *
-   * @return The `CancellationToken` instance that can be used to cancel
-   * the request.
-   *
-   * @deprecated Will be removed by 12.2020.
-   */
-  OLP_SDK_DEPRECATED(
-      "Sign in with Google token is deprecated and will be removed by 12.2020")
-  client::CancellationToken SignInGoogle(
-      const AuthenticationCredentials& credentials,
-      const FederatedProperties& properties,
-      const SignInUserCallback& callback);
-
   /**
    * @brief Signs in with your valid ArcGIS token and requests your user access
    * token.

olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationError.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.
@@ -59,9 +59,6 @@ class AUTHENTICATION_API TokenProviderImpl {
    */
   TokenProviderImpl(Settings settings, std::chrono::seconds minimum_validity);
 
-  /// @copydoc TokenProvider::operator()()
-  std::string operator()() const;
-
   /// @copydoc TokenProvider::operator()(client::CancellationContext&)
   client::OauthTokenResponse operator()(
       client::CancellationContext& context) const;
@@ -128,23 +125,6 @@ class TokenProvider {
    */
   operator bool() const { return impl_->IsTokenResponseOK(); }
 
-  /**
-   * @brief Casts the `TokenProvider` instance to the `std::string` type.
-   *
-   * Returns the access token string if the response is successful. Otherwise,
-   * returns an empty string.
-   *
-   * @returns The access token string if the response is successful; an empty
-   * string otherwise.
-   *
-   * @deprecated Will be removed by 10.2022. Use the operator with
-   * `CancellationContext` instead.
-   */
-  OLP_SDK_DEPRECATED(
-      "Will be removed by 10.2022. Use the operator with `CancellationContext` "
-      "instead.")
-  std::string operator()() const { return impl_->operator()(); }
-
   /**
    * @brief Returns the access token or an error.
    *

olp-cpp-sdk-authentication/include/olp/authentication/TokenProvider.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.
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <olp/core/porting/deprecated.h>
-
 #include <chrono>
 #include <ctime>
 #include <string>
@@ -34,9 +32,8 @@ namespace authentication {
  * @brief A parsed response received from the OAuth2.0 token endpoint.
  *
  * You can get the following information: the access token issued by
- * the authorization server (`GetAccessToken`), its expiry time
- * (`GetExpiryTime`), HTTP status code (`GetHttpStatus`),
- * and error description (`GetErrorResponse`) in case of a failure.
+ * the authorization server (`GetAccessToken`), and its expiry time
+ * (`GetExpiryTime`).
  */
 class AUTHENTICATION_API TokenResult {
  public:
@@ -46,22 +43,16 @@ class AUTHENTICATION_API TokenResult {
    * @param access_token The access token issued by the authorization server.
    * @param expiry_time The Epoch time when the token expires, or -1 if
    * the token is invalid.
-   * @param http_status The status code of the HTTP response.
-   * @param error The error description of the request.
    */
-  TokenResult(std::string access_token, time_t expiry_time, int http_status,
-              ErrorResponse error);
+  TokenResult(std::string access_token, time_t expiry_time);
 
   /**
    * @brief Creates the `TokenResult` instance.
    *
    * @param access_token The access token issued by the authorization server.
    * @param expires_in The expiry time of the access token.
-   * @param http_status The status code of the HTTP response.
-   * @param error The error description of the request.
    */
-  TokenResult(std::string access_token, std::chrono::seconds expires_in,
-              int http_status, ErrorResponse error);
+  TokenResult(std::string access_token, std::chrono::seconds expires_in);
   /**
    * @brief Creates the default `TokenResult` instance.
    */
@@ -90,40 +81,10 @@ class AUTHENTICATION_API TokenResult {
    */
   std::chrono::seconds GetExpiresIn() const;
 
-  /**
-   * @brief Gets the HTTP status code.
-   *
-   * @return The status code of the HTTP response if a positive value is
-   * returned. A negative value indicates a possible networking error. If you
-   * get the negative value, retry the request.
-   *
-   * @deprecated Will be removed by 10.2022. Use
-   * `TokenResponse::GetError().GetHttpStatusCode()` instead.
-   */
-  OLP_SDK_DEPRECATED(
-      "Will be removed by 10.2022. Use "
-      "`TokenResponse::GetError().GetHttpStatusCode()` instead.")
-  int GetHttpStatus() const;
-
-  /**
-   * @brief Gets an error description.
-   *
-   * @return The error description of the failed request.
-   *
-   * @deprecated Will be removed by 10.2022. Use
-   * `TokenResponse::GetError().GetMessagee()` instead.
-   */
-  OLP_SDK_DEPRECATED(
-      "Will be removed by 10.2022. Use "
-      "`TokenResponse::GetError().GetMessagee()` instead.")
-  ErrorResponse GetErrorResponse() const;
-
  private:
   std::string access_token_;
-  time_t expiry_time_;
-  std::chrono::seconds expires_in_;
-  int http_status_;
-  ErrorResponse error_;
+  time_t expiry_time_{};
+  std::chrono::seconds expires_in_{};
 };
 
 }  // namespace authentication

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 HERE Europe B.V.
+ * Copyright (C) 2020-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.
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <olp/authentication/AuthenticationError.h>
 #include <olp/authentication/AuthorizeResult.h>
 #include <olp/authentication/IntrospectAppResult.h>
 #include <olp/authentication/TokenResult.h>
@@ -34,7 +33,7 @@ namespace authentication {
 
 /// The response template type.
 template <typename ResultType>
-using Response = client::ApiResponse<ResultType, AuthenticationError>;
+using Response = client::ApiResponse<ResultType, client::ApiError>;
 
 /// The callback template type.
 template <typename ResultType>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 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.
@@ -22,7 +22,6 @@
 #include <utility>
 
 #include "AuthenticationClientImpl.h"
-#include "olp/authentication/AuthenticationError.h"
 #include "olp/authentication/AuthorizeRequest.h"
 #include "olp/core/client/ApiError.h"
 #include "olp/core/client/CancellationToken.h"
@@ -68,13 +67,6 @@ client::CancellationToken AuthenticationClient::SignInFacebook(
       credentials, FederatedSignInType::FacebookSignIn, properties, callback);
 }
 
-client::CancellationToken AuthenticationClient::SignInGoogle(
-    const AuthenticationCredentials& credentials,
-    const FederatedProperties& properties, const SignInUserCallback& callback) {
-  return impl_->SignInFederated(credentials, FederatedSignInType::GoogleSignIn,
-                                properties, callback);
-}
-
 client::CancellationToken AuthenticationClient::SignInArcGis(
     const AuthenticationCredentials& credentials,
     const FederatedProperties& properties, const SignInUserCallback& callback) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 HERE Europe B.V.
+ * Copyright (C) 2020-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.
@@ -84,7 +84,6 @@ constexpr auto kFamilyName = "familyName";
 constexpr auto kClientGrantType = "client_credentials";
 constexpr auto kUserGrantType = "password";
 constexpr auto kFacebookGrantType = "facebook";
-constexpr auto kGoogleGrantType = "google";
 constexpr auto kArcgisGrantType = "arcgis";
 constexpr auto kAppleGrantType = "jwtIssNotHERE";
 constexpr auto kRefreshGrantType = "refresh_token";
@@ -365,13 +364,13 @@ TimeResponse AuthenticationClientImpl::ParseTimeResponse(
   document.ParseStream(stream);
 
   if (!document.IsObject()) {
-    return AuthenticationError(client::ErrorCode::InternalFailure,
-                               "JSON document root is not an Object type");
+    return client::ApiError(client::ErrorCode::InternalFailure,
+                            "JSON document root is not an Object type");
   }
 
   const auto timestamp_it = document.FindMember("timestamp");
   if (timestamp_it == document.MemberEnd() || !timestamp_it->value.IsUint()) {
-    return AuthenticationError(
+    return client::ApiError(
         client::ErrorCode::InternalFailure,
         "JSON document must contain timestamp integer field");
   }
@@ -390,7 +389,7 @@ TimeResponse AuthenticationClientImpl::GetTimeFromServer(
     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());
+    return client::ApiError(http_result.status, http_result.response.str());
   }
 
   auto server_time = ParseTimeResponse(http_result.response);
@@ -842,9 +841,6 @@ AuthenticationClientImpl::GenerateFederatedBody(
     case FederatedSignInType::FacebookSignIn:
       writer.String(kFacebookGrantType);
       break;
-    case FederatedSignInType::GoogleSignIn:
-      writer.String(kGoogleGrantType);
-      break;
     case FederatedSignInType::ArcgisSignIn:
       writer.String(kArcgisGrantType);
       break;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 HERE Europe B.V.
+ * Copyright (C) 2020-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.
@@ -23,7 +23,6 @@
 #include <string>
 
 #include "olp/authentication/AuthenticationClient.h"
-#include "olp/authentication/AuthenticationError.h"
 #include "olp/authentication/AuthenticationSettings.h"
 #include "olp/authentication/AuthorizeRequest.h"
 #include "olp/authentication/Types.h"
@@ -57,7 +56,7 @@ using SignOutUserCallback = AuthenticationClient::SignOutUserCallback;
 using TimeResponse = Response<time_t>;
 using TimeCallback = Callback<time_t>;
 
-enum class FederatedSignInType { FacebookSignIn, GoogleSignIn, ArcgisSignIn };
+enum class FederatedSignInType { FacebookSignIn, ArcgisSignIn };
 
 class AuthenticationClientImpl {
  public:

olp-cpp-sdk-authentication/src/AuthenticationClientImpl.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.
@@ -24,7 +24,6 @@
 
 #include <olp/authentication/AuthenticationApi.h>
 #include <olp/authentication/AuthenticationCredentials.h>
-#include <olp/authentication/AuthenticationError.h>
 #include <olp/authentication/Settings.h>
 #include <olp/authentication/Types.h>
 #include <olp/core/client/ApiResponse.h>