Redirect to previous page after logging in (beyond-all-reason#309)

StanczakDominik · Jun 9, 2024 · 47b2ba7 · 47b2ba7
1 parent 902fbad
commit 47b2ba7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/teiserver/account/error_handler.ex b/lib/teiserver/account/error_handler.ex
@@ -6,7 +6,10 @@ defmodule Teiserver.Account.ErrorHandler do
   @impl Guardian.Plug.ErrorHandler
 
   def auth_error(conn, {:unauthenticated, _reason}, _opts) do
+    redirect_to = "#{conn.request_path}?#{conn.query_string}"
+
     conn
+    |> put_resp_cookie("_redirect_to", redirect_to, sign: true, max_age: 60 * 5)
     |> Phoenix.Controller.redirect(
       to: TeiserverWeb.Router.Helpers.account_session_path(conn, :login)
     )

diff --git a/lib/teiserver_web/components/nav_components.ex b/lib/teiserver_web/components/nav_components.ex
@@ -271,12 +271,7 @@ defmodule TeiserverWeb.NavComponents do
     ~H"""
     <div class="col sub-menu-icon">
       <a href={@url} class={"block-link #{@active_class}"}>
-        <Fontawesome.icon
-          :if={@icon}
-          icon={@icon}
-          style="solid"
-          size="2x"
-        /><br />
+        <Fontawesome.icon :if={@icon} icon={@icon} style="solid" size="2x" /><br />
         <%= render_slot(@inner_block) %>
       </a>
     </div>

diff --git a/lib/teiserver_web/controllers/account/session_controller.ex b/lib/teiserver_web/controllers/account/session_controller.ex
@@ -100,11 +100,14 @@ defmodule TeiserverWeb.Account.SessionController do
   end
 
   defp login_reply({:ok, user}, conn) do
+    cookies = Plug.Conn.fetch_cookies(conn, signed: ~w(_redirect_to)).cookies
+
     conn
     |> put_flash(:info, "Welcome back!")
     |> Guardian.Plug.sign_in(user)
     |> Guardian.Plug.remember_me(user)
-    |> redirect(to: "/")
+    |> Plug.Conn.delete_resp_cookie("_redirect_to", sign: true)
+    |> redirect(to: Map.get(cookies, "_redirect_to", "/"))
   end
 
   defp login_reply({:error, reason}, conn) do