Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions discuss/web/channels/user_socket.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ defmodule Discuss.UserSocket do
transport :websocket, Phoenix.Transports.WebSocket

def connect(%{"token" => token}, socket) do
case Phoenix.Token.verify(socket, "key", token) do
{:ok, user_id} ->
{:ok, assign(socket, :user_id, user_id)}
{:error, _error} ->
:error
if token == "undefined" do
{:ok, socket} # anonymous
else
case Phoenix.Token.verify(socket, "key", token) do
{:ok, user_id} ->
{:ok, assign(socket, :user_id, user_id)}
{:error, _error} ->
:error
end
end
end

Expand Down
2 changes: 1 addition & 1 deletion discuss/web/templates/topic/index.html.eex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<li class="collection-item">
<%= link topic.title, to: topic_path(@conn, :show, topic) %>

<%= if @conn.assigns.user.id == topic.user_id do %>
<%= if @conn.assigns.user && @conn.assigns.user.id == topic.user_id do %>
<div class="right">
<%= link "Edit", to: topic_path(@conn, :edit, topic) %>
<%= link "Delete", to: topic_path(@conn, :delete, topic), method: :delete %>
Expand Down