Merge pull request #703 from banzay/fix-user-fetched-twice

User being fetched twice during authentication sequence

Author: joshsmith

test/plugs/current_user_test.exs

@@ -0,0 +1,20 @@
+defmodule CodeCorps.Plug.CurrentUserTest do
+
+  use CodeCorps.ConnCase
+
+  test "sets conn.assigns[:current_user] if user is authenticated" do
+    user = build(:user, first_name: "John");
+    conn = Guardian.Plug.set_current_resource(
+      build_conn(),
+      user
+    )
+    result_conn = CodeCorps.Plug.CurrentUser.call(conn, [])
+    assert result_conn.assigns[:current_user] == user
+  end
+
+  test "simply returns conn if user is not authenticated" do
+    conn = build_conn()
+    result_conn = CodeCorps.Plug.CurrentUser.call(conn, [])
+    assert result_conn == conn
+  end
+end

web/plugs/current_user.ex

@@ -1,19 +1,18 @@
 defmodule CodeCorps.Plug.CurrentUser do
-  alias CodeCorps.GuardianSerializer
+  @moduledoc """
+  Puts authenticated Guardian user into conn.assigns[:current_user]
+  """
 
+  @spec init(Keyword.t) :: Keyword.t
   def init(opts), do: opts
 
+  @spec call(Plug.Conn.t, Keyword.t) :: Plug.Conn.t
   def call(conn, _opts) do
-    case Guardian.Plug.current_token(conn) do
+    case Guardian.Plug.current_resource(conn) do
+      user = %CodeCorps.User{} ->
+        Plug.Conn.assign(conn, :current_user, user)
       nil ->
         conn
-      current_token ->
-        with {:ok, claims} <- Guardian.decode_and_verify(current_token),
-             {:ok, user} <- GuardianSerializer.from_token(claims["sub"]) do
-                Plug.Conn.assign(conn, :current_user, user)
-        else
-          {:error, _reason} -> conn
-        end
     end
   end
 end