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

Author: arturl

Build/version.props

@@ -4,11 +4,8 @@
     <CppRestBaseFileName>cpprest</CppRestBaseFileName>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
     <CppRestSDKVersionMinor>0</CppRestSDKVersionMinor>
-    <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
+    <CppRestSDKVersionRevision>1</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
   </PropertyGroup>
-<!--
-  Note: remember to regenerate guiddefs.wxi files using gen_guids_for_msi.ps1 whenever major or minor version file changes
--->
 </Project>

Release/include/cpprest/oauth1_handler.h

@@ -48,7 +48,7 @@ class oauth1_methods
 {
 public:
 #define _OAUTH1_METHODS
-#define DAT(a,b) const static oauth1_method a;
+#define DAT(a,b) _ASYNCRTIMP static const oauth1_method a;
 #include "cpprest/http_constants.dat"
 #undef _OAUTH1_METHODS
 #undef DAT
@@ -71,8 +71,30 @@ struct oauth1_config
     {
     }
 
+    const utility::string_t& key() const { return m_key; }
+    void set_key(utility::string_t key) { m_key = std::move(key); }
+
+    const utility::string_t& secret() const { return m_secret; }
+    void set_secret(utility::string_t secret) { m_secret = std::move(secret); }
+
+    const utility::string_t& token() const { return m_token; }
+    void set_token(utility::string_t token) { m_token = std::move(token); }
+
+    const utility::string_t& token_secret() const { return m_token_secret; }
+    void set_token_secret(utility::string_t token_secret) { m_token_secret = std::move(token_secret); }
+
+    const oauth1_method& method() const { return m_method; }
+    void set_method(oauth1_method method) { m_method = std::move(method); }
+
+    const utility::string_t& realm() const { return m_realm; }
+    void set_realm(utility::string_t realm) { m_realm = std::move(realm); }
+
     bool is_enabled() const { return !m_key.empty() && !m_secret.empty() && !m_token.empty() && !m_token_secret.empty(); }
 
+private:
+    friend class http_client_config;
+    oauth1_config() {}
+
     // Required.
     utility::string_t m_key;
     utility::string_t m_secret;
@@ -82,10 +104,6 @@ struct oauth1_config
 
     // Optional.
     utility::string_t m_realm;
-
-private:
-    friend class http_client_config;
-    oauth1_config() {}
 };
 
 
@@ -103,16 +121,16 @@ class oauth1_handler : public http_pipeline_stage
     void set_config(oauth1_config config) { m_config = std::move(config); }
     const oauth1_config& get_config() const { return m_config; }
 
-    virtual pplx::task<http_response> propagate(http_request request) override;
+    _ASYNCRTIMP virtual pplx::task<http_response> propagate(http_request request) override;
 
-    utility::string_t _generate_nonce();
+    _ASYNCRTIMP utility::string_t _generate_nonce();
 
-    utility::string_t _build_signature_base_string(http_request request, utility::string_t timestamp, utility::string_t nonce) const;
+    _ASYNCRTIMP utility::string_t _build_signature_base_string(http_request request, utility::string_t timestamp, utility::string_t nonce) const;
 
-    utility::string_t _build_hmac_sha1_signature(http_request request, utility::string_t timestamp, utility::string_t nonce) const;
+    _ASYNCRTIMP utility::string_t _build_hmac_sha1_signature(http_request request, utility::string_t timestamp, utility::string_t nonce) const;
 // TODO: RSA-SHA1
 //    utility::string_t _build_rsa_sha1_signature(http_request request, utility::string_t timestamp, utility::string_t nonce) const;
-    utility::string_t _build_plaintext_signature() const;
+    _ASYNCRTIMP utility::string_t _build_plaintext_signature() const;
 
 private:
     static utility::string_t _generate_timestamp();

Release/include/cpprest/oauth2_handler.h

@@ -46,13 +46,16 @@ struct oauth2_config
 {
     oauth2_config(utility::string_t token) : m_token(std::move(token)) {}
 
-    bool is_enabled() const { return !m_token.empty(); }
+    const utility::string_t& token() const { return m_token; }
+    void set_token(utility::string_t token) { m_token = std::move(token); }
 
-    utility::string_t m_token;
+    bool is_enabled() const { return !m_token.empty(); }
 
 private:
     friend class http_client_config;
     oauth2_config() {}
+
+    utility::string_t m_token;
 };
 
 
