feat: send auth object upon connecting (#335)

gabrieljablonski · web-flow · commit 23f243ff555a · 2021-11-23T23:44:34.000+01:00
Usage:

```c++
sio::client client;

sio::message::ptr auth = sio::object_message::create();
auth-&gt;get_map()["token"] = sio::string_message::create("eyJhbGciOiJIUzI1NiIsInR...");
auth-&gt;get_map()["sessionId"] = sio::string_message::create("p0ZoB1FwH6");

client.connect(server_url, auth);
```
diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp
@@ -70,7 +70,7 @@ namespace sio
         sync_close();
     }
     
-    void client_impl::connect(const string& uri, const map<string,string>& query, const map<string, string>& headers)
+    void client_impl::connect(const string& uri, const map<string,string>& query, const map<string, string>& headers, const message::ptr& auth)
     {
         if(m_reconn_timer)
         {
@@ -108,6 +108,7 @@ namespace sio
         m_query_string=move(query_str);
 
         m_http_headers = headers;
+        m_auth = auth;
 
         this->reset_states();
         m_client.get_io_service().dispatch(std::bind(&client_impl::connect_impl,this,uri,m_query_string));
@@ -140,7 +141,7 @@ namespace sio
         }
         else
         {
-            pair<const string, socket::ptr> p(aux,shared_ptr<sio::socket>(new sio::socket(this,aux)));
+            pair<const string, socket::ptr> p(aux,shared_ptr<sio::socket>(new sio::socket(this,aux,m_auth)));
             return (m_sockets.insert(p).first)->second;
         }
     }
diff --git a/src/internal/sio_client_impl.h b/src/internal/sio_client_impl.h
@@ -104,7 +104,7 @@ namespace sio
         
         // Client Functions - such as send, etc.
         void connect(const std::string& uri, const std::map<std::string, std::string>& queryString,
-                     const std::map<std::string, std::string>& httpExtraHeaders);
+                     const std::map<std::string, std::string>& httpExtraHeaders, const message::ptr& auth);
         
         sio::socket::ptr const& socket(const std::string& nsp);
         
@@ -199,6 +199,7 @@ namespace sio
         std::string m_base_url;
         std::string m_query_string;
         std::map<std::string, std::string> m_http_headers;
+        message::ptr m_auth;
 
         unsigned int m_ping_interval;
         unsigned int m_ping_timeout;
diff --git a/src/sio_client.cpp b/src/sio_client.cpp
@@ -69,18 +69,34 @@ namespace sio
 
     void client::connect(const std::string& uri)
     {
-        m_impl->connect(uri, {}, {});
+        m_impl->connect(uri, {}, {}, {});
+    }
+
+    void client::connect(const std::string& uri, const message::ptr& auth)
+    {
+        m_impl->connect(uri, {}, {}, auth);
     }
 
     void client::connect(const std::string& uri, const std::map<string,string>& query)
     {
-        m_impl->connect(uri, query, {});
+        m_impl->connect(uri, query, {}, {});
+    }
+
+    void client::connect(const std::string& uri, const std::map<string,string>& query, const message::ptr& auth)
+    {
+        m_impl->connect(uri, query, {}, auth);
     }
 
     void client::connect(const std::string& uri, const std::map<std::string,std::string>& query,
                          const std::map<std::string,std::string>& http_extra_headers)
     {
-        m_impl->connect(uri, query, http_extra_headers);
+        m_impl->connect(uri, query, http_extra_headers, {});
+    }
+
+    void client::connect(const std::string& uri, const std::map<std::string,std::string>& query,
+                         const std::map<std::string,std::string>& http_extra_headers, const message::ptr& auth)
+    {
+        m_impl->connect(uri, query, http_extra_headers, auth);
     }
     
     socket::ptr const& client::socket(const std::string& nsp)
diff --git a/src/sio_client.h b/src/sio_client.h
@@ -56,11 +56,18 @@ namespace sio
         // Client Functions - such as send, etc.
         void connect(const std::string& uri);
 
+        void connect(const std::string& uri, const message::ptr& auth);
+
         void connect(const std::string& uri, const std::map<std::string,std::string>& query);
 
+        void connect(const std::string& uri, const std::map<std::string,std::string>& query, const message::ptr& auth);
+
         void connect(const std::string& uri, const std::map<std::string,std::string>& query,
                      const std::map<std::string,std::string>& http_extra_headers);
 
+        void connect(const std::string& uri, const std::map<std::string,std::string>& query,
+                     const std::map<std::string,std::string>& http_extra_headers, const message::ptr& auth);
+
         void set_reconnect_attempts(int attempts);
 
         void set_reconnect_delay(unsigned millis);
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
@@ -108,7 +108,7 @@ namespace sio
     {
     public:
         
-        impl(client_impl *,std::string const&);
+        impl(client_impl *, std::string const&, message::ptr const&);
         ~impl();
         
         void on(std::string const& event_name,event_listener_aux const& func);
@@ -173,6 +173,7 @@ namespace sio
         
         bool m_connected;
         std::string m_nsp;
+        message::ptr m_auth;
         
         std::map<unsigned int, std::function<void (message::list const&)> > m_acks;
         
@@ -228,10 +229,11 @@ namespace sio
         m_error_listener = nullptr;
     }
     
-    socket::impl::impl(client_impl *client,std::string const& nsp):
+    socket::impl::impl(client_impl *client, std::string const& nsp, message::ptr const& auth):
         m_client(client),
         m_connected(false),
