Remove admin user controller

Author: troym9731

web/controllers/admin/user_controller.ex

@@ -13,7 +13,6 @@ defmodule Org.AuthController do
 
   def delete(conn, _params) do
     conn
-    |> put_flash(:info, "You have been logged out!")
     |> configure_session(drop: true)
     |> redirect(to: "/")
   end
@@ -38,10 +37,10 @@ defmodule Org.AuthController do
     |> redirect(to: "/")
   end
 
-  defp authorize_url!("github"),   do: GitHub.authorize_url!
+  defp authorize_url!("github"), do: GitHub.authorize_url!
   defp authorize_url!(_), do: raise "No matching provider available"
 
-  defp get_token!("github", code),   do: GitHub.get_token!(code: code)
+  defp get_token!("github", code), do: GitHub.get_token!(code: code)
   defp get_token!(_, _), do: raise "No matching provider available"
 
   defp get_user!("github", token) do
@@ -69,10 +68,11 @@ defmodule Org.AuthController do
   end
 
   defp find_or_create_user(user) do
-    case Repo.get_by(User, github_id: user[:github_id]) do
+    user = case Repo.get_by(User, github_id: user[:github_id]) do
       nil  -> %User{} # User not found, we build one
       user -> user    # User exists, let's use it
     end
+
     user
     |> User.changeset
     |> Repo.insert_or_update!

web/controllers/auth_controller.ex

@@ -32,7 +32,7 @@ defmodule Org.Api.UserController do
     |> Repo.get!(id)
     |> authorize!(:update, current_user(conn))
     |> User.changeset(user_params)
-    |> update_user(conn, &(render(conn, "show.json", user: &1)))
+    |> update_user(conn)
   end
 
   def apply(conn, %{"id" => id, "user" => user_params}) do
@@ -51,10 +51,10 @@ defmodule Org.Api.UserController do
     end
   end
 
-  defp update_user(changeset, conn, func) do
+  defp update_user(changeset, conn) do
     case Repo.update(changeset) do
       {:ok, user} ->
-        func.(user)
+        render(conn, "show.json", user: user)
       {:error, %{errors: errors}} ->
         conn
         |> put_status(409)