Reduce database roundtrips on critical path for authorization

pull/1365/head
Uku Taht 5 years ago
parent a722d02e63
commit 71d1988ee8

@ -12,13 +12,20 @@ defmodule PlausibleWeb.AuthPlug do
conn
id ->
user =
Repo.get_by(Plausible.Auth.User, id: id)
|> Repo.preload(
subscription:
from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])
subscription_query =
from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at], limit: 1)
{user, subscription} =
Repo.one(
from u in Plausible.Auth.User,
left_join: s in subquery(subscription_query),
on: s.user_id == u.id,
where: u.id == ^id,
select: {u, s}
)
user = Map.put(user, :subscription, subscription)
if user do
Sentry.Context.set_user_context(%{id: user.id, name: user.name, email: user.email})
assign(conn, :current_user, user)

@ -5,8 +5,27 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do
def init([]), do: [:public, :viewer, :admin, :owner]
def init(allowed_roles), do: allowed_roles
defp get_site_and_role(domain, nil) do
site = Repo.get_by(Plausible.Site, domain: domain)
{site, nil}
end
defp get_site_and_role(domain, user_id) do
Repo.one(
from s in Plausible.Site,
left_join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: s.domain == ^domain,
where: sm.user_id == ^user_id or s.public,
select: {s, sm.role}
) || {nil, nil}
end
def call(conn, allowed_roles) do
site = Repo.get_by(Plausible.Site, domain: conn.params["domain"] || conn.params["website"])
domain = conn.params["domain"] || conn.params["website"]
user_id = get_session(conn, :current_user_id)
{site, membership_role} = get_site_and_role(domain, user_id)
shared_link_auth = conn.params["auth"]
shared_link_record =
@ -15,9 +34,6 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do
if !site do
PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
else
user_id = get_session(conn, :current_user_id)
membership_role = user_id && Plausible.Sites.role(user_id, site)
role =
cond do
user_id && membership_role ->

Loading…
Cancel
Save