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
Use `:domain` uniformly for all routes instead of `:website` (#4598)
Adrian Gruntkowski2d7943aec858
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 58f6b1a35b..cdfdcf612c 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -104,8 +104,8 @@ defmodule PlausibleWeb.SiteController doendend- def settings(conn, %{"website" => website}) do- redirect(conn, to: Routes.site_path(conn, :settings_general, website))+ def settings(conn, %{"domain" => domain}) do+ redirect(conn, to: Routes.site_path(conn, :settings_general, domain))enddef settings_general(conn, _params) dodiff --git a/lib/plausible_web/controllers/unsubscribe_controller.ex b/lib/plausible_web/controllers/unsubscribe_controller.exindex 841d12f651..7112cb1250 100644--- a/lib/plausible_web/controllers/unsubscribe_controller.ex+++ b/lib/plausible_web/controllers/unsubscribe_controller.ex@@ -3,8 +3,8 @@ defmodule PlausibleWeb.UnsubscribeController douse Plausible.Repoalias Plausible.Site.{WeeklyReport, MonthlyReport}- def weekly_report(conn, %{"website" => website, "email" => email}) do- site = Repo.get_by(Plausible.Site, domain: website)+ def weekly_report(conn, %{"domain" => domain, "email" => email}) do+ site = Repo.get_by(Plausible.Site, domain: domain)weekly_report = site && Repo.get_by(WeeklyReport, site_id: site.id)if weekly_report do@@ -17,7 +17,7 @@ defmodule PlausibleWeb.UnsubscribeController do|> assign(:skip_plausible_tracking, true)|> render("success.html",interval: "weekly",- site: site || %{domain: website}+ site: site || %{domain: domain})end@@ -25,8 +25,8 @@ defmodule PlausibleWeb.UnsubscribeController dorender_error(conn, 400)end- def monthly_report(conn, %{"website" => website, "email" => email}) do- site = Repo.get_by(Plausible.Site, domain: website)+ def monthly_report(conn, %{"domain" => domain, "email" => email}) do+ site = Repo.get_by(Plausible.Site, domain: domain)monthly_report = site && Repo.get_by(MonthlyReport, site_id: site.id)if monthly_report do@@ -39,7 +39,7 @@ defmodule PlausibleWeb.UnsubscribeController do|> assign(:skip_plausible_tracking, true)|> render("success.html",interval: "monthly",- site: site || %{domain: website}+ site: site || %{domain: domain})enddiff --git a/lib/plausible_web/live/installation.ex b/lib/plausible_web/live/installation.exindex 30c7ac4057..e0ed249e54 100644--- a/lib/plausible_web/live/installation.ex+++ b/lib/plausible_web/live/installation.ex@@ -30,7 +30,7 @@ defmodule PlausibleWeb.Live.Installation dodef script_extension_params, do: @script_extension_paramsdef mount(- %{"website" => domain} = params,+ %{"domain" => domain} = params,_session,socket) dodiff --git a/lib/plausible_web/live/verification.ex b/lib/plausible_web/live/verification.exindex 47b88621b0..faefb3c107 100644--- a/lib/plausible_web/live/verification.ex+++ b/lib/plausible_web/live/verification.ex@@ -14,7 +14,7 @@ defmodule PlausibleWeb.Live.Verification do@slowdown_for_frequent_checking :timer.seconds(5)def mount(- %{"website" => domain} = params,+ %{"domain" => domain} = params,_session,socket) dodiff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.exindex ba0b47eb6e..c33c6185eb 100644--- a/lib/plausible_web/plugs/authorize_site_access.ex+++ b/lib/plausible_web/plugs/authorize_site_access.ex@@ -66,7 +66,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess dodefp get_site_with_role(conn, current_user) do# addition is flimsy, do we need an extra argument on plug init to control where we look for the domain?domain =- conn.path_params["domain"] || conn.path_params["website"] ||+ conn.path_params["domain"] ||(conn.method == "POST" && conn.path_info == ["api", "docs", "query"] &&conn.params["site_id"])diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex 5fa69f8fbf..3394eae25d 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -340,72 +340,72 @@ defmodule PlausibleWeb.Router doget "/sites/new", SiteController, :newpost "/sites", SiteController, :create_site- get "/sites/:website/change-domain", SiteController, :change_domain- put "/sites/:website/change-domain", SiteController, :change_domain_submit- post "/sites/:website/make-public", SiteController, :make_public- post "/sites/:website/make-private", SiteController, :make_private- post "/sites/:website/weekly-report/enable", SiteController, :enable_weekly_report- post "/sites/:website/weekly-report/disable", SiteController, :disable_weekly_report- post "/sites/:website/weekly-report/recipients", SiteController, :add_weekly_report_recipient-- delete "/sites/:website/weekly-report/recipients/:recipient",+ get "/sites/:domain/change-domain", SiteController, :change_domain+ put "/sites/:domain/change-domain", SiteController, :change_domain_submit+ post "/sites/:domain/make-public", SiteController, :make_public+ post "/sites/:domain/make-private", SiteController, :make_private+ post "/sites/:domain/weekly-report/enable", SiteController, :enable_weekly_report+ post "/sites/:domain/weekly-report/disable", SiteController, :disable_weekly_report+ post "/sites/:domain/weekly-report/recipients", SiteController, :add_weekly_report_recipient++ delete "/sites/:domain/weekly-report/recipients/:recipient",SiteController,:remove_weekly_report_recipient- post "/sites/:website/monthly-report/enable", SiteController, :enable_monthly_report- post "/sites/:website/monthly-report/disable", SiteController, :disable_monthly_report+ post "/sites/:domain/monthly-report/enable", SiteController, :enable_monthly_report+ post "/sites/:domain/monthly-report/disable", SiteController, :disable_monthly_report- post "/sites/:website/monthly-report/recipients",+ post "/sites/:domain/monthly-report/recipients",SiteController,:add_monthly_report_recipient- delete "/sites/:website/monthly-report/recipients/:recipient",+ delete "/sites/:domain/monthly-report/recipients/:recipient",SiteController,:remove_monthly_report_recipient- post "/sites/:website/traffic-change-notification/:type/enable",+ post "/sites/:domain/traffic-change-notification/:type/enable",SiteController,:enable_traffic_change_notification- post "/sites/:website/traffic-change-notification/:type/disable",+ post "/sites/:domain/traffic-change-notification/:type/disable",SiteController,:disable_traffic_change_notification- put "/sites/:website/traffic-change-notification/:type",+ put "/sites/:domain/traffic-change-notification/:type",SiteController,:update_traffic_change_notification- post "/sites/:website/traffic-change-notification/:type/recipients",+ post "/sites/:domain/traffic-change-notification/:type/recipients",SiteController,:add_traffic_change_notification_recipient- delete "/sites/:website/traffic-change-notification/:type/recipients/:recipient",+ delete "/sites/:domain/traffic-change-notification/:type/recipients/:recipient",SiteController,:remove_traffic_change_notification_recipient- get "/sites/:website/shared-links/new", SiteController, :new_shared_link- post "/sites/:website/shared-links", SiteController, :create_shared_link- get "/sites/:website/shared-links/:slug/edit", SiteController, :edit_shared_link- put "/sites/:website/shared-links/:slug", SiteController, :update_shared_link- delete "/sites/:website/shared-links/:slug", SiteController, :delete_shared_link+ get "/sites/:domain/shared-links/new", SiteController, :new_shared_link+ post "/sites/:domain/shared-links", SiteController, :create_shared_link+ get "/sites/:domain/shared-links/:slug/edit", SiteController, :edit_shared_link+ put "/sites/:domain/shared-links/:slug", SiteController, :update_shared_link+ delete "/sites/:domain/shared-links/:slug", SiteController, :delete_shared_link- get "/sites/:website/memberships/invite", Site.MembershipController, :invite_member_form- post "/sites/:website/memberships/invite", Site.MembershipController, :invite_member+ get "/sites/:domain/memberships/invite", Site.MembershipController, :invite_member_form+ post "/sites/:domain/memberships/invite", Site.MembershipController, :invite_memberpost "/sites/invitations/:invitation_id/accept", InvitationController, :accept_invitationpost "/sites/invitations/:invitation_id/reject", InvitationController, :reject_invitation- delete "/sites/:website/invitations/:invitation_id", InvitationController, :remove_invitation+ delete "/sites/:domain/invitations/:invitation_id", InvitationController, :remove_invitation- get "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership_form- post "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership+ get "/sites/:domain/transfer-ownership", Site.MembershipController, :transfer_ownership_form+ post "/sites/:domain/transfer-ownership", Site.MembershipController, :transfer_ownership- put "/sites/:website/memberships/:id/role/:new_role", Site.MembershipController, :update_role- delete "/sites/:website/memberships/:id", Site.MembershipController, :remove_member+ put "/sites/:domain/memberships/:id/role/:new_role", Site.MembershipController, :update_role+ delete "/sites/:domain/memberships/:id", Site.MembershipController, :remove_member- get "/sites/:website/weekly-report/unsubscribe", UnsubscribeController, :weekly_report- get "/sites/:website/monthly-report/unsubscribe", UnsubscribeController, :monthly_report+ get "/sites/:domain/weekly-report/unsubscribe", UnsubscribeController, :weekly_report+ get "/sites/:domain/monthly-report/unsubscribe", UnsubscribeController, :monthly_reportscope alias: Live, assigns: %{connect_live_socket: true} dopipe_through [:app_layout, PlausibleWeb.RequireAccountPlug]@@ -413,60 +413,60 @@ defmodule PlausibleWeb.Router doscope assigns: %{dogfood_page_path: "/:website/installation"} do- live "/:website/installation", Installation, :installation, as: :site+ live "/:domain/installation", Installation, :installation, as: :siteendscope assigns: %{dogfood_page_path: "/:website/verification"} do- live "/:website/verification", Verification, :verification, as: :site+ live "/:domain/verification", Verification, :verification, as: :siteendend- get "/:website/settings", SiteController, :settings- get "/:website/settings/general", SiteController, :settings_general- get "/:website/settings/people", SiteController, :settings_people- get "/:website/settings/visibility", SiteController, :settings_visibility- get "/:website/settings/goals", SiteController, :settings_goals- get "/:website/settings/properties", SiteController, :settings_props+ get "/:domain/settings", SiteController, :settings+ get "/:domain/settings/general", SiteController, :settings_general+ get "/:domain/settings/people", SiteController, :settings_people+ get "/:domain/settings/visibility", SiteController, :settings_visibility+ get "/:domain/settings/goals", SiteController, :settings_goals+ get "/:domain/settings/properties", SiteController, :settings_propson_ee do- get "/:website/settings/funnels", SiteController, :settings_funnels+ get "/:domain/settings/funnels", SiteController, :settings_funnelsend- get "/:website/settings/email-reports", SiteController, :settings_email_reports- get "/:website/settings/danger-zone", SiteController, :settings_danger_zone- get "/:website/settings/integrations", SiteController, :settings_integrations- get "/:website/settings/shields/:shield", SiteController, :settings_shields- get "/:website/settings/imports-exports", SiteController, :settings_imports_exports+ get "/:domain/settings/email-reports", SiteController, :settings_email_reports+ get "/:domain/settings/danger-zone", SiteController, :settings_danger_zone+ get "/:domain/settings/integrations", SiteController, :settings_integrations+ get "/:domain/settings/shields/:shield", SiteController, :settings_shields+ get "/:domain/settings/imports-exports", SiteController, :settings_imports_exports- put "/:website/settings/features/visibility/:setting",+ put "/:domain/settings/features/visibility/:setting",SiteController,:update_feature_visibility- put "/:website/settings", SiteController, :update_settings- put "/:website/settings/google", SiteController, :update_google_auth- delete "/:website/settings/google-search", SiteController, :delete_google_auth- delete "/:website/settings/google-import", SiteController, :delete_google_auth- delete "/:website", SiteController, :delete_site- delete "/:website/stats", SiteController, :reset_stats+ put "/:domain/settings", SiteController, :update_settings+ put "/:domain/settings/google", SiteController, :update_google_auth+ delete "/:domain/settings/google-search", SiteController, :delete_google_auth+ delete "/:domain/settings/google-import", SiteController, :delete_google_auth+ delete "/:domain", SiteController, :delete_site+ delete "/:domain/stats", SiteController, :reset_stats- get "/:website/import/google-analytics/property",+ get "/:domain/import/google-analytics/property",GoogleAnalyticsController,:property_form- post "/:website/import/google-analytics/property",+ post "/:domain/import/google-analytics/property",GoogleAnalyticsController,:property- get "/:website/import/google-analytics/confirm", GoogleAnalyticsController, :confirm- post "/:website/settings/google-import", GoogleAnalyticsController, :import+ get "/:domain/import/google-analytics/confirm", GoogleAnalyticsController, :confirm+ post "/:domain/settings/google-import", GoogleAnalyticsController, :import- delete "/:website/settings/forget-imported", SiteController, :forget_imported- delete "/:website/settings/forget-import/:import_id", SiteController, :forget_import+ delete "/:domain/settings/forget-imported", SiteController, :forget_imported+ delete "/:domain/settings/forget-import/:import_id", SiteController, :forget_import- get "/:website/download/export", SiteController, :download_export- get "/:website/settings/import", SiteController, :csv_import+ get "/:domain/download/export", SiteController, :download_export+ get "/:domain/settings/import", SiteController, :csv_importget "/debug/clickhouse", DebugController, :clickhousediff --git a/test/plausible_web/controllers/google_analytics_controller_test.exs b/test/plausible_web/controllers/google_analytics_controller_test.exsindex 7473ee7aca..e3f77e8ffc 100644--- a/test/plausible_web/controllers/google_analytics_controller_test.exs+++ b/test/plausible_web/controllers/google_analytics_controller_test.exs@@ -16,7 +16,7 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest dosetup :verify_on_exit!- describe "GET /:website/import/google-analytics/property" do+ describe "GET /:domain/import/google-analytics/property" dosetup [:create_user, :log_in, :create_new_site]test "lists Google Analytics properties", %{conn: conn, site: site} do@@ -206,7 +206,7 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest doendend- describe "POST /:website/import/google-analytics/property" do+ describe "POST /:domain/import/google-analytics/property" dosetup [:create_user, :log_in, :create_new_site]test "redirects to confirmation", %{conn: conn, site: site} do@@ -504,7 +504,7 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest doendend- describe "GET /:website/import/google-analytics/confirm" do+ describe "GET /:domain/import/google-analytics/confirm" dosetup [:create_user, :log_in, :create_new_site]test "renders confirmation form for Google Analytics 4 import", %{conn: conn, site: site} do@@ -729,7 +729,7 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest doendend- describe "POST /:website/settings/google-import" do+ describe "POST /:domain/settings/google-import" dosetup [:create_user, :log_in, :create_new_site]test "creates Google Analytics 4 site import instance", %{conn: conn, site: site} dodiff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex 4dabdbcad2..33ce92f9c7 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -152,7 +152,7 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doendend- describe "DELETE /sites/:website/invitations/:invitation_id" do+ describe "DELETE /sites/:domain/invitations/:invitation_id" dotest "removes the invitation", %{conn: conn, user: user} dosite = insert(:site, memberships: [build(:site_membership, user: user, role: :admin)])diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex 33402bd4b3..0bb4b76f8a 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -10,7 +10,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest dosetup [:create_user, :log_in]- describe "GET /sites/:website/memberships/invite" do+ describe "GET /sites/:domain/memberships/invite" dotest "shows invite form", %{conn: conn, user: user} dosite = insert(:site, members: [user])@@ -41,7 +41,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendend- describe "POST /sites/:website/memberships/invite" do+ describe "POST /sites/:domain/memberships/invite" dotest "creates invitation", %{conn: conn, user: user} dosite = insert(:site, members: [user])@@ -199,7 +199,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendend- describe "GET /sites/:website/transfer-ownership" do+ describe "GET /sites/:domain/transfer-ownership" dotest "shows ownership transfer form", %{conn: conn, user: user} dosite = insert(:site, members: [user])@@ -209,7 +209,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendend- describe "POST /sites/:website/transfer-ownership" do+ describe "POST /sites/:domain/transfer-ownership" dotest "creates invitation with :owner role", %{conn: conn, user: user} dosite = insert(:site, members: [user])@@ -416,7 +416,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendend- describe "DELETE /sites/:website/memberships/:id" do+ describe "DELETE /sites/:domain/memberships/:id" dotest "removes a member from a site", %{conn: conn, user: user} doadmin = insert(:user)diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 066b45bdc8..ec738d1713 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -461,7 +461,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/installation" do+ describe "GET /:domain/installation" dosetup [:create_user, :log_in, :create_site]test "static render - spinner determining installation type", %{@@ -474,7 +474,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/settings/general" do+ describe "GET /:domain/settings/general" dosetup [:create_user, :log_in, :create_site]setup_patch_env(:google, client_id: "some", api_url: "https://www.googleapis.com")@@ -489,7 +489,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/settings/people" do+ describe "GET /:domain/settings/people" dosetup [:create_user, :log_in, :create_site]@tag :ee_only@@ -514,7 +514,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/settings/goals" do+ describe "GET /:domain/settings/goals" dosetup [:create_user, :log_in, :create_site]test "lists goals for the site", %{conn: conn, site: site} do@@ -538,7 +538,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "PUT /:website/settings" do+ describe "PUT /:domain/settings" dosetup [:create_user, :log_in, :create_site]test "updates the timezone", %{conn: conn, site: site} do@@ -555,7 +555,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/make-public" do+ describe "POST /sites/:domain/make-public" dosetup [:create_user, :log_in, :create_site]test "makes the site public", %{conn: conn, site: site} do@@ -589,7 +589,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/make-private" do+ describe "POST /sites/:domain/make-private" dosetup [:create_user, :log_in, :create_site]test "makes the site private", %{conn: conn, site: site} do@@ -603,7 +603,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /:website" do+ describe "DELETE /:domain" dosetup [:create_user, :log_in, :create_site]test "deletes the site", %{conn: conn, user: user} do@@ -645,7 +645,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "PUT /:website/settings/google" do+ describe "PUT /:domain/settings/google" dosetup [:create_user, :log_in, :create_site]test "updates google auth property", %{conn: conn, user: user, site: site} do@@ -664,7 +664,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /:website/settings/google" do+ describe "DELETE /:domain/settings/google" dosetup [:create_user, :log_in, :create_site]test "deletes associated google auth", %{conn: conn, user: user, site: site} do@@ -690,7 +690,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/settings/imports-exports" do+ describe "GET /:domain/settings/imports-exports" dosetup [:create_user, :log_in, :create_site, :maybe_fake_minio]test "renders empty imports list", %{conn: conn, site: site} do@@ -803,7 +803,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/settings/imports-exports when object storage is unreachable" do+ describe "GET /:domain/settings/imports-exports when object storage is unreachable" dosetup [:create_user, :log_in, :create_site]setup tags do@@ -824,7 +824,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/settings/integrations for self-hosting" do+ describe "GET /:domain/settings/integrations for self-hosting" dosetup [:create_user, :log_in, :create_site]setup_patch_env(:google,@@ -842,7 +842,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /:website/integrations (search-console)" do+ describe "GET /:domain/integrations (search-console)" dosetup [:create_user, :log_in, :create_site]setup_patch_env(:google, client_id: "some", api_url: "https://www.googleapis.com")@@ -955,7 +955,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "PUT /:website/settings/features/visibility/:setting" do+ describe "PUT /:domain/settings/features/visibility/:setting" dodef query_conn_with_some_url(context) do{:ok, Map.put(context, :conn_with_url, get(context.conn, "/some_parent_path"))}end@@ -1077,7 +1077,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/weekly-report/enable" do+ describe "POST /sites/:domain/weekly-report/enable" dosetup [:create_user, :log_in, :create_site]test "creates a weekly report record with the user email", %{@@ -1106,7 +1106,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/weekly-report/disable" do+ describe "POST /sites/:domain/weekly-report/disable" dosetup [:create_user, :log_in, :create_site]test "deletes the weekly report record", %{conn: conn, site: site} do@@ -1127,7 +1127,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/weekly-report/recipients" do+ describe "POST /sites/:domain/weekly-report/recipients" dosetup [:create_user, :log_in, :create_site]test "adds a recipient to the weekly report", %{conn: conn, site: site} do@@ -1140,7 +1140,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /sites/:website/weekly-report/recipients/:recipient" do+ describe "DELETE /sites/:domain/weekly-report/recipients/:recipient" dosetup [:create_user, :log_in, :create_site]test "removes a recipient from the weekly report", %{conn: conn, site: site} do@@ -1167,7 +1167,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/monthly-report/enable" do+ describe "POST /sites/:domain/monthly-report/enable" dosetup [:create_user, :log_in, :create_site]test "creates a monthly report record with the user email", %{@@ -1196,7 +1196,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/monthly-report/disable" do+ describe "POST /sites/:domain/monthly-report/disable" dosetup [:create_user, :log_in, :create_site]test "deletes the monthly report record", %{conn: conn, site: site} do@@ -1208,7 +1208,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/monthly-report/recipients" do+ describe "POST /sites/:domain/monthly-report/recipients" dosetup [:create_user, :log_in, :create_site]test "adds a recipient to the monthly report", %{conn: conn, site: site} do@@ -1221,7 +1221,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /sites/:website/monthly-report/recipients/:recipient" do+ describe "DELETE /sites/:domain/monthly-report/recipients/:recipient" dosetup [:create_user, :log_in, :create_site]test "removes a recipient from the monthly report", %{conn: conn, site: site} do@@ -1253,7 +1253,7 @@ defmodule PlausibleWeb.SiteControllerTest doendfor type <- [:spike, :drop] do- describe "POST /sites/:website/traffic-change-notification/#{type}/enable" do+ describe "POST /sites/:domain/traffic-change-notification/#{type}/enable" dosetup [:create_user, :log_in, :create_site]test "creates a #{type} notification record with the user email", %{@@ -1288,7 +1288,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/traffic-change-notification/#{type}/disable" do+ describe "POST /sites/:domain/traffic-change-notification/#{type}/disable" dosetup [:create_user, :log_in, :create_site]test "deletes the #{type} notification record", %{conn: conn, site: site} do@@ -1300,7 +1300,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "PUT /sites/:website/traffic-change-notification/#{type}" do+ describe "PUT /sites/:domain/traffic-change-notification/#{type}" dosetup [:create_user, :log_in, :create_site]test "updates #{type} notification threshold", %{conn: conn, site: site} do@@ -1320,7 +1320,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/traffic-change-notification/#{type}/recipients" do+ describe "POST /sites/:domain/traffic-change-notification/#{type}/recipients" dosetup [:create_user, :log_in, :create_site]test "adds a recipient to the #{type} notification", %{conn: conn, site: site} do@@ -1342,7 +1342,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /sites/:website/traffic-change-notification/#{type}/recipients/:recipient" do+ describe "DELETE /sites/:domain/traffic-change-notification/#{type}/recipients/:recipient" dosetup [:create_user, :log_in, :create_site]test "removes a recipient from the #{type} notification", %{conn: conn, site: site} do@@ -1395,7 +1395,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /sites/:website/shared-links/new" do+ describe "GET /sites/:domain/shared-links/new" dosetup [:create_user, :log_in, :create_site]test "shows form for new shared link", %{conn: conn, site: site} do@@ -1405,7 +1405,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "POST /sites/:website/shared-links" do+ describe "POST /sites/:domain/shared-links" dosetup [:create_user, :log_in, :create_site]test "creates shared link without password", %{conn: conn, site: site} do@@ -1433,7 +1433,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "GET /sites/:website/shared-links/edit" do+ describe "GET /sites/:domain/shared-links/edit" dosetup [:create_user, :log_in, :create_site]test "shows form to edit shared link", %{conn: conn, site: site} do@@ -1444,7 +1444,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "PUT /sites/:website/shared-links/:slug" do+ describe "PUT /sites/:domain/shared-links/:slug" dosetup [:create_user, :log_in, :create_site]test "can update link name", %{conn: conn, site: site} do@@ -1460,7 +1460,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /sites/:website/shared-links/:slug" do+ describe "DELETE /sites/:domain/shared-links/:slug" dosetup [:create_user, :log_in, :create_site]test "deletes shared link", %{conn: conn, site: site} do@@ -1484,7 +1484,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /:website/settings/:forget_import/:import_id" do+ describe "DELETE /:domain/settings/:forget_import/:import_id" dosetup [:create_user, :log_in, :create_new_site, :create_legacy_site_import]test "removes site import, associated data and cancels oban job for a particular import", %{@@ -1562,7 +1562,7 @@ defmodule PlausibleWeb.SiteControllerTest doendend- describe "DELETE /:website/settings/forget_imported" do+ describe "DELETE /:domain/settings/forget_imported" dosetup [:create_user, :log_in, :create_new_site]test "removes actual imported data from Clickhouse", %{conn: conn, user: user, site: site} dodiff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exsindex 1400354516..a8831c8a70 100644--- a/test/plausible_web/controllers/stats_controller_test.exs+++ b/test/plausible_web/controllers/stats_controller_test.exs@@ -5,7 +5,7 @@ defmodule PlausibleWeb.StatsControllerTest do@react_container "div#stats-react-container"- describe "GET /:website - anonymous user" do+ describe "GET /:domain - anonymous user" dotest "public site - shows site stats", %{conn: conn} dosite = insert(:site, public: true)populate_stats(site, [build(:pageview)])@@ -80,7 +80,7 @@ defmodule PlausibleWeb.StatsControllerTest doendend- describe "GET /:website - as a logged in user" do+ describe "GET /:domain - as a logged in user" dosetup [:create_user, :log_in, :create_site]test "can view stats of a website I've created", %{conn: conn, site: site} do@@ -119,7 +119,7 @@ defmodule PlausibleWeb.StatsControllerTest doendend- describe "GET /:website - as a super admin" do+ describe "GET /:domain - as a super admin" do@describetag :ee_onlysetup [:create_user, :make_user_super_admin, :log_in]@@ -181,7 +181,7 @@ defmodule PlausibleWeb.StatsControllerTest doApplication.put_env(:plausible, :super_admin_user_ids, [user.id])end- describe "GET /:website/export" do+ describe "GET /:domain/export" dosetup [:create_user, :create_new_site, :log_in]test "exports all the necessary CSV files", %{conn: conn, site: site} do@@ -590,7 +590,7 @@ defmodule PlausibleWeb.StatsControllerTest do|> Enum.map(&String.split(&1, ","))end- describe "GET /:website/export - via shared link" do+ describe "GET /:domain/export - via shared link" dotest "exports data in zipped csvs", %{conn: conn} dosite = insert(:site, domain: "new-site.com")link = insert(:shared_link, site: site)@@ -601,7 +601,7 @@ defmodule PlausibleWeb.StatsControllerTest doendend- describe "GET /:website/export - for past 6 months" do+ describe "GET /:domain/export - for past 6 months" dosetup [:create_user, :create_new_site, :log_in]test "exports 6 months of data in zipped csvs", %{conn: conn, site: site} do@@ -611,7 +611,7 @@ defmodule PlausibleWeb.StatsControllerTest doendend- describe "GET /:website/export - with path filter" do+ describe "GET /:domain/export - with path filter" dosetup [:create_user, :create_new_site, :log_in]test "exports filtered data in zipped csvs", %{conn: conn, site: site} do@@ -623,7 +623,7 @@ defmodule PlausibleWeb.StatsControllerTest doendend- describe "GET /:website/export - with a custom prop filter" do+ describe "GET /:domain/export - with a custom prop filter" dosetup [:create_user, :create_new_site, :log_in]test "custom-props.csv only returns the prop and its value in filter", %{@@ -751,7 +751,7 @@ defmodule PlausibleWeb.StatsControllerTest doinsert(:goal, %{site: site, event_name: "Signup"})end- describe "GET /:website/export - with goal filter" do+ describe "GET /:domain/export - with goal filter" dosetup [:create_user, :create_new_site, :log_in]test "exports goal-filtered data in zipped csvs", %{conn: conn, site: site} dodiff --git a/test/plausible_web/controllers/unsubscribe_controller_test.exs b/test/plausible_web/controllers/unsubscribe_controller_test.exsindex c87365422c..17cf229e66 100644--- a/test/plausible_web/controllers/unsubscribe_controller_test.exs+++ b/test/plausible_web/controllers/unsubscribe_controller_test.exs@@ -4,7 +4,7 @@ defmodule PlausibleWeb.UnsubscribeControllerTest dosetup {PlausibleWeb.FirstLaunchPlug.Test, :skip}- describe "GET /sites/:website/weekly-report/unsubscribe" do+ describe "GET /sites/:domain/weekly-report/unsubscribe" dotest "removes a recipient from the weekly report without them having to log in", %{conn: conn} dosite = insert(:site)insert(:weekly_report, site: site, recipients: ["[email protected]"])@@ -33,7 +33,7 @@ defmodule PlausibleWeb.UnsubscribeControllerTest doendend- describe "GET /sites/:website/monthly-report/unsubscribe" do+ describe "GET /sites/:domain/monthly-report/unsubscribe" dotest "removes a recipient from the weekly report without them having to log in", %{conn: conn} dosite = insert(:site)insert(:monthly_report, site: site, recipients: ["[email protected]"])diff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exsindex 1eb26cd293..f34e2975e5 100644--- a/test/plausible_web/live/funnel_settings_test.exs+++ b/test/plausible_web/live/funnel_settings_test.exs@@ -7,7 +7,7 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest doimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML- describe "GET /:website/settings/funnels" do+ describe "GET /:domain/settings/funnels" dosetup [:create_user, :log_in, :create_site]test "lists funnels for the site and renders help link", %{conn: conn, site: site} dodiff --git a/test/plausible_web/live/goal_settings_test.exs b/test/plausible_web/live/goal_settings_test.exsindex e7597d3f36..20cd385f72 100644--- a/test/plausible_web/live/goal_settings_test.exs+++ b/test/plausible_web/live/goal_settings_test.exs@@ -3,7 +3,7 @@ defmodule PlausibleWeb.Live.GoalSettingsTest doimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML- describe "GET /:website/settings/goals" do+ describe "GET /:domain/settings/goals" dosetup [:create_user, :log_in, :create_site]@tag :ee_onlydiff --git a/test/plausible_web/live/plugins_api_tokens_test.exs b/test/plausible_web/live/plugins_api_tokens_test.exsindex 3023a15e84..ceb3256386 100644--- a/test/plausible_web/live/plugins_api_tokens_test.exs+++ b/test/plausible_web/live/plugins_api_tokens_test.exs@@ -5,7 +5,7 @@ defmodule PlausibleWeb.Live.PluginsAPISettingsTest doalias Plausible.Plugins.API.Tokens- describe "GET /:website/settings/integrations" do+ describe "GET /:domain/settings/integrations" dosetup [:create_user, :log_in, :create_site]test "does not display the Plugins API section by default", %{conn: conn, site: site} dodiff --git a/test/plausible_web/live/props_settings_test.exs b/test/plausible_web/live/props_settings_test.exsindex c0739724eb..79b578d875 100644--- a/test/plausible_web/live/props_settings_test.exs+++ b/test/plausible_web/live/props_settings_test.exs@@ -3,7 +3,7 @@ defmodule PlausibleWeb.Live.PropsSettingsTest doimport Phoenix.LiveViewTestimport Plausible.Test.Support.HTML- describe "GET /:website/settings/properties" do+ describe "GET /:domain/settings/properties" dosetup [:create_user, :log_in, :create_site]test "lists props for the site and renders links", %{conn: conn, site: site} dodiff --git a/test/plausible_web/plugs/authorize_site_access_test.exs b/test/plausible_web/plugs/authorize_site_access_test.exsindex 2d9beb3264..8690cc90a4 100644--- a/test/plausible_web/plugs/authorize_site_access_test.exs+++ b/test/plausible_web/plugs/authorize_site_access_test.exs@@ -34,27 +34,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest doassert html_response(conn, 404)end- test "doesn't allow bypassing :domain in path with :website or :domain in query param", %{- conn: conn,- site: site- } do- other_site = insert(:site, members: [build(:user)])-- conn =- conn- |> bypass_through(PlausibleWeb.Router)- |> get("/#{other_site.domain}/export", %{- "domain" => site.domain,- "website" => site.domain- })- |> AuthorizeSiteAccess.call(_allowed_roles = [:admin, :owner])-- assert conn.halted- assert html_response(conn, 404)- assert conn.path_params == %{"domain" => other_site.domain}- end-- test "doesn't allow bypassing :website in path with :website or :domain in query param", %{+ test "doesn't allow bypassing :domain in path with :domain in query param", %{conn: conn,site: site} do@@ -64,14 +44,13 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest doconn|> bypass_through(PlausibleWeb.Router)|> get("/sites/#{other_site.domain}/change-domain", %{- "domain" => site.domain,- "website" => site.domain+ "domain" => site.domain})|> AuthorizeSiteAccess.call(_allowed_roles = [:admin, :owner])assert conn.haltedassert conn.status == 404- assert conn.path_params == %{"website" => other_site.domain}+ assert conn.path_params == %{"domain" => other_site.domain}endtest "returns 404 with custom error message for failed API routes", %{conn: conn, user: user} do