Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Exports revert (#5152)

hq1eaeec7ae5f6d
diff --git a/assets/js/dashboard/stats/graph/stats-export.js b/assets/js/dashboard/stats/graph/stats-export.js
index 0965300d8e..1b1dd5b3b0 100644
--- a/assets/js/dashboard/stats/graph/stats-export.js
+++ b/assets/js/dashboard/stats/graph/stats-export.js
@@ -3,17 +3,11 @@ import * as api from '../../api';
import { getCurrentInterval } from "./interval-picker";
import { useSiteContext } from "../../site-context";
import { useQueryContext } from "../../query-context";
-import { useUserContext, Role } from '../../user-context'
export default function StatsExport() {
const site = useSiteContext();
const { query } = useQueryContext();
const [exporting, setExporting] = useState(false)
- const user = useUserContext();
-
- if (!user.loggedIn || user.role == Role.public) {
- return null
- }
function startExport() {
setExporting(true)
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index fcd67f9395..8601a24c3c 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -48,14 +48,7 @@ defmodule PlausibleWeb.StatsController do
alias Plausible.Stats.{Filters, Query}
alias PlausibleWeb.Api
- @all_site_roles PlausibleWeb.Plugs.AuthorizeSiteAccess.all_roles()
-
- plug(PlausibleWeb.Plugs.AuthorizeSiteAccess when action == :stats)
-
- plug(
- PlausibleWeb.Plugs.AuthorizeSiteAccess,
- @all_site_roles -- [:public] when action == :csv_export
- )
+ plug(PlausibleWeb.Plugs.AuthorizeSiteAccess when action in [:stats, :csv_export])
def stats(%{assigns: %{site: site}} = conn, _params) do
site = Plausible.Repo.preload(site, :owners)
diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex
index 50b29369e4..2ffc99e71d 100644
--- a/lib/plausible_web/plugs/authorize_site_access.ex
+++ b/lib/plausible_web/plugs/authorize_site_access.ex
@@ -40,8 +40,6 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess do
@all_roles [:public, :viewer, :admin, :editor, :super_admin, :owner]
- def all_roles(), do: @all_roles
-
def init([]), do: {@all_roles, nil}
def init(:all_roles), do: {@all_roles, nil}
diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exs
index b971d3b9fb..99481f4592 100644
--- a/test/plausible_web/controllers/stats_controller_test.exs
+++ b/test/plausible_web/controllers/stats_controller_test.exs
@@ -668,20 +668,8 @@ defmodule PlausibleWeb.StatsControllerTest do
|> Enum.map(&String.split(&1, ","))
end
- describe "GET /:domain/export - via shared link as anonymous user" do
- setup [:create_user, :create_site, :set_scroll_depth_visible_at]
-
- test "export is not allowed for anonymous users", %{conn: conn, site: site} do
- link = insert(:shared_link, site: site)
-
- populate_exported_stats(site)
- conn = get(conn, "/" <> site.domain <> "/export?auth=#{link.slug}&date=2021-10-20")
- assert response(conn, 404)
- end
- end
-
describe "GET /:domain/export - via shared link" do
- setup [:create_user, :create_site, :set_scroll_depth_visible_at, :log_in]
+ setup [:create_user, :create_site, :set_scroll_depth_visible_at]
test "exports data in zipped csvs", %{conn: conn, site: site} do
link = insert(:shared_link, site: site)