OAuth2 and OAuth1 support should be enabled through http_client::add_handler.

Author: ras0219-msft

Release/include/cpprest/http_client.h

@@ -51,12 +51,6 @@ typedef void* native_handle;}}}
 #include "cpprest/details/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 
-#if !defined(CPPREST_TARGET_XP)
-#include "cpprest/oauth1.h"
-#endif
-
-#include "cpprest/oauth2.h"
-
 #if !defined(_WIN32) && !defined(__cplusplus_winrt)
 #if defined(__clang__)
 #pragma clang diagnostic push
@@ -109,44 +103,6 @@ class http_client_config
     {
     }
 
-#if !defined(CPPREST_TARGET_XP)
-    /// <summary>
-    /// Get OAuth 1.0 configuration.
-    /// </summary>
-    /// <returns>Shared pointer to OAuth 1.0 configuration.</returns>
-    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::experimental::oauth1_config config)
-    {
-        m_oauth1 = std::make_shared<oauth1::experimental::oauth1_config>(std::move(config));
-    }
-#endif
-
-    /// <summary>
-    /// Get OAuth 2.0 configuration.
-    /// </summary>
-    /// <returns>Shared pointer to OAuth 2.0 configuration.</returns>
-    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::experimental::oauth2_config config)
-    {
-        m_oauth2 = std::make_shared<oauth2::experimental::oauth2_config>(std::move(config));
-    }
-
     /// <summary>
     /// Get the web proxy object
     /// </summary>
@@ -368,11 +324,6 @@ class http_client_config
 #endif
 
 private:
-#if !defined(CPPREST_TARGET_XP)
-    std::shared_ptr<oauth1::experimental::oauth1_config> m_oauth1;
-#endif
-
-    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/src/http/client/http_client.cpp

@@ -380,13 +380,6 @@ http_client::http_client(const uri &base_uri, const http_client_config &client_c
 
     m_pipeline = std::make_shared<http_pipeline>(std::move(final_pipeline_stage));
 
-#if !defined(CPPREST_TARGET_XP)
-    add_handler(std::static_pointer_cast<http::http_pipeline_stage>(
-        std::make_shared<oauth1::details::oauth1_handler>(client_config.oauth1())));
-#endif
-
-    add_handler(std::static_pointer_cast<http::http_pipeline_stage>(
-        std::make_shared<oauth2::details::oauth2_handler>(client_config.oauth2())));
 }
 
 http_client::~http_client() CPPREST_NOEXCEPT {}

Release/src/http/oauth/oauth1.cpp

@@ -24,7 +24,7 @@
 ****/
 
 #include "stdafx.h"
-
+#include "cpprest/oauth1.h"
 #if !defined(CPPREST_TARGET_XP)
 
 using namespace utility;

Release/src/http/oauth/oauth2.cpp

@@ -24,6 +24,7 @@
 ****/
 
 #include "stdafx.h"
+#include "cpprest/oauth2.h"
 
 using web::http::client::http_client;
 using web::http::client::http_client_config;

Release/src/pch/stdafx.h

@@ -132,12 +132,6 @@
 #include "cpprest/http_client.h"
 #include "cpprest/details/http_helpers.h"
 
-// oauth
-#if !defined(_WIN32) || _WIN32_WINNT >= _WIN32_WINNT_VISTA
-#include "cpprest/oauth1.h"
-#endif
-#include "cpprest/oauth2.h"
-
 // websockets
 #include "cpprest/ws_client.h"
 #include "cpprest/ws_msg.h"