3 files changed, 14 insertions, 5 deletions
diff --git a/lib/rook_web/channels/request_channel.ex b/lib/rook_web/channels/request_channel.ex
index cc84b0f..9773d30 100644
--- a/lib/rook_web/channels/request_channel.ex
+++ b/lib/rook_web/channels/request_channel.ex
@@ -1,10 +1,18 @@
 defmodule RookWeb.RequestChannel do
   use RookWeb, :channel
 
-  def join("request:" <> token, %{"share" => share_token}, socket) do
+  def join("request:" <> token, %{"share" => share_token, "user_agent" => user_agent}, socket) do
     if Rook.Token.match?(token, socket) do
       if Rook.Share.exists?(share_token) do
-        Rook.Request.Actions.start(token, share_token)
+        ip = socket.assigns[:ip]
+
+        info = %{
+          ip: ip,
+          location: Rook.Identity.get_location_from_ip(ip),
+          client: Rook.Identity.get_client_from_user_agent(user_agent)
+        }
+
+        Rook.Request.Actions.start(token, share_token, info)
         {:ok, socket}
       else
         {:error, %{reason: "No such share exists."}}
diff --git a/lib/rook_web/channels/user_socket.ex b/lib/rook_web/channels/user_socket.ex
index d6ce9c4..1a4dbd0 100644
--- a/lib/rook_web/channels/user_socket.ex
+++ b/lib/rook_web/channels/user_socket.ex
@@ -18,9 +18,10 @@ defmodule RookWeb.UserSocket do
   # See `Phoenix.Token` documentation for examples in
   # performing token verification on connect.
   @impl true
-  def connect(_params, socket, _connect_info) do
+  def connect(_params, socket, connect_info) do
     token = Rook.Token.token()
-    {:ok, assign(socket, :token, token)}
+    ip = Rook.Identity.get_ip_from_connect_info(connect_info)
+    {:ok, assign(socket, token: token, ip: ip)}
   end
 
   # Socket id's are topics that allow you to identify all sockets for a given user:
diff --git a/lib/rook_web/endpoint.ex b/lib/rook_web/endpoint.ex
index dd847f7..31c9790 100644
--- a/lib/rook_web/endpoint.ex
+++ b/lib/rook_web/endpoint.ex
@@ -11,7 +11,7 @@ defmodule RookWeb.Endpoint do
   ]
 
   socket "/socket", RookWeb.UserSocket,
-    websocket: true,
+    websocket: [connect_info: [:peer_data, :x_headers]],
     longpoll: false
 
   # Serve at "/" the static files from "priv/static" directory.