No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/web/controllers/plugs/set_user.ex b/web/controllers/plugs/set_user.ex
	index 7e383e5..1dea714 100644
	--- a/web/controllers/plugs/set_user.ex
	+++ b/web/controllers/plugs/set_user.ex
	@@ -1,38 +1,32 @@
	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: 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
	+ assign(conn, :user, get_user_by_id(user_id))
	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