From 6fe032880ad44a89d8d2c5194878f3db2f7d6b45 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 16 Sep 2021 10:59:03 +0200 Subject: [PATCH] Fix invitation links --- lib/plausible_web/controllers/auth_controller.ex | 3 ++- .../templates/auth/register_from_invitation_form.html.eex | 2 +- lib/plausible_web/templates/email/new_user_invitation.html.eex | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 011beec50..d70ba6cc9 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -82,7 +82,8 @@ defmodule PlausibleWeb.AuthController do render(conn, "register_from_invitation_form.html", changeset: changeset, invitation: invitation, - layout: {PlausibleWeb.LayoutView, "focus.html"} + layout: {PlausibleWeb.LayoutView, "focus.html"}, + skip_plausible_tracking: true ) else render(conn, "invitation_expired.html", layout: {PlausibleWeb.LayoutView, "focus.html"}) diff --git a/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex b/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex index bd11a1c22..b5fdef97f 100644 --- a/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex +++ b/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex @@ -11,7 +11,7 @@

No spam, guaranteed.

- <%= email_input f, :email, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300", placeholder: "example@email.com", value: @invitation.email, readonly: "readonly" %> + <%= email_input f, :email, class: "bg-gray-100 dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300", placeholder: "example@email.com", value: @invitation.email, readonly: "readonly" %>
<%= error_tag f, :email %> diff --git a/lib/plausible_web/templates/email/new_user_invitation.html.eex b/lib/plausible_web/templates/email/new_user_invitation.html.eex index 8e8ab7552..d21a004ab 100644 --- a/lib/plausible_web/templates/email/new_user_invitation.html.eex +++ b/lib/plausible_web/templates/email/new_user_invitation.html.eex @@ -1,7 +1,7 @@ Hey,

<%= @invitation.inviter.email %> has invited you to join the <%= @invitation.site.domain %> site on Plausible Analytics. -<%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_form), invitation: @invitation.invitation_id) %> to create your account. The link is valid for 48 hours after this email is sent. +<%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_from_invitation_form, @invitation.invitation_id)) %> to create your account. The link is valid for 48 hours after this email is sent.

Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors.