From 9d7222d1632c714dc9eb69a21134557b21f2d5fe Mon Sep 17 00:00:00 2001 From: TheodoorP Date: Mon, 25 Jan 2021 15:30:46 +0100 Subject: [PATCH] fix(register): moved disabling of registration logic to router --- .../controllers/auth_controller.ex | 76 ++++++++----------- lib/plausible_web/router.ex | 7 +- .../admin_auth_controller_test.exs | 4 +- 3 files changed, 41 insertions(+), 46 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index fdce9aeaa..ffabfd91a 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -18,55 +18,45 @@ defmodule PlausibleWeb.AuthController do ] def register_form(conn, _params) do - if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do - conn - |> redirect(to: "/login") - else - changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{}) + changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{}) - render(conn, "register_form.html", - changeset: changeset, - layout: {PlausibleWeb.LayoutView, "focus.html"} - ) - end + render(conn, "register_form.html", + changeset: changeset, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) end def register(conn, params) do - if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do - conn - |> redirect(to: "/login") - else - user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"]) - - if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do - case Repo.insert(user) do - {:ok, user} -> - code = Auth.issue_email_verification(user) - Logger.info("VERIFICATION CODE: #{code}") - email_template = PlausibleWeb.Email.activation_email(user, code) - Plausible.Mailer.send_email(email_template) - - conn - |> put_session(:current_user_id, user.id) - |> put_resp_cookie("logged_in", "true", - http_only: false, - max_age: 60 * 60 * 24 * 365 * 5000 - ) - |> redirect(to: "/activate") + user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"]) - {:error, changeset} -> - render(conn, "register_form.html", - changeset: changeset, - layout: {PlausibleWeb.LayoutView, "focus.html"} - ) - end - else - render(conn, "register_form.html", - changeset: user, - captcha_error: "Please complete the captcha to register", - layout: {PlausibleWeb.LayoutView, "focus.html"} - ) + if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do + case Repo.insert(user) do + {:ok, user} -> + code = Auth.issue_email_verification(user) + Logger.info("VERIFICATION CODE: #{code}") + email_template = PlausibleWeb.Email.activation_email(user, code) + Plausible.Mailer.send_email(email_template) + + conn + |> put_session(:current_user_id, user.id) + |> put_resp_cookie("logged_in", "true", + http_only: false, + max_age: 60 * 60 * 24 * 365 * 5000 + ) + |> redirect(to: "/activate") + + {:error, changeset} -> + render(conn, "register_form.html", + changeset: changeset, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) end + else + render(conn, "register_form.html", + changeset: user, + captcha_error: "Please complete the captcha to register", + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) end end diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 13e881c21..a7ff4a771 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -77,8 +77,11 @@ defmodule PlausibleWeb.Router do scope "/", PlausibleWeb do pipe_through :browser - get "/register", AuthController, :register_form - post "/register", AuthController, :register + if !Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do + get "/register", AuthController, :register_form + post "/register", AuthController, :register + end + get "/activate", AuthController, :activate_form post "/activate/request-code", AuthController, :request_activation_code post "/activate", AuthController, :activate diff --git a/test/plausible_web/controllers/admin_auth_controller_test.exs b/test/plausible_web/controllers/admin_auth_controller_test.exs index c3056342f..21c9636ae 100644 --- a/test/plausible_web/controllers/admin_auth_controller_test.exs +++ b/test/plausible_web/controllers/admin_auth_controller_test.exs @@ -32,7 +32,9 @@ defmodule PlausibleWeb.AdminAuthControllerTest do test "disable registration", %{conn: conn} do set_config(disable_registration: true) conn = get(conn, "/register") - assert redirected_to(conn) == "/login" + assert html_response(conn, 404) + conn = post(conn, "/register") + assert html_response(conn, 404) end end