@@ -71,7 +74,7 @@ class oauth2_handler : public http_pipeline_stage
     {
         if (m_config.is_enabled())
         {
-            request.headers().add(_XPLATSTR("Authorization"), _XPLATSTR("Bearer ") + m_config.m_token);
+            request.headers().add(_XPLATSTR("Authorization"), _XPLATSTR("Bearer ") + m_config.token());
         }
         return next_stage()->propagate(request);
     }

Release/include/cpprest/version.h

@@ -15,7 +15,7 @@
 *
 * ==--==
 */
-#define CPPREST_VERSION_REVISION 0
+#define CPPREST_VERSION_REVISION 1
 #define CPPREST_VERSION_MINOR 0
 #define CPPREST_VERSION_MAJOR 2
 

Release/nuget/cpprestsdk.autopkg

@@ -1,7 +1,7 @@
 nuget {
 	nuspec {
 		id = cpprestsdk;
-		version : 2.0.0;
+		version : 2.0.1;
 		title: C++ REST SDK;
 		authors: {casablancacore};
 		owners: {Microsoft, Visual C++};
@@ -11,7 +11,7 @@ nuget {
 		requireLicenseAcceptance: true;
 		summary: "The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications";
 		description: "This library is a Microsoft effort to support cloud-based client-server communication in native code using a modern asynchronous C++ API design. The C++ REST SDK (codename "Casablanca") is a project to start exploring how to best support C++ developers who want to take advantage of the radical shift in software architecture that cloud computing represents.";
-		releaseNotes: "Release of C++ Rest SDK 2.0.0 libraries.";
+		releaseNotes: "Release of C++ Rest SDK 2.0.1 libraries.";
 		copyright: Copyright 2013;
 		tags: {REST, native, C++, JSON, Casablanca, Http, Uri};
 	};

Release/samples/Oauth1Client/Oauth1Client.cpp

@@ -34,10 +34,10 @@ using namespace web::http::client;
 // LinkedIn tokens. Fill the following based on information here:
 // https://developer.linkedin.com/documents/quick-start-guide
 //
-static const string_t s_linkedin_key("");
-static const string_t s_linkedin_secret("");
-static const string_t s_linkedin_user_token("");
-static const string_t s_linkedin_user_token_secret("");
+static const string_t s_linkedin_key(U(""));
+static const string_t s_linkedin_secret(U(""));
+static const string_t s_linkedin_user_token(U(""));
+static const string_t s_linkedin_user_token_secret(U(""));
 
 
 static void linkedin_client()
@@ -46,24 +46,24 @@ static void linkedin_client()
     config.set_oauth1(oauth1_config(s_linkedin_key, s_linkedin_secret,
             s_linkedin_user_token, s_linkedin_user_token_secret,
             oauth1_methods::hmac_sha1));
-    http_client c("http://api.linkedin.com/", config);
+    http_client c(U("http://api.linkedin.com/"), config);
 
-    std::cout << "Requesting user information:" << std::endl;
-    auto user_json = c.request(methods::GET, "v1/people/~?format=json").get().extract_json().get();
-    std::cout << "Got following JSON:" << std::endl;
-    std::cout << user_json << std::endl;
+    ucout << "Requesting user information:" << std::endl;
+    auto user_json = c.request(methods::GET, U("v1/people/~?format=json")).get().extract_json().get();
+    ucout << "Got following JSON:" << std::endl;
+    ucout << user_json.serialize().c_str() << std::endl;
 }
 
 static int has_key(string_t client_name, string_t key)
 {
     if (key.empty())
     {
-        std::cout << "Skipped " << client_name << " client. Please supply tokens for the client." << std::endl;
+        ucout << "Skipped " << client_name.c_str() << " client. Please supply tokens for the client." << std::endl;
         return 0;
     }
     else
     {
-        std::cout << "Running " << client_name << " client." << std::endl;
+        ucout << "Running " << client_name.c_str() << " client." << std::endl;
         return 1;
     }
 }
@@ -74,12 +74,12 @@ int wmain(int argc, wchar_t *argv[])
 int main(int argc, char *argv[])
 #endif
 {
-    std::cout << "Running oauth1 sample..." << std::endl;
-    if (has_key("LinkedIn", s_linkedin_key))
+    ucout << "Running oauth1 sample..." << std::endl;
+    if (has_key(U("LinkedIn"), s_linkedin_key))
     {
         linkedin_client();
     }
-    std::cout << "Done." << std::endl;
+    ucout << "Done." << std::endl;
     return 0;
 }