diff --git a/lib/app_web/controllers/profile_controller.ex b/lib/app_web/controllers/profile_controller.ex index 7fe09f5e..a176a2a6 100644 --- a/lib/app_web/controllers/profile_controller.ex +++ b/lib/app_web/controllers/profile_controller.ex @@ -1,7 +1,6 @@ defmodule AppWeb.ProfileController do use AppWeb, :controller alias App.Person - plug :loggedin plug :permission_profile when action in [:show, :edit, :update] def show(conn, %{"personid" => person_id}) do @@ -16,14 +15,6 @@ defmodule AppWeb.ProfileController do render(conn, "edit.html", profile: profile, changeset: changeset) end - defp loggedin(conn, _opts) do - if not is_nil(conn.assigns[:jwt]) do - assign(conn, :loggedin, true) - else - assign(conn, :loggedin, false) - end - end - defp permission_profile(conn, _opts) do person_id = conn.assigns[:person][:id] || 0 diff --git a/lib/app_web/controllers/tag_controller.ex b/lib/app_web/controllers/tag_controller.ex index 0b63076d..de7ed212 100644 --- a/lib/app_web/controllers/tag_controller.ex +++ b/lib/app_web/controllers/tag_controller.ex @@ -1,7 +1,6 @@ defmodule AppWeb.TagController do use AppWeb, :controller alias App.Tag - plug :loggedin plug :permission_tag when action in [:edit, :update, :delete] def index(conn, _params) do @@ -41,14 +40,6 @@ defmodule AppWeb.TagController do |> redirect(to: Routes.tag_path(conn, :index)) end - defp loggedin(conn, _opts) do - if not is_nil(conn.assigns[:jwt]) do - assign(conn, :loggedin, true) - else - assign(conn, :loggedin, false) - end - end - defp permission_tag(conn, _opts) do tag = Tag.get_tag!(conn.params["id"]) diff --git a/lib/app_web/router.ex b/lib/app_web/router.ex index 3fbcef74..9adb06ab 100644 --- a/lib/app_web/router.ex +++ b/lib/app_web/router.ex @@ -17,9 +17,10 @@ defmodule AppWeb.Router do end pipeline :authOptional, do: plug(AuthPlugOptional) + pipeline :verify_loggedin, do: plug(:loggedin) scope "/", AppWeb do - pipe_through [:browser, :authOptional] + pipe_through [:browser, :authOptional, :verify_loggedin] live "/", AppLive resources "/tags", TagController, except: [:show] @@ -30,4 +31,12 @@ defmodule AppWeb.Router do except: [:index, :delete], param: "person_id" end + + defp loggedin(conn, _opts) do + if not is_nil(conn.assigns[:jwt]) do + assign(conn, :loggedin, true) + else + assign(conn, :loggedin, false) + end + end end diff --git a/lib/app_web/templates/layout/root.html.heex b/lib/app_web/templates/layout/root.html.heex index eb103058..ca048d74 100644 --- a/lib/app_web/templates/layout/root.html.heex +++ b/lib/app_web/templates/layout/root.html.heex @@ -19,7 +19,6 @@ avatar image - <%= Routes.profile_path(@conn, :show, @person.id) %> <% else %>

Hi Friend!

<% end %>