plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-12-23 09:33:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add UTM tags to login links from email reports"

Browse Source 
This reverts commit 091fc423f9.
This commit is contained in:
Uku Taht 2021-04-13 12:08:22 +03:00
parent 091fc423f9
commit 48be0e3fda
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/plausible_web/templates/email/weekly_report.html.eex
View File

@ -609,7 +609,7 @@ body {
<!--<![endif]-->
<div align="center" class="button-container" style="padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
<%= if @login_link do %>
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;"><tr><td style="padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://plausible.io/plausible.io" style="height:31.5pt; width:189.75pt; v-text-anchor:middle;" arcsize="10%" stroke="false" fillcolor="#5661b3"><w:anchorlock/><v:textbox inset="0,0,0,0"><center style="color:#ffffff; font-family:Arial, sans-serif; font-size:16px"><![endif]--><a href="<%= @login_link %>" style="-webkit-text-size-adjust: none; text-decoration: none; display: inline-block; color: #ffffff; background-color: #5661b3; border-radius: 4px; -webkit-border-radius: 4px; -moz-border-radius: 4px; width: auto; width: auto; border-top: 1px solid #5661b3; border-right: 1px solid #5661b3; border-bottom: 1px solid #5661b3; border-left: 1px solid #5661b3; padding-top: 5px; padding-bottom: 5px; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; text-align: center; mso-border-alt: none; word-break: keep-all;" target="_blank"><span style="padding-left:20px;padding-right:20px;font-size:16px;display:inline-block;">
<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;"><tr><td style="padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://plausible.io/plausible.io" style="height:31.5pt; width:189.75pt; v-text-anchor:middle;" arcsize="10%" stroke="false" fillcolor="#5661b3"><w:anchorlock/><v:textbox inset="0,0,0,0"><center style="color:#ffffff; font-family:Arial, sans-serif; font-size:16px"><![endif]--><a href="https://plausible.io/login" style="-webkit-text-size-adjust: none; text-decoration: none; display: inline-block; color: #ffffff; background-color: #5661b3; border-radius: 4px; -webkit-border-radius: 4px; -moz-border-radius: 4px; width: auto; width: auto; border-top: 1px solid #5661b3; border-right: 1px solid #5661b3; border-bottom: 1px solid #5661b3; border-left: 1px solid #5661b3; padding-top: 5px; padding-bottom: 5px; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; text-align: center; mso-border-alt: none; word-break: keep-all;" target="_blank"><span style="padding-left:20px;padding-right:20px;font-size:16px;display:inline-block;">
<span style="font-size: 16px; line-height: 32px;">Login to view your dashboard</span>
</span></a>
<!--[if mso]></center></v:textbox></v:roundrect></td></tr></table><![endif]-->

11
lib/workers/send_email_report.ex
View File

@ -46,12 +46,6 @@ defmodule Plausible.Workers.SendEmailReport do
:ok
end
defp gen_login_link("Weekly"),
do: PlausibleWeb.Endpoint.url() <> "/login?utm_medium=email&utm_source=weekly-report"
defp gen_login_link(_),
do: PlausibleWeb.Endpoint.url() <> "/login?utm_medium=email&utm_source=monthly-report"
defp send_report(email, site, name, unsubscribe_link, query) do
{pageviews, unique_visitors} = Stats.pageviews_and_visitors(site, query)
@ -64,7 +58,7 @@ defmodule Plausible.Workers.SendEmailReport do
referrers = Stats.top_sources(site, query, 5, 1, [])
pages = Stats.top_pages(site, query, 5, 1, [])
user = Plausible.Auth.find_user_by(email: email)
login_link = user && Plausible.Sites.is_owner?(user.id, site) && gen_login_link(name)
login_link = user && Plausible.Sites.is_owner?(user.id, site)
template =
PlausibleWeb.Email.weekly_report(email, site,
@ -79,8 +73,7 @@ defmodule Plausible.Workers.SendEmailReport do
login_link: login_link,
pages: pages,
query: query,
name: name,
login_link: login_link
name: name
)
try do

26
test/workers/send_email_report_test.exs
View File

@ -25,19 +25,6 @@ defmodule Plausible.Workers.SendEmailReportTest do
to: [nil: "user2@email.com"]
)
end
test "includes correct login link in email" do
user = insert(:user)
site = insert(:site, domain: "test-site.com", timezone: "US/Eastern", members: [user])
insert(:weekly_report, site: site, recipients: [user.email])
perform(%{"site_id" => site.id, "interval" => "weekly"})
user_email = user.email
assert_delivered_email_matches(%{to: [{_, ^user_email}], html_body: html_body})
assert html_body =~ "/login?utm_medium=email&amp;utm_source=weekly-report"
end
end
describe "monthly_reports" do
@ -63,18 +50,5 @@ defmodule Plausible.Workers.SendEmailReportTest do
to: [nil: "user2@email.com"]
)
end
test "includes correct login link in email" do
user = insert(:user)
site = insert(:site, domain: "test-site.com", timezone: "US/Eastern", members: [user])
insert(:monthly_report, site: site, recipients: [user.email])
perform(%{"site_id" => site.id, "interval" => "monthly"})
user_email = user.email
assert_delivered_email_matches(%{to: [{_, ^user_email}], html_body: html_body})
assert html_body =~ "/login?utm_medium=email&amp;utm_source=monthly-report"
end
end
end