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
Revert "Reduce database roundtrips on critical path for authorization"
Uku Tahta7fd23a80401
diff --git a/lib/plausible_web/plugs/auth_plug.ex b/lib/plausible_web/plugs/auth_plug.exindex 4a9b11b28e..ee116a8f12 100644--- a/lib/plausible_web/plugs/auth_plug.ex+++ b/lib/plausible_web/plugs/auth_plug.ex@@ -12,20 +12,13 @@ defmodule PlausibleWeb.AuthPlug doconnid ->- 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 =+ Repo.get_by(Plausible.Auth.User, id: id)+ |> Repo.preload(+ subscription:+ from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at]))- user = Map.put(user, :subscription, subscription)-if user doSentry.Context.set_user_context(%{id: user.id, name: user.name, email: user.email})assign(conn, :current_user, user)diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.exindex 33209c6d00..2b1ccd7e0d 100644--- a/lib/plausible_web/plugs/authorize_site_access.ex+++ b/lib/plausible_web/plugs/authorize_site_access.ex@@ -5,27 +5,8 @@ defmodule PlausibleWeb.AuthorizeSiteAccess dodef 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- 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)-+ site = Repo.get_by(Plausible.Site, domain: conn.params["domain"] || conn.params["website"])shared_link_auth = conn.params["auth"]shared_link_record =@@ -34,6 +15,9 @@ defmodule PlausibleWeb.AuthorizeSiteAccess doif !site doPlausibleWeb.ControllerHelpers.render_error(conn, 404) |> haltelse+ user_id = get_session(conn, :current_user_id)+ membership_role = user_id && Plausible.Sites.role(user_id, site)+role =cond douser_id && membership_role ->