-        m_nsp(nsp)
+        m_nsp(nsp),
+        m_auth(auth)
     {
         NULL_GUARD(client);
         if(m_client->opened())
@@ -269,7 +271,7 @@ namespace sio
     void socket::impl::send_connect()
     {
         NULL_GUARD(m_client);
-        packet p(packet::type_connect,m_nsp);
+        packet p(packet::type_connect, m_nsp, m_auth);
         m_client->send(p);
         m_connection_timer.reset(new asio::steady_timer(m_client->get_io_service()));
         asio::error_code ec;
@@ -523,8 +525,8 @@ namespace sio
         return socket::event_listener();
     }
     
-    socket::socket(client_impl* client,std::string const& nsp):
-        m_impl(new impl(client,nsp))
+    socket::socket(client_impl* client,std::string const& nsp,message::ptr const& auth):
+        m_impl(new impl(client,nsp,auth))
     {
     }
     
diff --git a/src/sio_socket.h b/src/sio_socket.h
@@ -75,7 +75,7 @@ namespace sio
         std::string const& get_namespace() const;
         
     protected:
-        socket(client_impl*,std::string const&);
+        socket(client_impl*,std::string const&,message::ptr const&);
 
         void on_connected();
         

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ namespace sio`
`70`	`70`	`sync_close();`
`71`	`71`	`}`
`72`	`72`
`73`		`- void client_impl::connect(const string& uri, const map<string,string>& query, const map<string, string>& headers)`
	`73`	`+ void client_impl::connect(const string& uri, const map<string,string>& query, const map<string, string>& headers, const message::ptr& auth)`
`74`	`74`	`{`
`75`	`75`	`if(m_reconn_timer)`
`76`	`76`	`{`
`@@ -108,6 +108,7 @@ namespace sio`
`108`	`108`	`m_query_string=move(query_str);`
`109`	`109`
`110`	`110`	`m_http_headers = headers;`
	`111`	`+ m_auth = auth;`
`111`	`112`
`112`	`113`	`this->reset_states();`
`113`	`114`	`m_client.get_io_service().dispatch(std::bind(&client_impl::connect_impl,this,uri,m_query_string));`
`@@ -140,7 +141,7 @@ namespace sio`
`140`	`141`	`}`
`141`	`142`	`else`
`142`	`143`	`{`
`143`		`- pair<const string, socket::ptr> p(aux,shared_ptr<sio::socket>(new sio::socket(this,aux)));`
	`144`	`+ pair<const string, socket::ptr> p(aux,shared_ptr<sio::socket>(new sio::socket(this,aux,m_auth)));`
`144`	`145`	`return (m_sockets.insert(p).first)->second;`
`145`	`146`	`}`
`146`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,18 +69,34 @@ namespace sio`
`69`	`69`
`70`	`70`	`void client::connect(const std::string& uri)`
`71`	`71`	`{`
`72`		`- m_impl->connect(uri, {}, {});`
	`72`	`+ m_impl->connect(uri, {}, {}, {});`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ void client::connect(const std::string& uri, const message::ptr& auth)`
	`76`	`+ {`
	`77`	`+ m_impl->connect(uri, {}, {}, auth);`
`73`	`78`	`}`
`74`	`79`
`75`	`80`	`void client::connect(const std::string& uri, const std::map<string,string>& query)`
`76`	`81`	`{`
`77`		`- m_impl->connect(uri, query, {});`
	`82`	`+ m_impl->connect(uri, query, {}, {});`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ void client::connect(const std::string& uri, const std::map<string,string>& query, const message::ptr& auth)`
	`86`	`+ {`
	`87`	`+ m_impl->connect(uri, query, {}, auth);`
`78`	`88`	`}`
`79`	`89`
`80`	`90`	`void client::connect(const std::string& uri, const std::map<std::string,std::string>& query,`
`81`	`91`	`const std::map<std::string,std::string>& http_extra_headers)`
`82`	`92`	`{`
`83`		`- m_impl->connect(uri, query, http_extra_headers);`
	`93`	`+ m_impl->connect(uri, query, http_extra_headers, {});`
	`94`	`+ }`
	`95`	`+`
	`96`	`+ void client::connect(const std::string& uri, const std::map<std::string,std::string>& query,`
	`97`	`+ const std::map<std::string,std::string>& http_extra_headers, const message::ptr& auth)`
	`98`	`+ {`
	`99`	`+ m_impl->connect(uri, query, http_extra_headers, auth);`
`84`	`100`	`}`
`85`	`101`
`86`	`102`	`socket::ptr const& client::socket(const std::string& nsp)`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace sio`
`108`	`108`	`{`
`109`	`109`	`public:`
`110`	`110`
`111`		`- impl(client_impl *,std::string const&);`
	`111`	`+ impl(client_impl *, std::string const&, message::ptr const&);`
`112`	`112`	`~impl();`
`113`	`113`
`114`	`114`	`void on(std::string const& event_name,event_listener_aux const& func);`
`@@ -173,6 +173,7 @@ namespace sio`
`173`	`173`
`174`	`174`	`bool m_connected;`
`175`	`175`	`std::string m_nsp;`
	`176`	`+ message::ptr m_auth;`
`176`	`177`
`177`	`178`	`std::map<unsigned int, std::function<void (message::list const&)> > m_acks;`
`178`	`179`
`@@ -228,10 +229,11 @@ namespace sio`
`228`	`229`	`m_error_listener = nullptr;`
`229`	`230`	`}`
`230`	`231`
`231`		`- socket::impl::impl(client_impl *client,std::string const& nsp):`
	`232`	`+ socket::impl::impl(client_impl *client, std::string const& nsp, message::ptr const& auth):`
`232`	`233`	`m_client(client),`
`233`	`234`	`m_connected(false),`
`234`		`- m_nsp(nsp)`
	`235`	`+ m_nsp(nsp),`
	`236`	`+ m_auth(auth)`
`235`	`237`	`{`
`236`	`238`	`NULL_GUARD(client);`
`237`	`239`	`if(m_client->opened())`
`@@ -269,7 +271,7 @@ namespace sio`
`269`	`271`	`void socket::impl::send_connect()`
`270`	`272`	`{`
`271`	`273`	`NULL_GUARD(m_client);`
`272`		`- packet p(packet::type_connect,m_nsp);`
	`274`	`+ packet p(packet::type_connect, m_nsp, m_auth);`
`273`	`275`	`m_client->send(p);`
`274`	`276`	`m_connection_timer.reset(new asio::steady_timer(m_client->get_io_service()));`
`275`	`277`	`asio::error_code ec;`
`@@ -523,8 +525,8 @@ namespace sio`
`523`	`525`	`return socket::event_listener();`
`524`	`526`	`}`
`525`	`527`
`526`		`- socket::socket(client_impl* client,std::string const& nsp):`
`527`		`- m_impl(new impl(client,nsp))`
	`528`	`+ socket::socket(client_impl* client,std::string const& nsp,message::ptr const& auth):`
	`529`	`+ m_impl(new impl(client,nsp,auth))`
`528`	`530`	`{`
`529`	`531`	`}`
`530`	`532`