Merge branch 'development' of https://git01.codeplex.com/forks/tsone/casadev into tsone/casadev

Author: zhelu2

.gitignore

@@ -38,6 +38,8 @@
 *~
 ipch/
 obj/
+#OSX files
+.DS_Store
 *.resfiles
 [Bb]in
 Binaries/

Release/include/cpprest/asyncrt_utils.h

@@ -40,6 +40,7 @@ namespace pplx = Concurrency;
 #include <vector>
 #include <cstdint>
 #include <system_error>
+#include <random>
 
 #if !defined(_MS_WINDOWS) || (_MSC_VER >= 1700)
 #include <chrono>
@@ -220,13 +221,6 @@ namespace details
 #endif
     }
 
-    // Turn const_iterator into an iterator
-    template <typename Container, typename ConstIterator>
-    typename Container::iterator remove_iterator_constness(Container& c, ConstIterator it)
-    {
-        return c.erase(it, it);
-    }
-
 #ifdef _MS_WINDOWS
 
 /// <summary>
@@ -305,6 +299,28 @@ class datetime
     /// </summary>
     static _ASYNCRTIMP datetime __cdecl utc_now();
 
+    /// <summary>
+    /// An invalid UTC timestamp value.
+    /// </summary>
+    enum:interval_type { utc_timestamp_invalid = static_cast<interval_type>(-1) };
+
+    /// <summary>
+    /// Returns seconds since Unix/POSIX time epoch at 01-01-1970 00:00:00.
+    /// If time is before epoch, utc_timestamp_invalid is returned.
+    /// </summary>
+    static interval_type utc_timestamp()
+    {
+        const auto seconds = utc_now().to_interval() / _secondTicks;
+        if (seconds >= 11644473600LL)
+        {
+            return seconds - 11644473600LL;
+        }
+        else
+        {
+            return utc_timestamp_invalid;
+        }
+    }
+
     datetime() : m_interval(0)
     {
     }
@@ -448,4 +464,50 @@ inline int operator- (datetime t1, datetime t2)
     return static_cast<int>(diff);
 }
 
+/// <summary>
+/// Nonce string generator class.
+/// </summary>
+class nonce_generator
+{
+public:
+
+    /// <summary>
+    /// Define default nonce length.
+    /// </summary>
+    enum { default_length = 32 };
+
+    /// <summary>
+    /// Nonce generator constructor.
+    /// </summary>
+    /// <param name="length">Length of the generated nonce string.</param>
+    nonce_generator(int length=default_length) :
+        m_random(static_cast<unsigned int>(utility::datetime::utc_timestamp())),
+        m_length(length)
+    {}
+
+    /// <summary>
+    /// Generate a nonce string containing random alphanumeric characters (A-Za-z0-9).
+    /// Length of the generated string is set by length().
+    /// </summary>
+    /// <returns>The generated nonce string.</returns>
+    _ASYNCRTIMP utility::string_t generate();
+
+    /// <summary>
+    /// Get length of generated nonce string.
+    /// </summary>
+    /// <returns>Nonce string length.</returns>
+    int length() const { return m_length; }
+
+    /// <summary>
+    /// Set length of the generated nonce string.
+    /// </summary>
+    /// <param name="length">Lenght of nonce string.</param>
+    void set_length(int length) { m_length = length; }
+
+private:
+    static const utility::string_t c_allowed_chars;
+    std::mt19937 m_random;
+    int m_length;
+};
+
 } // namespace utility;

Release/include/cpprest/http_client.h

@@ -58,6 +58,8 @@ namespace pplx = Concurrency;
 #include "cpprest/web_utilities.h"
 #include "cpprest/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
+#include "cpprest/oauth1.h"
+#include "cpprest/oauth2.h"
 
 namespace web 
 {
@@ -105,6 +107,42 @@ 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::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));
+    }
+
+    /// <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>
@@ -251,6 +289,8 @@ class http_client_config
     }
 
 private:
+    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

@@ -58,7 +58,6 @@ using namespace utility;
 # define CRLF std::string("\r\n")
 #endif
 
-
 using namespace web::http::details;
 
 namespace web { namespace http { namespace client { namespace details
@@ -460,7 +459,16 @@ 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::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)));
+
+    for (auto& handler : extra_handlers)
+    {
+        add_handler(handler);
+    }
 }
 
 const http_client_config& http_client::client_config() const

Release/include/cpprest/http_constants.dat

@@ -126,10 +126,49 @@ DAT(text_xjson,                            "text/x-json")
 #endif // _MIME_TYPES
 
 #ifdef _CHARSET_TYPES
+DAT(ascii,                          "ascii")
 DAT(usascii,                        "us-ascii")
 DAT(latin1,                         "iso-8859-1")
 DAT(utf8,                           "utf-8")
 DAT(utf16,                          "utf-16")
 DAT(utf16le,                        "utf-16le")
 DAT(utf16be,                        "utf-16be")
 #endif // _CHARSET_TYPES
