Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Trigger email reverification on change (#3388)
Adrian Gruntkowski439c5014d42e
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 022b3d7ca6..7b792ce7ab 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.- Add `custom_props.csv` to CSV export (almost the same as the old `prop_breakdown.csv`, but has different column headers, and includes props for pageviews too, not only custom events)- Add `referrers.csv` to CSV export- Improve password validation in registration and password reset forms+- Enforce email reverification on update### Removed- Removed the nested custom event property breakdown UI when filtering by a goal in Goal Conversionsdiff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.exindex e75b88ff83..b6f52cc409 100644--- a/lib/plausible/auth/user.ex+++ b/lib/plausible/auth/user.ex@@ -28,6 +28,7 @@ defmodule Plausible.Auth.User dofield :trial_expiry_date, :datefield :theme, Ecto.Enum, values: [:system, :light, :dark]field :email_verified, :boolean+ field :previous_email, :stringembeds_one :grace_period, Plausible.Auth.GracePeriod, on_replace: :updatehas_many :site_memberships, Plausible.Site.Membership@@ -61,6 +62,31 @@ defmodule Plausible.Auth.User do|> unique_constraint(:email)end+ def email_changeset(user, attrs \\ %{}) do+ user+ |> cast(attrs, [:email, :password])+ |> validate_required([:email, :password])+ |> validate_email_changed()+ |> check_password()+ |> unique_constraint(:email)+ |> put_change(:email_verified, false)+ |> put_change(:previous_email, user.email)+ end++ def cancel_email_changeset(user) do+ if user.previous_email do+ user+ |> change()+ |> unique_constraint(:email)+ |> put_change(:email_verified, true)+ |> put_change(:email, user.previous_email)+ |> put_change(:previous_email, nil)+ else+ # It shouldn't happen under normal circumstances+ raise "Previous email is empty for user #{user.id} (#{user.email}) when it shouldn't."+ end+ end+def changeset(user, attrs \\ %{}) douser|> cast(attrs, [:email, :name, :email_verified, :theme, :trial_expiry_date])@@ -127,6 +153,26 @@ defmodule Plausible.Auth.User do%{suggestions: [], warning: "", score: 3}end+ defp validate_email_changed(changeset) do+ if !get_change(changeset, :email) && !changeset.errors[:email] do+ add_error(changeset, :email, "can't be the same", validation: :different_email)+ else+ changeset+ end+ end++ defp check_password(changeset) do+ if password = get_change(changeset, :password) do+ if Plausible.Auth.Password.match?(password, changeset.data.password_hash) do+ changeset+ else+ add_error(changeset, :password, "is invalid", validation: :check_password)+ end+ else+ changeset+ end+ end+defp validate_password_strength(changeset) doif get_change(changeset, :password) != nil and password_strength(changeset).score <= 2 doadd_error(changeset, :password, "is too weak", validation: :strength)diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.exindex b1a5016eb3..563bfb6822 100644--- a/lib/plausible/auth/user_admin.ex+++ b/lib/plausible/auth/user_admin.ex@@ -12,6 +12,7 @@ defmodule Plausible.Auth.UserAdmin do[name: nil,email: nil,+ previous_email: nil,trial_expiry_date: nil]enddiff --git a/lib/plausible/site/memberships.ex b/lib/plausible/site/memberships.exindex 71dc272d16..cb743e6ecc 100644--- a/lib/plausible/site/memberships.ex+++ b/lib/plausible/site/memberships.ex@@ -3,9 +3,30 @@ defmodule Plausible.Site.Memberships doAPI for site memberships and invitations"""+ import Ecto.Query, only: [from: 2]++ alias Plausible.Repoalias Plausible.Site.Membershipsdefdelegate accept_invitation(invitation_id, user), to: Memberships.AcceptInvitationdefdelegate reject_invitation(invitation_id, user), to: Memberships.RejectInvitationdefdelegate remove_invitation(invitation_id, site), to: Memberships.RemoveInvitation++ @spec any?(String.t()) :: boolean()+ def any?(user_id) do+ Repo.exists?(+ from(m in Plausible.Site.Membership,+ where: m.user_id == ^user_id+ )+ )+ end++ @spec has_any_invitations?(String.t()) :: boolean()+ def has_any_invitations?(email) do+ Repo.exists?(+ from(i in Plausible.Auth.Invitation,+ where: i.email == ^email+ )+ )+ endenddiff --git a/lib/plausible/users.ex b/lib/plausible/users.exindex abf44849f3..d7724103d5 100644--- a/lib/plausible/users.ex+++ b/lib/plausible/users.ex@@ -26,6 +26,15 @@ defmodule Plausible.Users do)end+ @spec has_email_code?(String.t()) :: boolean()+ def has_email_code?(user_id) do+ Repo.exists?(+ from(c in "email_verification_codes",+ where: c.user_id == ^user_id+ )+ )+ end+defp last_subscription_query(user_id) dofrom(subscription in Plausible.Billing.Subscription,where: subscription.user_id == ^user_id,diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex 566899762c..e969c87c38 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -7,6 +7,7 @@ defmodule PlausibleWeb.AuthController doplug(PlausibleWeb.RequireLoggedOutPlugwhen action in [+ :register_form,:register,:register_from_invitation,:login_form,@@ -19,8 +20,15 @@ defmodule PlausibleWeb.AuthController dowhen action in [:user_settings,:save_settings,+ :update_email,+ :cancel_update_email,+ :new_api_key,+ :create_api_key,+ :delete_api_key,:delete_me,- :activate_form+ :activate_form,+ :activate,+ :request_activation_code])@@ -30,13 +38,6 @@ defmodule PlausibleWeb.AuthController doassign(conn, :is_selfhost, Plausible.Release.selfhost?())end- def register_form(conn, _params) do- render(conn, "register_form.html",- connect_live_socket: true,- layout: {PlausibleWeb.LayoutView, "focus.html"}- )- end-def register(conn, %{"user" => %{"email" => email, "password" => password}}) dowith {:ok, user} <- login_user(conn, email, password) doconn = set_user_session(conn, user)@@ -78,23 +79,10 @@ defmodule PlausibleWeb.AuthController dodef activate_form(conn, _params) douser = conn.assigns[:current_user]- has_invitation =- Repo.exists?(- from(i in Plausible.Auth.Invitation,- where: i.email == ^user.email- )- )-- has_code =- Repo.exists?(- from(c in "email_verification_codes",- where: c.user_id == ^user.id- )- )-render(conn, "activate.html",- has_pin: has_code,- has_invitation: has_invitation,+ has_email_code?: Plausible.Users.has_email_code?(user.id),+ has_any_invitations?: Plausible.Site.Memberships.has_any_invitations?(user.email),+ has_any_memberships?: Plausible.Site.Memberships.any?(user.id),layout: {PlausibleWeb.LayoutView, "focus.html"})end@@ -102,36 +90,41 @@ defmodule PlausibleWeb.AuthController dodef activate(conn, %{"code" => code}) douser = conn.assigns[:current_user]- has_invitation =- Repo.exists?(- from(i in Plausible.Auth.Invitation,- where: i.email == ^user.email- )- )+ has_any_invitations? = Plausible.Site.Memberships.has_any_invitations?(user.email)+ has_any_memberships? = Plausible.Site.Memberships.any?(user.id){code, ""} = Integer.parse(code)case Auth.verify_email(user, code) do:ok ->- if has_invitation do- redirect(conn, to: Routes.site_path(conn, :index))- else- redirect(conn, to: Routes.site_path(conn, :new))+ cond do+ has_any_memberships? ->+ conn+ |> put_flash(:success, "Email updated successfully")+ |> redirect(to: Routes.auth_path(conn, :user_settings) <> "#change-email-address")++ has_any_invitations? ->+ redirect(conn, to: Routes.site_path(conn, :index))++ true ->+ redirect(conn, to: Routes.site_path(conn, :new))end{:error, :incorrect} ->render(conn, "activate.html",error: "Incorrect activation code",- has_pin: true,- has_invitation: has_invitation,+ has_email_code?: true,+ has_any_invitations?: has_any_invitations?,+ has_any_memberships?: has_any_memberships?,layout: {PlausibleWeb.LayoutView, "focus.html"}){:error, :expired} ->render(conn, "activate.html",error: "Code is expired, please request another one",- has_pin: false,- has_invitation: has_invitation,+ has_email_code?: false,+ has_any_invitations?: has_any_invitations?,+ has_any_memberships?: has_any_memberships?,layout: {PlausibleWeb.LayoutView, "focus.html"})end@@ -331,8 +324,10 @@ defmodule PlausibleWeb.AuthController doenddef user_settings(conn, _params) do- changeset = Auth.User.settings_changeset(conn.assigns[:current_user])- render_settings(conn, changeset)+ settings_changeset = Auth.User.settings_changeset(conn.assigns[:current_user])+ email_changeset = Auth.User.settings_changeset(conn.assigns[:current_user])++ render_settings(conn, settings_changeset: settings_changeset, email_changeset: email_changeset)enddef save_settings(conn, %{"user" => user_params}) do@@ -345,17 +340,58 @@ defmodule PlausibleWeb.AuthController do|> redirect(to: Routes.auth_path(conn, :user_settings)){:error, changeset} ->- render_settings(conn, changeset)+ email_changeset = Auth.User.settings_changeset(conn.assigns[:current_user])++ render_settings(conn, settings_changeset: changeset, email_changeset: email_changeset)+ end+ end++ def update_email(conn, %{"user" => user_params}) do+ changes = Auth.User.email_changeset(conn.assigns[:current_user], user_params)++ case Repo.update(changes) do+ {:ok, user} ->+ send_email_verification(user)++ redirect(conn, to: Routes.auth_path(conn, :activate_form))++ {:error, changeset} ->+ settings_changeset = Auth.User.settings_changeset(conn.assigns[:current_user])++ render_settings(conn, settings_changeset: settings_changeset, email_changeset: changeset)+ end+ end++ def cancel_update_email(conn, _params) do+ changeset = Auth.User.cancel_email_changeset(conn.assigns.current_user)++ case Repo.update(changeset) do+ {:ok, user} ->+ conn+ |> put_flash(:success, "Email changed back to #{user.email}")+ |> redirect(to: Routes.auth_path(conn, :user_settings) <> "#change-email-address")++ {:error, _} ->+ conn+ |> put_flash(+ :error,+ "Could not cancel email update because previous email has already been taken"+ )+ |> redirect(to: Routes.auth_path(conn, :activate_form))endend- defp render_settings(conn, changeset) do+ defp render_settings(conn, opts) do+ settings_changeset = Keyword.fetch!(opts, :settings_changeset)+ email_changeset = Keyword.fetch!(opts, :email_changeset)+user = Plausible.Users.with_subscription(conn.assigns[:current_user]){pageview_usage, custom_event_usage} = Plausible.Billing.usage_breakdown(user)render(conn, "user_settings.html",user: user |> Repo.preload(:api_keys),- changeset: changeset,+ settings_changeset: settings_changeset,+ email_changeset: email_changeset,subscription: user.subscription,invoices: Plausible.Billing.paddle_api().get_invoices(user.subscription),theme: user.theme || "system",diff --git a/lib/plausible_web/plugs/require_account.ex b/lib/plausible_web/plugs/require_account.exindex 4295a48017..4073cd79af 100644--- a/lib/plausible_web/plugs/require_account.ex+++ b/lib/plausible_web/plugs/require_account.ex@@ -1,6 +1,13 @@defmodule PlausibleWeb.RequireAccountPlug doimport Plug.Conn+ @unverified_email_exceptions [+ ["settings", "email", "cancel"],+ ["activate"],+ ["activate", "request-code"],+ ["me"]+ ]+def init(options) dooptionsend@@ -14,7 +21,8 @@ defmodule PlausibleWeb.RequireAccountPlug do|> Phoenix.Controller.redirect(to: "/login")|> halt- not user.email_verified and conn.path_info not in [["activate"], ["me"]] ->+ not user.email_verified and+ conn.path_info not in @unverified_email_exceptions ->conn|> Phoenix.Controller.redirect(to: "/activate")|> haltdiff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex 622595f2ff..e825f343ce 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -187,6 +187,8 @@ defmodule PlausibleWeb.Router doget "/logout", AuthController, :logoutget "/settings", AuthController, :user_settingsput "/settings", AuthController, :save_settings+ put "/settings/email", AuthController, :update_email+ post "/settings/email/cancel", AuthController, :cancel_update_emaildelete "/me", AuthController, :delete_meget "/settings/api-keys/new", AuthController, :new_api_keypost "/settings/api-keys", AuthController, :create_api_keydiff --git a/lib/plausible_web/templates/auth/activate.html.eex b/lib/plausible_web/templates/auth/activate.html.eexindex 704652d2cc..789c97d94e 100644--- a/lib/plausible_web/templates/auth/activate.html.eex+++ b/lib/plausible_web/templates/auth/activate.html.eex@@ -1,7 +1,13 @@<div class="w-full max-w-3xl mt-4 mx-auto flex">- <%= if @has_pin do %>+ <%= if @has_email_code? do %><%= form_for @conn, "/activate", [class: "w-full max-w-lg mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8"], fn f -> %>- <h2 class="text-xl font-black dark:text-gray-100">Activate your account</h2>+ <h2 class="text-xl font-black dark:text-gray-100">+ <%= if @has_any_memberships? do %>+ Verify your email address+ <% else %>+ Activate your account+ <% end %>+ </h2><div class="mt-2 text-sm text-gray-500 dark:text-gray-200 leading-tight">Please enter the 4-digit code we sent to <b><%= @conn.assigns[:current_user].email %></b>@@ -31,9 +37,15 @@Entered the wrong email address?</div><ul class="list-disc text-xs text-gray-500 leading-tight mt-1">+ <%= if @has_any_memberships? do %>+ <li>+ <%= link("Change email back to", class: "underline text-indigo-600", to: "/settings/email/cancel", method: "post") %> to <%= @conn.assigns[:current_user].previous_email %>+ </li>+ <% else %><li><%= link("Delete this account", class: "underline text-indigo-600", to: "/me?redirect=/register", method: "delete", data: [confirm: "Deleting your account cannot be reversed. Are you sure?"]) %> and start over</li>+ <% end %></ul><% end %><% else %>@@ -51,7 +63,7 @@</div><% end %>- <%= if !@has_invitation do %>+ <%= if !@has_any_invitations? and !@has_any_memberships? do %><div class="pt-12 pl-8 hidden md:block"><%= render(PlausibleWeb.AuthView, "_onboarding_steps.html", current_step: 1) %></div>diff --git a/lib/plausible_web/templates/auth/user_settings.html.heex b/lib/plausible_web/templates/auth/user_settings.html.heexindex c593d361ef..d639950bb4 100644--- a/lib/plausible_web/templates/auth/user_settings.html.heex+++ b/lib/plausible_web/templates/auth/user_settings.html.heex@@ -222,7 +222,7 @@<div class="my-4 border-b border-gray-300 dark:border-gray-500"></div>- <%= form_for @changeset, "/settings", [class: "max-w-sm"], fn f -> %>+ <%= form_for @settings_changeset, "/settings", [class: "max-w-sm"], fn f -> %><div class="col-span-4 sm:col-span-2"><%= label(f, :theme, "Theme Selection",class: "block text-sm font-medium leading-5 text-gray-700 dark:text-gray-300"@@ -237,11 +237,13 @@</div><div class="max-w-2xl px-8 pt-6 pb-8 mx-auto mt-16 bg-white border-t-2 border-indigo-100 rounded rounded-t-none shadow-md dark:bg-gray-800 dark:border-indigo-500">- <h2 class="text-xl font-black dark:text-gray-100">Account settings</h2>+ <h2 id="change-account-name" class="text-xl font-black dark:text-gray-100">+ Change account name+ </h2><div class="my-4 border-b border-gray-300 dark:border-gray-500"></div>- <%= form_for @changeset, "/settings", [class: "max-w-sm"], fn f -> %>+ <%= form_for @settings_changeset, "/settings#change-account-name", [class: "max-w-sm"], fn f -> %><div class="my-4"><%= label(f, :name, class: "block text-sm font-medium text-gray-700 dark:text-gray-300") %><div class="mt-1">@@ -252,17 +254,61 @@<%= error_tag(f, :name) %></div></div>+ <%= submit("Save", class: "button mt-4") %>+ <% end %>+</div>++<div class="max-w-2xl px-8 pt-6 pb-8 mx-auto mt-16 bg-white border-t-2 border-red-600 rounded rounded-t-none shadow-md dark:bg-gray-800">+ <h2 id="change-email-address" class="text-xl font-black dark:text-gray-100">+ Change email address+ </h2>++ <div class="my-4 border-b border-gray-300 dark:border-gray-500"></div>++ <%= form_for @email_changeset, "/settings/email#change-email-address", [class: "max-w-sm"], fn f -> %>+ <div class="my-4">+ <%= label(f, :password, "Account password",+ class: "block text-sm font-medium text-gray-700 dark:text-gray-300"+ ) %>+ <div class="mt-1">+ <%= password_input(f, :password,+ class:+ "shadow-sm dark:bg-gray-900 dark:text-gray-300 focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:bg-gray-800"+ ) %>+ <%= error_tag(f, :password) %>+ </div>+ </div><div class="my-4">- <%= label(f, :email, class: "block text-sm font-medium text-gray-700 dark:text-gray-300") %>+ <%= label(f, :current_email, "Current email",+ class: "block text-sm font-medium text-gray-700 dark:text-gray-300"+ ) %>+ <div class="mt-1">+ <%= email_input(f, :current_email,+ readonly: true,+ value: f.data.email,+ class:+ "shadow-sm dark:bg-gray-900 dark:text-gray-300 focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:bg-gray-800 bg-gray-100"+ ) %>+ </div>+ </div>+ <div class="my-4">+ <%= label(f, :email, "New email",+ class: "block text-sm font-medium text-gray-700 dark:text-gray-300"+ ) %><div class="mt-1"><%= email_input(f, :email,+ value: f.params["email"],class:"shadow-sm dark:bg-gray-900 dark:text-gray-300 focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md") %><%= error_tag(f, :email) %></div></div>- <%= submit("Save changes", class: "button mt-4") %>++ <%= submit("Change my email",+ class:+ "inline-block mt-4 px-4 py-2 border border-gray-300 dark:border-gray-500 text-sm leading-5 font-medium rounded-md text-red-700 bg-white dark:bg-gray-800 hover:text-red-500 dark:hover:text-red-400 focus:outline-none focus:border-blue-300 focus:ring active:text-red-800 active:bg-gray-50 transition ease-in-out duration-150"+ ) %><% end %></div>diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exsindex ed9d45b26d..fe8990a5d4 100644--- a/priv/repo/seeds.exs+++ b/priv/repo/seeds.exs@@ -52,7 +52,7 @@ seeded_token = Plausible.Plugins.API.Token.generate("seed-token"){:ok, goal2} = Plausible.Goals.create(site, %{"page_path" => "/register"}){:ok, goal3} = Plausible.Goals.create(site, %{"page_path" => "/login"}){:ok, goal4} = Plausible.Goals.create(site, %{"event_name" => "Purchase", "currency" => "USD"})-{:ok, goal5} = Plausible.Goals.create(site, %{"page_path" => Enum.random(long_random_paths)})+{:ok, _goal5} = Plausible.Goals.create(site, %{"page_path" => Enum.random(long_random_paths)}){:ok, outbound} = Plausible.Goals.create(site, %{"event_name" => "Outbound Link: Click"}){:ok, _funnel} =diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex f48303893e..c58e4f1f27 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -440,7 +440,9 @@ defmodule PlausibleWeb.AuthControllerTest dotest "shows the form", %{conn: conn} doconn = get(conn, "/settings")- assert html_response(conn, 200) =~ "Account settings"+ assert resp = html_response(conn, 200)+ assert resp =~ "Change account name"+ assert resp =~ "Change email address"endtest "shows subscription", %{conn: conn, user: user} do@@ -686,6 +688,153 @@ defmodule PlausibleWeb.AuthControllerTest doendend+ describe "PUT /settings/email" do+ setup [:create_user, :log_in]++ test "updates email and forces reverification", %{conn: conn, user: user} do+ password = "very-long-very-secret-123"++ user+ |> User.set_password(password)+ |> Repo.update!()++ assert user.email_verified++ conn =+ put(conn, "/settings/email", %{+ "user" => %{"email" => "new" <> user.email, "password" => password}+ })++ assert redirected_to(conn, 302) == Routes.auth_path(conn, :activate)++ updated_user = Repo.reload!(user)++ assert updated_user.email == "new" <> user.email+ assert updated_user.previous_email == user.email+ refute updated_user.email_verified++ assert_delivered_email_matches(%{to: [{_, user_email}], subject: subject})+ assert user_email == updated_user.email+ assert subject =~ "is your Plausible email verification code"+ end++ test "renders form with error on no fields filled", %{conn: conn} do+ conn = put(conn, "/settings/email", %{"user" => %{}})++ assert html_response(conn, 200) =~ "can't be blank"+ end++ test "renders form with error on invalid password", %{conn: conn, user: user} do+ conn =+ put(conn, "/settings/email", %{+ "user" => %{"password" => "invalid", "email" => "new" <> user.email}+ })++ assert html_response(conn, 200) =~ "is invalid"+ end++ test "renders form with error on already taken email", %{conn: conn, user: user} do+ other_user = insert(:user)++ password = "very-long-very-secret-123"++ user+ |> User.set_password(password)+ |> Repo.update!()++ conn =+ put(conn, "/settings/email", %{+ "user" => %{"password" => password, "email" => other_user.email}+ })++ assert html_response(conn, 200) =~ "has already been taken"+ end++ test "renders form with error when email is identical with the current one", %{+ conn: conn,+ user: user+ } do+ password = "very-long-very-secret-123"++ user+ |> User.set_password(password)+ |> Repo.update!()++ conn =+ put(conn, "/settings/email", %{+ "user" => %{"password" => password, "email" => user.email}+ })++ assert html_response(conn, 200) =~ "can't be the same"+ end+ end++ describe "POST /settings/email/cancel" do+ setup [:create_user, :log_in]++ test "cancels email reverification in progress", %{conn: conn, user: user} do+ user =+ user+ |> Ecto.Changeset.change(+ email_verified: false,+ email: "new" <> user.email,+ previous_email: user.email+ )+ |> Repo.update!()++ conn = post(conn, "/settings/email/cancel")++ assert redirected_to(conn, 302) ==+ Routes.auth_path(conn, :user_settings) <> "#change-email-address"++ updated_user = Repo.reload!(user)++ assert updated_user.email_verified+ assert updated_user.email == user.previous_email+ refute updated_user.previous_email+ end++ test "fails to cancel reverification when previous email is already retaken", %{+ conn: conn,+ user: user+ } do+ user =+ user+ |> Ecto.Changeset.change(+ email_verified: false,+ email: "new" <> user.email,+ previous_email: user.email+ )+ |> Repo.update!()++ _other_user = insert(:user, email: user.previous_email)++ conn = post(conn, "/settings/email/cancel")++ assert redirected_to(conn, 302) == Routes.auth_path(conn, :activate_form)++ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~+ "Could not cancel email update"+ end++ test "crashes when previous email is empty on cancel (should not happen)", %{+ conn: conn,+ user: user+ } do+ user+ |> Ecto.Changeset.change(+ email_verified: false,+ email: "new" <> user.email,+ previous_email: nil+ )+ |> Repo.update!()++ assert_raise RuntimeError, ~r/Previous email is empty for user/, fn ->+ post(conn, "/settings/email/cancel")+ end+ end+ end+describe "DELETE /me" dosetup [:create_user, :log_in, :create_new_site]use Plausible.Repo