Removed unnecessary rvalue references and using-declarations, changed to make_shared, and removed some makefiles in oauth1/2.

Author: Valtteri Heikkila

Release/include/cpprest/http_client.h

@@ -68,16 +68,12 @@ namespace http
 namespace client
 {
 
-using web::http::oauth1::experimental::oauth1_config;
-using web::http::oauth2::experimental::oauth2_config;
-
 // credentials and web_proxy class has been moved from web::http::client namespace to web namespace.
 // The below using declarations ensure we dont break existing code.
 // Please use the web::credentials and web::web_proxy class going forward.
 using web::credentials;
 using web::web_proxy;
 
-
 #ifdef _MS_WINDOWS
 namespace details {
 #ifdef __cplusplus_winrt
@@ -111,30 +107,41 @@ class http_client_config
     {
     }
 
-
     /// <summary>
     /// Get OAuth 1.0 configuration.
     /// </summary>
     /// <returns>Shared pointer to OAuth 1.0 configuration.</returns>
-    const std::shared_ptr<oauth1_config> oauth1() const { return m_oauth1; }
+    const std::shared_ptr<oauth1::experimental::oauth1_config> oauth1() const
+    {
+        return m_oauth1;
+    }
 
     /// <summary>
     /// Set OAuth 1.0 configuration.
     /// </summary>
     /// <param name="config">OAuth 1.0 configuration to set.</param>
-    void set_oauth1(oauth1_config config) { m_oauth1.reset(new oauth1_config(std::move(config))); }
+    void set_oauth1(oauth1::experimental::oauth1_config config)
+    {
+        m_oauth1 = std::make_shared<oauth1::experimental::oauth1_config>(std::move(config));
+    }
 
     /// <summary>
     /// Get OAuth 2.0 configuration.
     /// </summary>
     /// <returns>Shared pointer to OAuth 2.0 configuration.</returns>
-    const std::shared_ptr<oauth2_config> oauth2() const { return m_oauth2; }
+    const std::shared_ptr<oauth2::experimental::oauth2_config> oauth2() const
+    {
+        return m_oauth2;
+    }
 
     /// <summary>
     /// Set OAuth 2.0 configuration.
     /// </summary>
     /// <param name="config">OAuth 2.0 configuration to set.</param>
-    void set_oauth2(oauth2_config config) { m_oauth2.reset(new oauth2_config(std::move(config))); }
+    void set_oauth2(oauth2::experimental::oauth2_config config)
+    {
+        m_oauth2 = std::make_shared<oauth2::experimental::oauth2_config>(std::move(config));
+    }
 
     /// <summary>
     /// Get the web proxy object
@@ -282,8 +289,8 @@ class http_client_config
     }
 
 private:
-    std::shared_ptr<oauth1_config> m_oauth1;
-    std::shared_ptr<oauth2_config> m_oauth2;
+    std::shared_ptr<oauth1::experimental::oauth1_config> m_oauth1;
+    std::shared_ptr<oauth2::experimental::oauth2_config> m_oauth2;
     web_proxy m_proxy;
     http::client::credentials m_credentials;
     // Whether or not to guarantee ordering, i.e. only using one underlying TCP connection.

Release/include/cpprest/http_client_impl.h

@@ -59,8 +59,6 @@ using namespace utility;
 #endif
 
 using namespace web::http::details;
-using namespace web::http::oauth1::details;
-using namespace web::http::oauth2::details;
 
 namespace web { namespace http { namespace client { namespace details
 {
@@ -462,8 +460,8 @@ void http_client::build_pipeline(uri base_uri, http_client_config client_config)
     details::verify_uri(base_uri);
 
     std::vector<std::shared_ptr<http::http_pipeline_stage> > extra_handlers;
-    extra_handlers.push_back(std::shared_ptr<http::http_pipeline_stage>(new oauth1_handler(client_config.oauth1())));
-    extra_handlers.push_back(std::shared_ptr<http::http_pipeline_stage>(new oauth2_handler(client_config.oauth2())));
+    extra_handlers.push_back(std::make_shared<oauth1::details::oauth1_handler>(client_config.oauth1()));
+    extra_handlers.push_back(std::make_shared<oauth2::details::oauth2_handler>(client_config.oauth2()));
 
     m_pipeline = ::web::http::http_pipeline::create_pipeline(std::make_shared<details::http_network_handler>(std::move(base_uri), std::move(client_config)));
 

Release/include/cpprest/oauth1.h

@@ -406,7 +406,7 @@ class oauth1_config
         return os.str();
     }
 
-    _ASYNCRTIMP static std::vector<unsigned char> _hmac_sha1(const utility::string_t&& key, const utility::string_t&& data);
+    _ASYNCRTIMP static std::vector<unsigned char> _hmac_sha1(const utility::string_t& key, const utility::string_t& data);
 
     static utility::string_t _build_base_string_uri(const uri& u);
 

Release/include/cpprest/oauth2.h

@@ -264,7 +264,7 @@ class oauth2_config
         ub.append_query(details::oauth2_strings::grant_type, details::oauth2_strings::authorization_code, false);
         ub.append_query(details::oauth2_strings::code, uri::encode_data_string(std::move(authorization_code)), false);
         ub.append_query(details::oauth2_strings::redirect_uri, uri::encode_data_string(redirect_uri()), false);
-        return _request_token(std::move(ub));
+        return _request_token(ub);
     }
 
     /// <summary>
@@ -280,7 +280,7 @@ class oauth2_config
         uri_builder ub;
         ub.append_query(details::oauth2_strings::grant_type, details::oauth2_strings::refresh_token, false);
         ub.append_query(details::oauth2_strings::refresh_token, uri::encode_data_string(token().refresh_token()), false);
-        return _request_token(std::move(ub));
+        return _request_token(ub);
     }
 
     /// <summary>
@@ -451,9 +451,9 @@ class oauth2_config
         m_http_basic_auth(true)
     {}
 
-    _ASYNCRTIMP pplx::task<void> _request_token(uri_builder&& request_body);
+    _ASYNCRTIMP pplx::task<void> _request_token(uri_builder& request_body);
 
-    oauth2_token _parse_token_from_json(const json::value&& token_json);
+    oauth2_token _parse_token_from_json(const json::value& token_json);
 
     void _authenticate_request(http_request &req) const
     {

Release/samples/Oauth1Client/Makefile

@@ -56,7 +56,7 @@ namespace experimental
 //
 #if _WIN32_WINNT < _WIN32_WINNT_VISTA || _PHONE8_ // Windows XP or Windows Phone 8.0
 
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&&, const utility::string_t&&)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&, const utility::string_t&)
 {
     throw oauth1_exception(U("oauth1 is not supported"));
 }
@@ -66,7 +66,7 @@ std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&&,
 #include <winternl.h>
 #include <bcrypt.h>
 
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&& key, const utility::string_t&& data)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
 {
     NTSTATUS status;
     BCRYPT_ALG_HANDLE alg_handle = nullptr;
@@ -128,7 +128,7 @@ using namespace Windows::Security::Cryptography;
 using namespace Windows::Security::Cryptography::Core;
 using namespace Windows::Storage::Streams;
 
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&& key, const utility::string_t&& data)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
 {
     Platform::String^ data_str = ref new Platform::String(data.c_str());
     Platform::String^ key_str = ref new Platform::String(key.c_str());
@@ -149,7 +149,7 @@ std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&& k
 
 #include <openssl/hmac.h>
 
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&& key, const utility::string_t&& data)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
 {
     unsigned char digest[HMAC_MAX_MD_CBLOCK];
     unsigned int digest_len = 0;

Release/samples/Oauth2Client/Makefile

@@ -110,7 +110,7 @@ pplx::task<void> oauth2_config::token_from_redirected_uri(const web::http::uri&
     return pplx::task_from_result();
 }
 
-pplx::task<void> oauth2_config::_request_token(uri_builder&& request_body_ub)
+pplx::task<void> oauth2_config::_request_token(uri_builder& request_body_ub)
 {
     http_request request;
     request.set_method(methods::POST);
@@ -146,11 +146,11 @@ pplx::task<void> oauth2_config::_request_token(uri_builder&& request_body_ub)
     })
     .then([this](json::value json_resp) -> void
     {
-        set_token(_parse_token_from_json(std::move(json_resp)));
+        set_token(_parse_token_from_json(json_resp));
     });
 }
 
-oauth2_token oauth2_config::_parse_token_from_json(const json::value&& token_json)
+oauth2_token oauth2_config::_parse_token_from_json(const json::value& token_json)
 {
     oauth2_token result;