+
+#ifdef _OAUTH1_METHODS
+DAT(hmac_sha1,                      _XPLATSTR("HMAC-SHA1"))
+DAT(plaintext,                      _XPLATSTR("PLAINTEXT"))
+#endif // _OAUTH1_METHODS
+
+#ifdef _OAUTH1_STRINGS
+DAT(callback,                       "oauth_callback")
+DAT(callback_confirmed,             "oauth_callback_confirmed")
+DAT(consumer_key,                   "oauth_consumer_key")
+DAT(nonce,                          "oauth_nonce")
+DAT(realm,                          "realm") // NOTE: No "oauth_" prefix.
+DAT(signature,                      "oauth_signature")
+DAT(signature_method,               "oauth_signature_method")
+DAT(timestamp,                      "oauth_timestamp")
+DAT(token,                          "oauth_token")
+DAT(token_secret,                   "oauth_token_secret")
+DAT(verifier,                       "oauth_verifier")
+DAT(version,                        "oauth_version")
+#endif // _OAUTH1_STRINGS
+
+#ifdef _OAUTH2_STRINGS
+DAT(access_token,                   "access_token")
+DAT(authorization_code,             "authorization_code")
+DAT(bearer,                         "bearer")
+DAT(client_id,                      "client_id")
+DAT(client_secret,                  "client_secret")
+DAT(code,                           "code")
+DAT(expires_in,                     "expires_in")
+DAT(grant_type,                     "grant_type")
+DAT(redirect_uri,                   "redirect_uri")
+DAT(refresh_token,                  "refresh_token")
+DAT(response_type,                  "response_type")
+DAT(scope,                          "scope")
+DAT(state,                          "state")
+DAT(token,                          "token")
+DAT(token_type,                     "token_type")
+#endif // _OAUTH2_STRINGS

Release/include/cpprest/http_helpers.h

@@ -81,7 +81,7 @@ namespace details
     /// Parses the given Content-Type header value to get out actual content type and charset.
     /// If the charset isn't specified the default charset for the content type will be set.
     /// </summary>
-    void parse_content_type_and_charset(const utility::string_t &content_type, utility::string_t &content, utility::string_t &charset); 
+    void parse_content_type_and_charset(const utility::string_t &content_type, utility::string_t &content, utility::string_t &charset);
 
     /// <summary>
     /// Gets the default charset for given content type. If the MIME type is not textual or recognized Latin1 will be returned.

Release/include/cpprest/http_msg.h

@@ -646,6 +646,8 @@ class _http_request : public http::details::http_msg_base, public std::enable_sh
 
     uri &request_uri() { return m_uri; }
 
+    _ASYNCRTIMP uri absolute_uri() const;
+
     _ASYNCRTIMP uri relative_uri() const;
 
     _ASYNCRTIMP void set_request_uri(const uri&);
@@ -688,6 +690,8 @@ class _http_request : public http::details::http_msg_base, public std::enable_sh
 
     void _set_listener_path(const utility::string_t &path) { m_listener_path = path; }
 
+    void _set_base_uri(http::uri base_uri) { m_base_uri = std::move(base_uri); }
+
 private:
 
     // Actual initiates sending the response, without checking if a response has already been sent.
@@ -700,6 +704,7 @@ class _http_request : public http::details::http_msg_base, public std::enable_sh
 
     http::method m_method;
 
+    http::uri m_base_uri;
     http::uri m_uri;
     utility::string_t m_listener_path;
     std::shared_ptr<http::details::_http_server_context> m_server_context;
@@ -790,6 +795,15 @@ class http_request
     /// </remarks>
     uri relative_uri() const { return _m_impl->relative_uri(); }
 
+    /// <summary>
+    /// Get an absolute URI with scheme, host, port, path, query, and fragment part of
+    /// the request message.
+    /// </summary>
+    /// <remarks>Absolute URI is only valid after this http_request object has been passed
+    /// to http_client::request().
+    /// </remarks>
+    uri absolute_uri() const { return _m_impl->absolute_uri(); }
+
     /// <summary>
     /// Gets a reference to the headers of the response message.
     /// </summary>
@@ -1137,6 +1151,11 @@ class http_request
         return _m_impl->cancellation_token();
     }
 
+    void _set_base_uri(http::uri base_uri)
+    {
+        _m_impl->_set_base_uri(std::move(base_uri));
+    }
+
 private:
     friend class http::details::_http_request;
     friend class http::client::http_client;

Release/include/cpprest/json.h

@@ -934,16 +934,6 @@ namespace web { namespace json
             return find_internal(key);
         }
 
-        /// <summary>
-        /// Gets an iterator to an element of a JSON object.
-        /// </summary>
-        /// <param name="key">The key of an element in the JSON object.</param>
-        /// <returns>An iterator to the value kept in the field.</returns>
-        iterator find(const utility::string_t& key)
-        {
-            return utility::details::remove_iterator_constness(m_elements, find_internal(key));
-        }
-
         /// <summary>
         /// Gets the number of elements of the object.
         /// </summary>