From 9b9735dd0be53c0809271f3a80ca0932ec76780a Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 31 Mar 2020 15:47:34 +0300 Subject: [PATCH] Keep a cookie for whether the user is logged in --- lib/plausible_web/controllers/auth_controller.ex | 10 ++++++---- lib/plausible_web/plugs/session_timeout_plug.ex | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 1250e58e9..9bc7395e3 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -38,6 +38,7 @@ defmodule PlausibleWeb.AuthController do conn |> put_session(:current_user_id, user.id) + |> put_resp_cookie("logged_in", "true") |> redirect(to: "/password") {:error, changeset} -> send_resp(conn, 400, inspect(changeset.errors)) @@ -94,6 +95,7 @@ defmodule PlausibleWeb.AuthController do |> put_flash(:login_title, "Password updated successfully") |> put_flash(:login_instructions, "Please log in with your new credentials") |> put_session(:current_user_id, nil) + |> delete_resp_cookie("logged_in") |> redirect(to: "/login") {:error, changeset} -> render(conn, "password_reset_form.html", changeset: changeset, token: token, layout: {PlausibleWeb.LayoutView, "focus.html"}) @@ -119,6 +121,7 @@ defmodule PlausibleWeb.AuthController do conn |> put_session(:current_user_id, user.id) + |> put_resp_cookie("logged_in", "true") |> put_session(:login_dest, nil) |> redirect(to: login_dest) else @@ -167,7 +170,7 @@ defmodule PlausibleWeb.AuthController do end end - def delete_me(conn, _params) do + def delete_me(conn, params) do user = conn.assigns[:current_user] |> Repo.preload(:sites) |> Repo.preload(:subscription) @@ -183,14 +186,13 @@ defmodule PlausibleWeb.AuthController do Repo.delete!(user.subscription) Repo.delete!(user) - conn - |> configure_session(drop: true) - |> redirect(to: "/") + logout(conn, params) end def logout(conn, _params) do conn |> configure_session(drop: true) + |> delete_resp_cookie("logged_in") |> redirect(to: "/") end diff --git a/lib/plausible_web/plugs/session_timeout_plug.ex b/lib/plausible_web/plugs/session_timeout_plug.ex index bff1ecc2f..1cf673428 100644 --- a/lib/plausible_web/plugs/session_timeout_plug.ex +++ b/lib/plausible_web/plugs/session_timeout_plug.ex @@ -11,7 +11,9 @@ defmodule PlausibleWeb.SessionTimeoutPlug do cond do user_id && timeout_at && now() > timeout_at -> - configure_session(conn, drop: true) + conn + |> configure_session(drop: true) + |> delete_resp_cookie("logged_in") user_id -> put_session(conn, :session_timeout_at, new_session_timeout_at(opts[:timeout_after_seconds])) true ->