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
Clean up main graph route (#6277)
Artur Pataea2a6538a2f0
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex 73fc87a98c..a84f8427f3 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -18,10 +18,6 @@ defmodule PlausibleWeb.StatsController doApi.StatsController --) Browser: {"top_stats": [...]}Note left of Browser: TopStats.render()- Browser -) Api.StatsController: GET /api/stats/mydomain.com/main-graph- Api.StatsController --) Browser: [{"plot": [...], "labels": [...]}, ...]- Note left of Browser: VisitorGraph.render()-Browser -) Api.StatsController: GET /api/stats/mydomain.com/sourcesApi.StatsController --) Browser: [{"name": "Google", "visitors": 292150}, ...]Note left of Browser: Sources.render()diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex bbbfc40224..613929d534 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -296,7 +296,6 @@ defmodule PlausibleWeb.Router doscope private: %{allow_consolidated_views: true} dopost "/:domain/query", StatsController, :queryget "/:domain/current-visitors", StatsController, :current_visitors- get "/:domain/main-graph", StatsController, :main_graphget "/:domain/sources", StatsController, :sourcesget "/:domain/channels", StatsController, :channelsget "/:domain/utm_mediums", StatsController, :utm_mediumsdiff --git a/test/plausible_web/controllers/api/stats_controller/authorization_test.exs b/test/plausible_web/controllers/api/stats_controller/authorization_test.exsindex f0c4a50414..1f3d640685 100644--- a/test/plausible_web/controllers/api/stats_controller/authorization_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/authorization_test.exs@@ -12,7 +12,9 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dodescribe "API authorization - as anonymous user" dotest "returns 404 for a site that doesn't exist", %{conn: conn} doconn = init_session(conn)- conn = get(conn, "/api/stats/fake-site.com/main-graph")++ conn =+ post(conn, "/api/stats/fake-site.com/query", %{})assert json_response(conn, 404) == %{"error" => "Site does not exist or user does not have sufficient access."@@ -22,7 +24,9 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dotest "returns 404 for private site", %{conn: conn} doconn = init_session(conn)site = insert(:site, public: false)- conn = get(conn, "/api/stats/#{site.domain}/main-graph")++ conn =+ post(conn, "/api/stats/#{site.domain}/query", %{})assert json_response(conn, 404) == %{"error" => "Site does not exist or user does not have sufficient access."@@ -34,10 +38,7 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dosite = insert(:site, public: true)conn =- post(conn, "/api/stats/#{site.domain}/query", %{- "date_range" => "day",- "metrics" => ["visitors"]- })+ query_visitors(conn, site, [])assert %{"results" => _} = json_response(conn, 200)end@@ -183,7 +184,9 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dotest "returns 404 for a site that doesn't exist", %{conn: conn} doconn = init_session(conn)- conn = get(conn, "/api/stats/fake-site.com/main-graph/")++ conn =+ post(conn, "/api/stats/fake-site.com/query", %{})assert json_response(conn, 404) == %{"error" => "Site does not exist or user does not have sufficient access."@@ -192,7 +195,9 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dotest "returns 404 when user does not have access to site", %{conn: conn} dosite = new_site()- conn = get(conn, "/api/stats/#{site.domain}/main-graph")++ conn =+ post(conn, "/api/stats/#{site.domain}/query", %{})assert json_response(conn, 404) == %{"error" => "Site does not exist or user does not have sufficient access."@@ -203,10 +208,7 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dosite = new_site(public: true)conn =- post(conn, "/api/stats/#{site.domain}/query", %{- "date_range" => "day",- "metrics" => ["visitors"]- })+ query_visitors(conn, site, [])assert %{"results" => _} = json_response(conn, 200)end@@ -214,11 +216,7 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest dotest "returns stats for a private site that the user owns", %{conn: conn, user: user} dosite = new_site(public: false, owner: user)- conn =- post(conn, "/api/stats/#{site.domain}/query", %{- "date_range" => "day",- "metrics" => ["visitors"]- })+ conn = query_visitors(conn, site, [])assert %{"results" => _} = json_response(conn, 200)end