Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Distinguish repeated signup submissions (#6606)

Uku Taht9cc669b97ece
diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.ex
index 4b71d67971..bf4b5363ad 100644
--- a/lib/plausible_web/live/register_form.ex
+++ b/lib/plausible_web/live/register_form.ex
@@ -10,6 +10,12 @@ defmodule PlausibleWeb.Live.RegisterForm do
alias Plausible.Teams
alias PlausibleWeb.Layouts
+ @signup_error_categories %{
+ name: "name",
+ email: "email",
+ password: "password"
+ }
+
def mount(params, _session, socket) do
socket =
socket
@@ -50,6 +56,7 @@ defmodule PlausibleWeb.Live.RegisterForm do
captcha_error: nil,
password_strength: Auth.User.password_strength(changeset),
disable_submit: false,
+ signup_previous_error: nil,
trigger_submit: false,
heading: heading,
subtitle: subtitle
@@ -95,7 +102,7 @@ defmodule PlausibleWeb.Live.RegisterForm do
id="register-form"
class="flex flex-col gap-y-6"
action={Routes.auth_path(@socket, :login)}
- onsubmit={form_submit_event(@invitation)}
+ onsubmit={form_submit_event(@invitation, @signup_previous_error)}
phx-change="validate"
phx-submit="register"
phx-trigger-action={@trigger_submit}
@@ -172,11 +179,13 @@ defmodule PlausibleWeb.Live.RegisterForm do
end
on_ee do
- defp form_submit_event(invitation) do
- "window.plausible('Signup#{if invitation, do: " via invitation"}')"
+ defp form_submit_event(invitation, previous_error) do
+ options = Jason.encode!(%{"props" => %{"previous_error" => previous_error || "none"}})
+
+ "window.plausible('Signup#{if invitation, do: " via invitation"}', #{options})"
end
else
- defp form_submit_event(_), do: ""
+ defp form_submit_event(_, _), do: ""
end
defp name_input(assigns) do
@@ -273,8 +282,10 @@ defmodule PlausibleWeb.Live.RegisterForm do
end
defp captcha_failed(socket) do
+ error = "Please complete the captcha to register"
+
socket
- |> assign(:captcha_error, "Please complete the captcha to register")
+ |> assign(captcha_error: error, signup_previous_error: "captcha")
|> PlausibleWeb.Components.Captcha.reset()
end
@@ -293,13 +304,23 @@ defmodule PlausibleWeb.Live.RegisterForm do
{:error, changeset} ->
socket =
socket
- |> assign(form: to_form(Map.put(changeset, :action, :validate)))
+ |> assign(
+ form: to_form(Map.put(changeset, :action, :validate)),
+ signup_previous_error: signup_error(changeset)
+ )
|> PlausibleWeb.Components.Captcha.reset()
{:noreply, socket}
end
end
+ defp signup_error(changeset) do
+ case List.first(changeset.errors) do
+ {field, _error} -> Map.get(@signup_error_categories, field, "unknown")
+ nil -> "unknown"
+ end
+ end
+
defp do_add_user(user, opts) do
case Repo.insert(user) do
{:ok, user} ->
diff --git a/test/plausible_web/live/register_form_test.exs b/test/plausible_web/live/register_form_test.exs
index eab969c08b..e4b2e5d3cc 100644
--- a/test/plausible_web/live/register_form_test.exs
+++ b/test/plausible_web/live/register_form_test.exs
@@ -50,6 +50,11 @@ defmodule PlausibleWeb.Live.RegisterFormTest do
lv = get_liveview(conn, "/register")
+ on_ee do
+ html = render(lv)
+ assert_signup_tracking(html, "none")
+ end
+
type_into_input(lv, "user[name]", "Mary Sue")
type_into_input(lv, "user[email]", "[email protected]")
type_into_input(lv, "user[password]", "very-long-and-very-secret-123")
@@ -93,6 +98,10 @@ defmodule PlausibleWeb.Live.RegisterFormTest do
assert html =~ "Please complete the captcha to register"
assert_push_event(lv, "reset-frc-captcha", %{})
+ on_ee do
+ assert_signup_tracking(html, "captcha")
+ end
+
refute Repo.one(User)
end
@@ -111,6 +120,10 @@ defmodule PlausibleWeb.Live.RegisterFormTest do
assert html =~ "has already been taken"
assert_push_event(lv, "reset-frc-captcha", %{})
+
+ on_ee do
+ assert_signup_tracking(html, "email")
+ end
end
end
@@ -279,6 +292,15 @@ defmodule PlausibleWeb.Live.RegisterFormTest do
|> render_change(%{id => text})
end
+ on_ee do
+ defp assert_signup_tracking(html, previous_error_category) do
+ options = Jason.encode!(%{"props" => %{"previous_error" => previous_error_category}})
+
+ assert text_of_attr(html, "#register-form", "onsubmit") ==
+ "window.plausible('Signup', #{options})"
+ end
+ end
+
defp mock_captcha_success() do
mock_captcha(true)
end