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 <adrian.gruntkowski@gmail.com>

---------

Co-authored-by: Adrian Gruntkowski <adrian.gruntkowski@gmail.com>
pull/3663/head^2 r2024.01.04-304
hq1 3 years ago committed by GitHub
parent 4569ac09c1
commit 72b4e05bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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

@ -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

Loading…
Cancel
Save