more

Author: jacooobi

config/test.exs

@@ -12,7 +12,6 @@ config :plausible, Plausible.ClickhouseRepo,
   loggers: [Ecto.LogEntry],
   pool_size: 5
 
-
 config :geolix,
   databases: [
     %{

lib/plausible_web/controllers/api/external_controller.ex

@@ -1,5 +1,6 @@
 defmodule PlausibleWeb.Api.ExternalController do
   use PlausibleWeb, :controller
+  # telemetry will be brought back once we integrate the plausible codebase
   # use OpenTelemetryDecorator
   require Logger
 

lib/plausible_web/controllers/stats_controller.ex

@@ -4,17 +4,15 @@ defmodule PlausibleWeb.StatsController do
   plug PlausibleWeb.AuthorizeSiteAccess when action in [:stats, :csv_export]
 
   def stats(%{assigns: %{site: %{domain: "all"} = site}} = conn, _params) do
-
-      conn
-      |> put_resp_header("x-robots-tag", "noindex")
-      |> render("stats.html",
-        site: site,
-        has_goals: false,
-        title: "Careers Analytics",
-        offer_email_report: false,
-        demo: false
-      )
-
+    conn
+    |> put_resp_header("x-robots-tag", "noindex")
+    |> render("stats.html",
+      site: site,
+      has_goals: false,
+      title: "Careers Analytics",
+      offer_email_report: false,
+      demo: false
+    )
   end
 
   def stats(%{assigns: %{site: site}} = conn, _params) do

lib/plausible_web/plugs/auth_plug.ex

@@ -9,7 +9,7 @@ defmodule PlausibleWeb.AuthPlug do
   end
 
   def call(conn, _opts) do
-     user = Plausible.Auth.User |> limit(1) |> Repo.one()
+    user = Plausible.Auth.User |> limit(1) |> Repo.one()
 
     assign(conn, :current_user, user)
   end

lib/plausible_web/plugs/authorize_site_access.ex

@@ -1,18 +1,13 @@
 defmodule PlausibleWeb.AuthorizeSiteAccess do
   import Plug.Conn
+  import Ecto.Query
+
+  alias Plausible.Repo
 
   def init(opts), do: opts
 
   def call(conn, _opts) do
-    site = %Plausible.Site{
-      updated_at: ~N[2022-08-26 13:38:22],
-      inserted_at: ~N[2022-08-26 13:38:22],
-      has_stats: false,
-      locked: false,
-      public: false,
-      timezone: "Europe/Warsaw",
-      domain: "all"
-    }
+    user = Plausible.Site |> limit(1) |> Repo.one()
 
     merge_assigns(conn, site: site, current_user_role: :owner)
   end

test/plausible_web/controllers/stats_controller_test.exs

@@ -91,7 +91,6 @@ defmodule PlausibleWeb.StatsControllerTest do
     end
   end
 
-
   describe "GET /:website/export" do
     setup [:create_user, :create_new_site, :log_in]