diff --git a/lib/plausible_web/plugs/authorize_stats_api.ex b/lib/plausible_web/plugs/authorize_stats_api.ex index 99a58bfd9..a5e9a9a74 100644 --- a/lib/plausible_web/plugs/authorize_stats_api.ex +++ b/lib/plausible_web/plugs/authorize_stats_api.ex @@ -57,9 +57,9 @@ defmodule PlausibleWeb.AuthorizeStatsApiPlug do is_super_admin? = Plausible.Auth.is_super_admin?(api_key.user_id) cond do + is_super_admin? -> {:ok, site} Sites.locked?(site) -> {:error, :site_locked} is_member? -> {:ok, site} - is_super_admin? -> {:ok, site} true -> {:error, :invalid_api_key} end diff --git a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs index 76b738180..d47c9c259 100644 --- a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs +++ b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs @@ -67,7 +67,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AuthTest do }) end - describe "admin access" do + describe "super admin access" do setup %{user: user} do original_env = Application.get_env(:plausible, :super_admin_user_ids) Application.put_env(:plausible, :super_admin_user_ids, [user.id]) @@ -77,7 +77,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AuthTest do end) end - test "can access as an admin", %{conn: conn, api_key: api_key} do + test "can access as a super admin", %{conn: conn, api_key: api_key} do site = insert(:site) conn @@ -87,6 +87,22 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AuthTest do "results" => %{"pageviews" => %{"value" => 0}} }) end + + test "can access as a super admin even if site is locked", %{ + conn: conn, + api_key: api_key, + user: user + } do + site = insert(:site, members: [user]) + {1, _} = Plausible.Billing.SiteLocker.set_lock_status_for(user, true) + + conn + |> with_api_key(api_key) + |> get("/api/v1/stats/aggregate", %{"site_id" => site.domain, "metrics" => "pageviews"}) + |> assert_ok(%{ + "results" => %{"pageviews" => %{"value" => 0}} + }) + end end test "limits the rate of API requests", %{user: user} do