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
Use Prima modals for 2FA settings (#6737)
Sanne de Vriese6d8ee867afe
diff --git a/lib/plausible_web/components/two_factor.ex b/lib/plausible_web/components/two_factor.exindex e24c9d1946..fa7cecfad1 100644--- a/lib/plausible_web/components/two_factor.ex+++ b/lib/plausible_web/components/two_factor.ex@@ -61,99 +61,4 @@ defmodule PlausibleWeb.Components.TwoFactor do</div>"""end-- attr :id, :string, required: true- attr :state_param, :string, required: true- attr :form_data, :any, required: true- attr :form_target, :string, required: true- attr :onsubmit, :string, default: nil- attr :title, :string, required: true-- slot :icon, required: true- slot :inner_block, required: true- slot :buttons, required: true-- def modal(assigns) do- ~H"""- <div- id={@id}- x-cloak- x-show={@state_param}- x-on:keyup.escape.window={"#{@state_param} = false"}- class="fixed z-10 inset-0 overflow-y-auto"- aria-labelledby="modal-title"- role="dialog"- aria-modal="true"- >- <div class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">- <div- x-show={@state_param}- x-transition:enter="transition ease-out duration-300"- x-transition:enter-start="opacity-0"- x-transition:enter-end="opacity-100"- x-transition:leave="transition ease-in duration-200"- x-transition:leave-start="opacity-100"- x-transition:leave-end="opacity-0"- class="fixed inset-0 bg-gray-500/75 dark:bg-gray-800/75 transition-opacity"- aria-hidden="true"- x-on:click={"#{@state_param} = false"}- >- </div>- <!-- This element is to trick the browser into centering the modal contents. -->- <span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">- ​- </span>-- <div- x-show={@state_param}- x-transition:enter="transition ease-out duration-300"- x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"- x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"- x-transition:leave="transition ease-in duration-200"- x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"- x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"- class="relative inline-block align-bottom bg-white dark:bg-gray-900 rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"- >- <.form :let={f} for={@form_data} action={@form_target} onsubmit={@onsubmit}>- <div class="bg-white dark:bg-gray-850 px-4 pt-5 pb-4 sm:p-6 sm:pb-4">- <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">- <a- href="#"- x-on:click.prevent={"#{@state_param} = false"}- class="bg-white dark:bg-gray-800 rounded-md text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400 focus:outline-hidden"- >- <span class="sr-only">Close</span>- <Heroicons.x_mark class="h-6 w-6" />- </a>- </div>- <div class="sm:flex sm:items-start">- <div class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:mx-0 sm:h-10 sm:w-10">- {render_slot(@icon)}- </div>- <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left text-gray-900 dark:text-gray-100">- <h3 class="text-lg leading-6 font-medium" id="modal-title">- {@title}- </h3>-- {render_slot(@inner_block, f)}- </div>- </div>- </div>- <div class="bg-gray-50 dark:bg-gray-850 px-4 py-3 sm:px-9 sm:flex sm:flex-row-reverse">- {render_slot(@buttons)}- <.button- type="button"- x-on:click={"#{@state_param} = false"}- class="w-full sm:w-auto mr-2 mt-6"- theme="secondary"- >- Cancel- </.button>- </div>- </.form>- </div>- </div>- </div>- """- endenddiff --git a/lib/plausible_web/controllers/settings_controller.ex b/lib/plausible_web/controllers/settings_controller.exindex 2e821801d1..b5602bc806 100644--- a/lib/plausible_web/controllers/settings_controller.ex+++ b/lib/plausible_web/controllers/settings_controller.ex@@ -57,7 +57,6 @@ defmodule PlausibleWeb.SettingsController dorender(conn, :team_general,team_name_changeset: name_changeset,- force_2fa_enabled?: Teams.force_2fa_enabled?(conn.assigns.current_team),layout: {PlausibleWeb.LayoutView, :settings},connect_live_socket: true)@@ -380,7 +379,8 @@ defmodule PlausibleWeb.SettingsController douser_sessions: user_sessions,email_changeset: email_changeset,password_changeset: password_changeset,- layout: {PlausibleWeb.LayoutView, :settings}+ layout: {PlausibleWeb.LayoutView, :settings},+ connect_live_socket: true)enddiff --git a/lib/plausible_web/live/components/prima_modal.ex b/lib/plausible_web/live/components/prima_modal.exindex 381586d218..ecd17537fb 100644--- a/lib/plausible_web/live/components/prima_modal.ex+++ b/lib/plausible_web/live/components/prima_modal.ex@@ -5,11 +5,12 @@ defmodule PlausibleWeb.Live.Components.PrimaModal doattr :id, :string, required: trueattr :use_portal?, :boolean, default: Mix.env() not in [:test, :ce_test]+ attr :on_close, JS, default: %JS{}slot :inner_block, required: truedef modal(assigns) do~H"""- <Modal.modal portal={@use_portal?} id={@id}>+ <Modal.modal portal={@use_portal?} id={@id} on_close={assigns[:on_close]}><Modal.modal_overlaytransition_enter={{"ease-out duration-300", "opacity-0", "opacity-100"}}transition_leave={{"ease-in duration-200", "opacity-100", "opacity-0"}}diff --git a/lib/plausible_web/live/team_force_2fa_settings.ex b/lib/plausible_web/live/team_force_2fa_settings.exnew file mode 100644index 0000000000..5afbad4a70--- /dev/null+++ b/lib/plausible_web/live/team_force_2fa_settings.ex@@ -0,0 +1,123 @@+defmodule PlausibleWeb.Live.TeamForce2FASettings do+ @moduledoc """+ LiveView for the "Force Two-Factor Authentication (2FA)" tile in team settings.+ """++ use PlausibleWeb, :live_view++ alias PlausibleWeb.Live.Components.PrimaModal++ def mount(_params, _session, socket) do+ {:ok,+ assign(socket,+ force_2fa_enabled?: Plausible.Teams.force_2fa_enabled?(socket.assigns.current_team)+ )}+ end++ def render(assigns) do+ ~H"""+ <div>+ <.tile docs="2fa#require-all-team-members-to-enable-2fa">+ <:title>+ <a id="force-2fa">Enforce Two-Factor Authentication (2FA)</a>+ </:title>+ <:subtitle>+ Increase account security by requiring all team members to enable 2FA.+ </:subtitle>++ <div :if={@force_2fa_enabled?} id="disable-force-2fa">+ <.button+ theme="danger"+ phx-click={Prima.Modal.JS.open("disable-force-2fa-modal")}+ >+ Stop enforcing 2FA+ </.button>++ <PrimaModal.modal+ id="disable-force-2fa-modal"+ on_close={JS.dispatch("reset", to: "#disable_team_force_2fa_form")}+ >+ <div class="p-5 sm:p-6 max-w-md">+ <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">+ <button+ phx-click={Prima.Modal.JS.close()}+ class="text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400"+ >+ <span class="sr-only">Close</span>+ <Heroicons.x_mark class="size-6" />+ </button>+ </div>+ <div class="flex flex-col gap-y-4 text-center sm:text-left">+ <PrimaModal.modal_title>+ Stop enforcing 2FA?+ </PrimaModal.modal_title>+ <p class="text-sm text-gray-600 dark:text-gray-400">+ This will remove the 2FA requirement for all team members.+ Enter your password to stop enforcing 2FA.+ </p>+ <.form+ id="disable_team_force_2fa_form"+ action={~p"/settings/team/force_2fa/disable"}+ for={%{}}+ method="post"+ class="flex flex-col gap-y-6"+ >+ <.input+ data-autofocus+ type="password"+ id="disable_team_force_2fa_password"+ name="password"+ value=""+ placeholder="Enter password"+ />+ <.button type="submit" class="w-full">+ Stop enforcing 2FA+ </.button>+ </.form>+ </div>+ </div>+ </PrimaModal.modal>+ </div>++ <div :if={not @force_2fa_enabled?} id="enable-force-2fa">+ <.button phx-click={Prima.Modal.JS.open("enable-force-2fa-modal")}>+ Enforce 2FA+ </.button>++ <PrimaModal.modal id="enable-force-2fa-modal">+ <div class="p-5 sm:p-6 max-w-md">+ <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">+ <button+ phx-click={Prima.Modal.JS.close()}+ class="text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400"+ >+ <span class="sr-only">Close</span>+ <Heroicons.x_mark class="size-6" />+ </button>+ </div>+ <div class="flex flex-col gap-y-4 text-center sm:text-left">+ <PrimaModal.modal_title>+ Enforce 2FA?+ </PrimaModal.modal_title>+ <p class="text-sm text-gray-600 dark:text-gray-400">+ All team members, including you, will need to set up 2FA.+ </p>+ <.form+ action={~p"/settings/team/force_2fa/enable"}+ for={%{}}+ method="post"+ class="mt-2"+ >+ <.button type="submit" class="w-full" data-autofocus>+ Enforce 2FA+ </.button>+ </.form>+ </div>+ </div>+ </PrimaModal.modal>+ </div>+ </.tile>+ </div>+ """+ end+enddiff --git a/lib/plausible_web/live/two_factor_settings.ex b/lib/plausible_web/live/two_factor_settings.exnew file mode 100644index 0000000000..a04df4cf9d--- /dev/null+++ b/lib/plausible_web/live/two_factor_settings.ex@@ -0,0 +1,162 @@+defmodule PlausibleWeb.Live.TwoFactorSettings do+ @moduledoc """+ LiveView for the "Two-Factor Authentication (2FA)" tile in account security settings.+ """++ use PlausibleWeb, :live_view++ alias PlausibleWeb.Live.Components.PrimaModal++ def mount(_params, _session, socket) do+ {:ok,+ assign(socket, totp_enabled?: Plausible.Auth.TOTP.enabled?(socket.assigns.current_user))}+ end++ def render(assigns) do+ ~H"""+ <div>+ <.tile docs="2fa">+ <:title>+ <a id="update-2fa">Two-Factor Authentication (2FA)</a>+ </:title>+ <:subtitle>+ Protect your account by adding an extra security step when you log in.+ </:subtitle>++ <div :if={@totp_enabled?}>+ <.button+ disabled={Plausible.Users.type(@current_user) == :sso}+ phx-click={Prima.Modal.JS.open("disable-2fa-modal")}+ theme="danger"+ >+ Disable 2FA+ </.button>++ <p class="mt-2 text-gray-600 text-sm dark:text-gray-400">+ Lost your recovery codes?+ <button+ type="button"+ phx-click={Prima.Modal.JS.open("regenerate-2fa-modal")}+ class="underline text-indigo-600"+ >+ Generate new+ </button>+ </p>++ <PrimaModal.modal+ id="disable-2fa-modal"+ on_close={JS.dispatch("reset", to: "#disable_2fa_form")}+ >+ <div class="p-5 sm:p-6 max-w-md">+ <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">+ <button+ phx-click={Prima.Modal.JS.close()}+ class="text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400"+ >+ <span class="sr-only">Close</span>+ <Heroicons.x_mark class="size-6" />+ </button>+ </div>+ <div class="flex flex-col gap-y-4 text-center sm:text-left">+ <PrimaModal.modal_title>+ Disable Two-Factor Authentication?+ </PrimaModal.modal_title>+ <p class="text-sm text-gray-600 dark:text-gray-400">+ If you turn off 2FA, codes from your authenticator app and your current recovery codes will stop working. To use 2FA again, you’ll need to set it up from scratch.+ </p>+ <p class="text-sm text-gray-600 dark:text-gray-400">+ Enter your password to continue.+ </p>+ <.form+ action={~p"/2fa/disable"}+ id="disable_2fa_form"+ for={%{}}+ method="post"+ class="flex flex-col gap-y-6"+ >+ <.input+ data-autofocus+ type="password"+ id="disable_2fa_password"+ name="password"+ value=""+ placeholder="Password"+ />+ <.button type="submit" class="w-full">+ Disable 2FA+ </.button>+ </.form>+ </div>+ </div>+ </PrimaModal.modal>++ <PrimaModal.modal+ id="regenerate-2fa-modal"+ on_close={JS.dispatch("reset", to: "#regenerate_2fa_form")}+ >+ <div class="p-5 sm:p-6 max-w-md">+ <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">+ <button+ phx-click={Prima.Modal.JS.close()}+ class="text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400"+ >+ <span class="sr-only">Close</span>+ <Heroicons.x_mark class="size-6" />+ </button>+ </div>+ <div class="flex flex-col gap-y-4 text-center sm:text-left">+ <PrimaModal.modal_title>+ Generate new recovery codes?+ </PrimaModal.modal_title>+ <p class="text-sm text-gray-600 dark:text-gray-400">+ If you generate new recovery codes, the old ones will become invalid.+ Enter your password to continue.+ </p>+ <.form+ id="regenerate_2fa_form"+ action={~p"/2fa/recovery_codes"}+ for={%{}}+ method="post"+ onsubmit="document.getElementById('generate-2fa-recovery-button').disabled = true"+ class="flex flex-col gap-y-6"+ >+ <.input+ data-autofocus+ type="password"+ id="regenerate_2fa_password"+ name="password"+ value=""+ placeholder="Enter password"+ />+ <.button+ id="generate-2fa-recovery-button"+ type="submit"+ class="w-full [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"+ >+ <span class="label-enabled pointer-events-none">+ Generate new codes+ </span>++ <span class="label-disabled">+ <.spinner class="inline-block h-5 w-5 mr-2 text-white dark:text-gray-400" />+ Generating codes+ </span>+ </.button>+ </.form>+ </div>+ </div>+ </PrimaModal.modal>+ </div>++ <div :if={not @totp_enabled?}>+ <.form action={~p"/2fa/setup/initiate"} for={%{}} method="post">+ <.button type="submit">+ Enable 2FA+ </.button>+ </.form>+ </div>+ </.tile>+ </div>+ """+ end+enddiff --git a/lib/plausible_web/templates/auth/initiate_2fa_setup.html.heex b/lib/plausible_web/templates/auth/initiate_2fa_setup.html.heexindex bddab2c899..76d2db6421 100644--- a/lib/plausible_web/templates/auth/initiate_2fa_setup.html.heex+++ b/lib/plausible_web/templates/auth/initiate_2fa_setup.html.heex@@ -22,13 +22,11 @@</:footer><div class="flex flex-col sm:flex-row items-center sm:items-start">- <div class="mt-8">- <div class="border-2 border-gray-300 inline-block p-2 dark:bg-white">- <PlausibleWeb.Components.TwoFactor.qr_code text={@totp_uri} />- </div>+ <div class="border-2 border-gray-300 inline-block p-2 dark:bg-white">+ <PlausibleWeb.Components.TwoFactor.qr_code text={@totp_uri} /></div>- <div class="mt-8 sm:ml-4">+ <div class="sm:ml-4"><.focus_list><:item>Open the authenticator applicationdiff --git a/lib/plausible_web/templates/settings/security.html.heex b/lib/plausible_web/templates/settings/security.html.heexindex 17d94312f0..f2285d08ed 100644--- a/lib/plausible_web/templates/settings/security.html.heex+++ b/lib/plausible_web/templates/settings/security.html.heex@@ -8,6 +8,7 @@</:subtitle><.form:let={f}+ id="update_email_form"action={~p"/settings/security/email"}for={@email_changeset}method="post"@@ -60,6 +61,7 @@</:subtitle><.form:let={f}+ id="update_password_form"action={~p"/settings/security/password"}for={@password_changeset}method="post"@@ -108,134 +110,7 @@</.form></.tile>- <.tile docs="2fa">- <:title>- <a id="update-2fa">Two-Factor Authentication (2FA)</a>- </:title>- <:subtitle>- Protect your account by adding an extra security step when you log in.- </:subtitle>-- <div x-data="{disable2FAOpen: false, regenerate2FAOpen: false}">- <div :if={@totp_enabled?}>- <.button- disabled={Plausible.Users.type(@current_user) == :sso}- x-on:click="disable2FAOpen = true; $refs.disable2FAPassword.value = ''"- theme="danger"- >- Disable 2FA- </.button>-- <p class="mt-2 text-gray-600 text-sm dark:text-gray-400">- Lost your recovery codes?- <a- href="#update-2fa"- x-on:click="regenerate2FAOpen = true; $refs.regenerate2FAPassword.value = ''"- class="underline text-indigo-600"- >- Generate new- </a>- </p>- </div>-- <div :if={not @totp_enabled?}>- <.form- action={~p"/2fa/setup/initiate"}- for={@conn.params}- method="post"- >- <.button type="submit" class="mt-6">- Enable 2FA- </.button>- </.form>- </div>-- <PlausibleWeb.Components.TwoFactor.modal- id="disable-2fa-modal"- state_param="disable2FAOpen"- form_data={@conn.params}- form_target={~p"/2fa/disable"}- title="Disable Two-Factor Authentication?"- >- <:icon>- <Heroicons.shield_exclamation class="h-6 w-6" />- </:icon>- <:buttons>- <.button type="submit" class="w-full sm:w-auto mt-6">- Disable 2FA- </.button>- </:buttons>-- <div class="text-sm mt-2">- Once disabled, verification codes from the authenticator application and current recovery codes will become invalid. 2FA will have to be setup from the start.- </div>-- <div class="text-sm mt-2">- Enter your password to disable 2FA.- </div>-- <div class="mt-6">- <.input- type="password"- id="disable_2fa_password"- name="password"- value=""- placeholder="Enter password"- x-ref="disable2FAPassword"- />- </div>- </PlausibleWeb.Components.TwoFactor.modal>-- <PlausibleWeb.Components.TwoFactor.modal- id="regenerate-2fa-modal"- state_param="regenerate2FAOpen"- form_data={@conn.params}- form_target={~p"/2fa/recovery_codes"}- onsubmit="document.getElementById('generate-2fa-recovery-button').disabled = true"- title="Generate New Recovery Codes?"- >- <:icon>- <Heroicons.key class="h-6 w-6" />- </:icon>-- <:buttons>- <.button- id="generate-2fa-recovery-button"- type="submit"- class="w-full sm:w-auto mt-6 [&>span.label-enabled]:block [&>span.label-disabled]:hidden [&[disabled]>span.label-enabled]:hidden [&[disabled]>span.label-disabled]:block"- >- <span class="label-enabled pointer-events-none">- Generate New Codes- </span>-- <span class="label-disabled">- <.spinner class="inline-block h-5 w-5 mr-2 text-white dark:text-gray-400" />- Generating Codes- </span>- </.button>- </:buttons>-- <div class="text-sm mt-2">- If you generate new codes, the old ones will become invalid.- </div>-- <div class="text-sm mt-2">- Enter your password to continue.- </div>-- <div class="mt-6 w-full">- <.input- type="password"- id="regenerate_2fa_password"- name="password"- value=""- placeholder="Enter password"- x-ref="regenerate2FAPassword"- />- </div>- </PlausibleWeb.Components.TwoFactor.modal>- </div>- </.tile>+ {live_render(@conn, PlausibleWeb.Live.TwoFactorSettings, id: "two-factor-settings")}<.tile docs="login-management"><:title>diff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex c474166d85..0f128db926 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -46,84 +46,9 @@session: %{"mode" => "team-management"})}</.tile>- <.tile :if={@current_team_role == :owner} docs="2fa#require-all-team-members-to-enable-2fa">- <:title>- <a id="force-2fa">Force Two-Factor Authentication (2FA)</a>- </:title>- <:subtitle>- Increase account security by requiring all team members to enable 2FA.- </:subtitle>-- <div- :if={@force_2fa_enabled? and @current_team_role == :owner}- id="disable-force-2fa"- x-data="{disableTeamForce2FAOpen: false}"- >- <.form- action={~p"/settings/team/force_2fa/disable"}- for={@conn.params}- method="post"- >- <.button- theme="danger"- x-on:click="disableTeamForce2FAOpen = true; $refs.disableTeamForce2FAPassword.value = ''"- >- Stop Forcing 2FA- </.button>-- <PlausibleWeb.Components.TwoFactor.modal- id="disable-force-2fa-modal"- state_param="disableTeamForce2FAOpen"- form_data={@conn.params}- form_target={~p"/settings/team/force_2fa/disable"}- title="Stop enforcing 2FA?"- >- <:icon>- <Heroicons.shield_exclamation class="h-6 w-6" />- </:icon>- <:buttons>- <.button type="submit" class="w-full sm:w-auto mt-6">- Stop enforcing 2FA- </.button>- </:buttons>-- <div class="text-sm mt-2">- This will remove the 2FA requirement for all team members.- </div>-- <div class="text-sm mt-2">- Enter your password to stop enforcing 2FA.- </div>-- <div class="mt-6">- <.input- type="password"- id="disable_team_force_2fa_password"- name="password"- value=""- placeholder="Enter password"- x-ref="disableTeamForce2FAPassword"- />- </div>- </PlausibleWeb.Components.TwoFactor.modal>- </.form>- </div>-- <div :if={not @force_2fa_enabled? and @current_team_role == :owner} id="enable-force-2fa">- <.form- action={~p"/settings/team/force_2fa/enable"}- for={@conn.params}- method="post"- >- <.button- data-confirm="All team members, including you, will need to set up 2FA. Are you sure you want to enforce it?"- type="submit"- >- Enforce 2FA- </.button>- </.form>- </div>- </.tile>+ <div :if={@current_team_role == :owner}>+ {live_render(@conn, PlausibleWeb.Live.TeamForce2FASettings, id: "team-force-2fa-settings")}+ </div><.tile docs="users-roles#leaving-team"><:title>Leave team</:title><:subtitle>Remove yourself from this team as a member.</:subtitle>