Implement wait states for recovery code related actions properly

feat/2fa-final-bigger-refactor
Adrian Gruntkowski 3 years ago
parent 89dcf90218
commit 9fd849dca4

@ -22,7 +22,6 @@ defmodule PlausibleWeb.Components.Generic do
attr(:type, :string, default: "button")
attr(:class, :string, default: "")
attr(:disabled, :boolean, default: false)
attr(:onclick, :string, default: "")
attr(:rest, :global)
slot(:inner_block)
@ -32,9 +31,8 @@ defmodule PlausibleWeb.Components.Generic do
<button
type={@type}
disabled={@disabled}
x-on:click={@onclick}
class={[
"inline-flex items-center justify-center gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400",
"inline-flex items-center justify-center gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400 dark:disabled:bg-gray-800",
@class
]}
{@rest}
@ -55,7 +53,7 @@ defmodule PlausibleWeb.Components.Generic do
<.link
href={@href}
class={[
"inline-flex items-center justify-center gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400",
"inline-flex items-center justify-center gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400 dark:disabled:bg-gray-800",
@class
]}
{@rest}

@ -16,15 +16,28 @@ defmodule PlausibleWeb.Components.TwoFactor do
class:
"font-mono tracking-[0.5em] w-36 pl-5 font-medium shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block border-gray-300 dark:border-gray-500 dark:text-gray-200 dark:bg-gray-900 rounded-l-md",
oninput:
"this.value=this.value.replace(/[^0-9]/g, ''); if (this.value.length >= 6) document.getElementById('verify').focus()",
"this.value=this.value.replace(/[^0-9]/g, ''); if (this.value.length >= 6) document.getElementById('verify-button').focus()",
onclick: "this.select();",
oninvalid: "document.getElementById('verify-button').disabled = false",
maxlength: "6",
placeholder: "••••••",
value: "",
required: "required"
) %>
<PlausibleWeb.Components.Generic.button id="verify" class="rounded-l-none">
Verify &rarr;
<PlausibleWeb.Components.Generic.button
type="submit"
id="verify-button"
onclick="event.target.disabled = true"
class="rounded-l-none [&>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">
Verify &rarr;
</span>
<span class="label-disabled text-white dark:text-gray-600">
<PlausibleWeb.Components.Generic.spinner class="inline-block h-5 w-5 mr-2 text-white dark:text-gray-600" />
Verifying...
</span>
</PlausibleWeb.Components.Generic.button>
</div>
"""

@ -3,9 +3,9 @@
<%= 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">
<%= if @has_any_memberships? do %>
Verify your email address
Verify your email address
<% else %>
Activate your account
Activate your account
<% end %>
</h2>
@ -15,7 +15,17 @@
<div class="mt-12 flex items-stretch flex-grow">
<div>
<%= text_input f, :code, class: "tracking-widest font-medium shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-36 px-8 border-gray-300 dark:border-gray-500 rounded-l-md dark:text-gray-200 dark:bg-gray-900", oninput: "this.value=this.value.replace(/[^0-9]/g, ''); if (this.value.length >= 4) document.getElementById('submit').focus()", onclick: "this.select();", maxlength: "4", placeholder: "••••", style: "letter-spacing: 10px;", required: "required" %>
<%= text_input(f, :code,
class:
"tracking-widest font-medium shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-36 px-8 border-gray-300 dark:border-gray-500 rounded-l-md dark:text-gray-200 dark:bg-gray-900",
oninput:
"this.value=this.value.replace(/[^0-9]/g, ''); if (this.value.length >= 4) document.getElementById('submit').focus()",
onclick: "this.select();",
maxlength: "4",
placeholder: "••••",
style: "letter-spacing: 10px;",
required: "required"
) %>
</div>
<PlausibleWeb.Components.Generic.button id="submit" class="rounded-l-none">
Activate &rarr;
@ -28,11 +38,27 @@
</div>
<ol class="list-disc text-xs text-gray-500 leading-tight space-y-1 mt-1">
<li>Check your spam folder</li>
<li><%= link("Send a new code", class: "underline text-indigo-600", to: "/activate/request-code", method: :post) %> to <%= @conn.assigns[:current_user].email %></li>
<li>
<%= link("Send a new code",
class: "underline text-indigo-600",
to: "/activate/request-code",
method: :post
) %> to <%= @conn.assigns[:current_user].email %>
</li>
<%= if Application.get_env(:plausible, :is_selfhost) do %>
<li>Ask on our <%= link("community-supported forum", to: "https://github.com/plausible/analytics/discussions", class: "text-indigo-600 underline" ) %></li>
<li>
Ask on our <%= link("community-supported forum",
to: "https://github.com/plausible/analytics/discussions",
class: "text-indigo-600 underline"
) %>
</li>
<% else %>
<li><a class="underline text-indigo-600" href="https://plausible.io/contact">Contact us</a> if the problem persists</li>
<li>
<a class="underline text-indigo-600" href="https://plausible.io/contact">
Contact us
</a>
if the problem persists
</li>
<% end %>
</ol>
<div class="mt-4 text-sm dark:text-gray-100">
@ -40,13 +66,22 @@
</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>
<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>
<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 %>
@ -60,8 +95,11 @@
<%= error_tag(assigns, :error) %>
<%= button("Request activation code", to: "/activate/request-code", method: :post, class: "button mt-12") %>
<%= button("Request activation code",
to: "/activate/request-code",
method: :post,
class: "button mt-12"
) %>
</div>
<% end %>

@ -443,12 +443,9 @@
<Heroicons.shield_exclamation class="h-6 w-6" />
</:icon>
<:buttons>
<button
type="submit"
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-indigo-600 text-base font-medium text-white hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 sm:ml-3 sm:w-auto sm:text-sm"
>
<.button type="submit" class="w-full sm:w-auto">
Disable 2FA
</button>
</.button>
</:buttons>
<div class="text-sm mt-2">
@ -475,7 +472,6 @@
state_param="regenerate2FAOpen"
form_data={@conn.params}
form_target={Routes.auth_path(@conn, :generate_2fa_recovery_codes)}
onsubmit="var group = document.querySelector('#regenerate-2fa-modal-buttons'); group.classList.add('submitting');"
title="Generate New Recovery Codes?"
>
<:icon>
@ -483,25 +479,20 @@
</:icon>
<:buttons>
<div x-data="{submitted: false}" class="group" id="regenerate-2fa-modal-buttons">
<.button
type="submit"
onclick="submitted = true"
class="w-full sm:w-52 group-[.submitting]:bg-gray-400 dark:group-[.submitting]:bg-gray-800"
>
<span x-show="!submitted">
Generate New Codes
</span>
<span
x-show="submitted"
style="display: none;"
class="inline-flex items-center text-white dark:text-gray-600"
>
<.spinner class="h-5 w-5 mr-2 text-white dark:text-gray-600" /> Generating Codes
</span>
</.button>
</div>
<.button
type="submit"
onclick="event.target.disabled = true"
class="w-full sm:w-auto [&>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 text-white dark:text-gray-600">
<.spinner class="inline-block h-5 w-5 mr-2 text-white dark:text-gray-600" />
Generating Codes
</span>
</.button>
</:buttons>
<div class="text-sm mt-2">

@ -2,8 +2,7 @@
<%= form_for @conn.params,
Routes.auth_path(@conn, :verify_2fa_recovery_code),
[
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",
onsubmit: "var button = document.getElementById('submit'); button.disabled = true; button.classList.add('animate-pulse')"
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">
Enter Recovery Code
@ -19,11 +18,26 @@
class:
"font-medium shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full px-2 border-gray-300 dark:border-gray-500 dark:text-gray-200 dark:bg-gray-900 rounded-md",
maxlength: "10",
oninvalid: "document.getElementById('use-code-button').disabled = false",
placeholder: "Enter recovery code",
required: "required"
) %>
</div>
<button id="submit" class="w-full button mt-2">Use Code</button>
<.button
id="use-code-button"
type="submit"
onclick="event.target.disabled = true"
class="w-full mt-2 [&>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">
Use Code
</span>
<span class="label-disabled text-white dark:text-gray-600">
<PlausibleWeb.Components.Generic.spinner class="inline-block h-5 w-5 mr-2 text-white dark:text-gray-600" />
Verifying...
</span>
</.button>
</div>
<div class="mt-6 flex flex-row justify-between items-center">

@ -5,9 +5,7 @@
</h2>
<div class="text-sm mt-2 text-gray-500 dark:text-gray-200 leading-tight">
<%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_setup), [
onsubmit: "var button = document.getElementById('verify'); button.disabled = true; button.classList.add('animate-pulse')",
], fn f -> %>
<%= form_for @conn.params, Routes.auth_path(@conn, :verify_2fa_setup), [], fn f -> %>
Enter the code from your authenticator application before it expires or wait for a new one.
<PlausibleWeb.Components.TwoFactor.verify_2fa_input form={f} field={:code} class="mt-6" />
<% end %>

Loading…
Cancel
Save