From 72b4e05bbf9e4c806d137b536515dfe31cae139d Mon Sep 17 00:00:00 2001 From: hq1 Date: Thu, 4 Jan 2024 10:14:25 +0100 Subject: [PATCH] Always enable e-mail verification on full build (#3666) * Always enable e-mail verification on full build * s/change/set * Update lib/plausible/auth/user.ex Co-authored-by: Adrian Gruntkowski --------- Co-authored-by: Adrian Gruntkowski --- lib/plausible/auth/user.ex | 14 ++++++++------ .../controllers/auth_controller_sync_test.exs | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.ex index 7dc117ff4..80fa87992 100644 --- a/lib/plausible/auth/user.ex +++ b/lib/plausible/auth/user.ex @@ -66,8 +66,8 @@ defmodule Plausible.Auth.User do |> validate_confirmation(:password, required: true) |> validate_password_strength() |> hash_password() - |> start_trial - |> set_email_verified + |> start_trial() + |> set_email_verification_status() |> unique_constraint(:email) end @@ -85,7 +85,7 @@ defmodule Plausible.Auth.User do |> validate_email_changed() |> check_password() |> unique_constraint(:email) - |> set_email_verified() + |> set_email_verification_status() |> put_change(:previous_email, user.email) end @@ -259,11 +259,13 @@ defmodule Plausible.Auth.User do end end - defp set_email_verified(user) do - if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :enable_email_verification) do + defp set_email_verification_status(user) do + on_full_build do change(user, email_verified: false) else - change(user, email_verified: true) + selfhosted_config = Application.get_env(:plausible, :selfhost) + must_verify? = Keyword.fetch!(selfhosted_config, :enable_email_verification) + change(user, email_verified: not must_verify?) end end end diff --git a/test/plausible_web/controllers/auth_controller_sync_test.exs b/test/plausible_web/controllers/auth_controller_sync_test.exs index ca2c58d80..3e7ec55d9 100644 --- a/test/plausible_web/controllers/auth_controller_sync_test.exs +++ b/test/plausible_web/controllers/auth_controller_sync_test.exs @@ -8,6 +8,7 @@ defmodule PlausibleWeb.AuthControllerSyncTest do describe "PUT /settings/email" do setup [:create_user, :log_in] + @tag :small_build_only test "updates email but DOES NOT force reverification when feature disabled", %{ conn: conn, user: user