diff --git a/web/channels/user_socket.ex b/web/channels/user_socket.ex index ca20994..a731204 100644 --- a/web/channels/user_socket.ex +++ b/web/channels/user_socket.ex @@ -1,41 +1,41 @@ defmodule KolabChat.UserSocket do use Phoenix.Socket alias KolabChat.Database ## Channels channel "room:*", KolabChat.RoomChannel channel "system", KolabChat.SystemChannel ## Transports transport :websocket, Phoenix.Transports.WebSocket transport :longpoll, Phoenix.Transports.LongPoll # Socket params are passed from the client and can # be used to verify and authenticate a user. After # verification, you can put default assigns into # the socket that will be set for all channels, ie # {:ok, assign(socket, :user_id, verified_user_id)} # To deny connection, return `:error`. def connect(%{"token" => token}, socket) do - case Phoenix.Token.verify(socket, "user", token, max_age: 86400) do + case Phoenix.Token.verify(socket, "user", token, max_age: 86_400) do {:ok, user_id} -> socket = assign(socket, :user, Database.User.read!(user_id)) {:ok, socket} {:error, _} -> :error end end # Socket id's are topics that allow you to identify all sockets for a given user: # # def id(socket), do: "users_socket:#{socket.assigns.user_id}" # # Would allow you to broadcast a "disconnect" event and terminate # all active sockets and channels for a given user: # # KolabChat.Endpoint.broadcast("users_socket:#{user.id}", "disconnect", %{}) # # Returning `nil` makes this socket anonymous. def id(_socket), do: nil end diff --git a/web/controllers/plugs/set_user.ex b/web/controllers/plugs/set_user.ex index 784ec23..7e383e5 100644 --- a/web/controllers/plugs/set_user.ex +++ b/web/controllers/plugs/set_user.ex @@ -1,38 +1,38 @@ defmodule KolabChat.Plugs.SetUser do import Plug.Conn alias KolabChat.Database def init(params), do: params # token authentication def call(%{"params": %{"token" => token}} = conn, _params) do - case Phoenix.Token.verify(conn, "user", token, max_age: 86400) do + case Phoenix.Token.verify(conn, "user", token, max_age: 86_400) do {:ok, user_id} -> assign(conn, :user, get_user_by_id(user_id)) _ -> assign(conn, :user, nil) end end # session authentication def call(conn, _params) do user_id = get_session(conn, :user_id) cond do user = user_id && get_user_by_id(user_id) -> assign(conn, :user, user) true -> assign(conn, :user, nil) end end def get_user_by_id(user_id) do require Amnesia require Amnesia.Helper Amnesia.transaction do Database.User.read(user_id) end end end