Copy Uri code from cpprestsdk (#11)

Author: BrennanConroy

src/signalrclient/CMakeLists.txt

@@ -15,8 +15,13 @@ set (SOURCES
   transport_factory.cpp
   url_builder.cpp
   websocket_transport.cpp
+  ../../third_party_code/cpprestsdk/uri.cpp
+  ../../third_party_code/cpprestsdk/uri_builder.cpp
 )
 
+include_directories(
+    ../../third_party_code/cpprestsdk)
+
 add_library (signalrclient SHARED ${SOURCES})
 
 if(NOT USE_CPPRESTSDK)

src/signalrclient/url_builder.cpp

@@ -2,57 +2,52 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 #include "stdafx.h"
-#include "cpprest/http_client.h"
+#include "uri_builder.h"
 #include "signalrclient/transport_type.h"
 
 namespace signalr
 {
     namespace url_builder
     {
-        web::uri_builder &convert_to_websocket_url(web::uri_builder &builder, transport_type transport)
+        uri_builder &convert_to_websocket_url(uri_builder &builder, transport_type transport)
         {
             if (transport == transport_type::websockets)
             {
-                if (builder.scheme() == _XPLATSTR("https"))
+                if (builder.scheme() == "https")
                 {
-                    builder.set_scheme(utility::conversions::to_string_t("wss"));
+                    builder.set_scheme("wss");
                 }
                 else
                 {
-                    builder.set_scheme(utility::conversions::to_string_t("ws"));
+                    builder.set_scheme("ws");
                 }
             }
 
             return builder;
         }
 
-        web::uri_builder build_uri(const std::string& base_url, const std::string& command, const std::string& query_string)
+        uri_builder build_uri(const std::string& base_url, const std::string& command, const std::string& query_string)
         {
-            web::uri_builder builder(utility::conversions::to_string_t(base_url));
-            builder.append_path(utility::conversions::to_string_t(command));
-            return builder.append_query(utility::conversions::to_string_t(query_string));
+            uri_builder builder(base_url);
+            builder.append_path(command);
+            return builder.append_query(query_string);
         }
 
-        web::uri_builder build_uri(const std::string& base_url, const std::string& command)
+        uri_builder build_uri(const std::string& base_url, const std::string& command)
         {
-            web::uri_builder builder(utility::conversions::to_string_t(base_url));
-            return builder.append_path(utility::conversions::to_string_t(command));
+            uri_builder builder(base_url);
+            return builder.append_path(command);
         }
 
         std::string build_negotiate(const std::string& base_url)
         {
-            return utility::conversions::to_utf8string(build_uri(base_url, "negotiate").to_string());
+            return build_uri(base_url, "negotiate").to_string();
         }
 
         std::string build_connect(const std::string& base_url, transport_type transport, const std::string& query_string)
         {
             auto builder = build_uri(base_url, "", query_string);
-            return utility::conversions::to_utf8string(convert_to_websocket_url(builder, transport).to_string());
-        }
-
-        std::string build_start(const std::string& base_url, const std::string &query_string)
-        {
-            return utility::conversions::to_utf8string(build_uri(base_url, "", query_string).to_string());
+            return convert_to_websocket_url(builder, transport).to_string();
         }
     }
 }

src/signalrclient/url_builder.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "cpprest/http_client.h"
 #include "signalrclient/transport_type.h"
 
 namespace signalr
@@ -12,6 +11,5 @@ namespace signalr
     {
         std::string build_negotiate(const std::string& base_url);
         std::string build_connect(const std::string& base_url, transport_type transport, const std::string& query_string);
-        std::string build_start(const std::string& base_url, const std::string& query_string);
     }
 }

src/signalrclient/websocket_transport.cpp

@@ -5,6 +5,7 @@
 #include "websocket_transport.h"
 #include "logger.h"
 #include "signalrclient/signalr_exception.h"
+#include "base_uri.h"
 #include <future>
 
 namespace signalr
@@ -144,8 +145,8 @@ namespace signalr
 
     void websocket_transport::start(const std::string& url, transfer_format format, std::function<void(std::exception_ptr)> callback) noexcept
     {
-        web::uri uri(utility::conversions::to_string_t(url));
-        assert(uri.scheme() == _XPLATSTR("ws") || uri.scheme() == _XPLATSTR("wss"));
+        signalr::uri uri(url);
+        assert(uri.scheme() == "ws" || uri.scheme() == "wss");
 
         {
             std::lock_guard<std::mutex> stop_lock(m_start_stop_lock);

test/signalrclienttests/url_builder_tests.cpp

@@ -26,3 +26,10 @@ TEST(url_builder_connect_webSockets, url_correct_if_query_string_not_empty)
         "ws://fake/?q1=1&q2=2",
         url_builder::build_connect("http://fake/", transport_type::websockets, "q1=1&q2=2"));
 }
+
+TEST(url_builder_connect, url_correct_if_query_string_not_empty_and_adding_query_string)
+{
+    ASSERT_EQ(
+        "ws://fake/?q=0&q1=1&q2=2",
+        url_builder::build_connect("http://fake/?q=0", transport_type::websockets, "q1=1&q2=2"));
+}

third-party-notices.txt

@@ -0,0 +1,33 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for cpprestsdk
+------------------------------------------------------------------------------
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.