From 12f786810cbeacc10c84dd4d80605685045483ea Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Thu, 7 Dec 2023 11:22:40 +0100 Subject: [PATCH] Remove `two_factor` feature flag (#3597) * Remove `two_factor` feature flag * Avoid compilation warnings in small build --- lib/plausible/auth/user_admin.ex | 11 ++++++++--- .../templates/auth/user_settings.html.heex | 7 +------ priv/repo/seeds.exs | 2 -- test/test_helper.exs | 1 - 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.ex index 04411a1c5..866dd273a 100644 --- a/lib/plausible/auth/user_admin.ex +++ b/lib/plausible/auth/user_admin.ex @@ -1,5 +1,6 @@ defmodule Plausible.Auth.UserAdmin do use Plausible.Repo + use Plausible require Plausible.Billing.Subscription.Status alias Plausible.Billing.Subscription @@ -117,9 +118,13 @@ defmodule Plausible.Auth.UserAdmin do end end - defp usage_link(user) do - path = PlausibleWeb.Router.Helpers.admin_path(PlausibleWeb.Endpoint, :usage, user.id) - {:safe, ~s(Usage)} + on_full_build do + defp usage_link(user) do + path = PlausibleWeb.Router.Helpers.admin_path(PlausibleWeb.Endpoint, :usage, user.id) + {:safe, ~s(Usage)} + end + else + defp usage_link(_), do: nil end defp format_date(nil), do: "--" diff --git a/lib/plausible_web/templates/auth/user_settings.html.heex b/lib/plausible_web/templates/auth/user_settings.html.heex index a3a28fe3a..4a6117d05 100644 --- a/lib/plausible_web/templates/auth/user_settings.html.heex +++ b/lib/plausible_web/templates/auth/user_settings.html.heex @@ -193,10 +193,7 @@ <% end %> -
+

Two-Factor Authentication (2FA)

@@ -420,7 +417,6 @@