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 more path helpers
Uku Taht1b0323f5c1f7
diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex 494d8f6e60..27d24bd4de 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -26,8 +26,7 @@ defmodule PlausibleWeb.AuthController dodef register_form(conn, _params) doif Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do- conn- |> redirect(to: "/login")+ redirect(conn, to: Routes.auth_path(conn, :login_form))elsechangeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{})@@ -40,8 +39,7 @@ defmodule PlausibleWeb.AuthController dodef register(conn, params) doif Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do- conn- |> redirect(to: "/login")+ redirect(conn, to: Routes.auth_path(conn, :login_form))elseuser = Plausible.Auth.User.new(params["user"])@@ -53,10 +51,10 @@ defmodule PlausibleWeb.AuthController docase user.email_verified dofalse ->send_email_verification(user)- redirect(conn, to: "/activate")+ redirect(conn, to: Routes.auth_path(conn, :activate_form))true ->- redirect(conn, to: "/sites/new")+ redirect(conn, to: Routes.site_path(conn, :new))end{:error, changeset} ->@@ -77,8 +75,7 @@ defmodule PlausibleWeb.AuthController dodef register_from_invitation_form(conn, %{"invitation_id" => invitation_id}) doif Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do- conn- |> redirect(to: "/login")+ redirect(conn, to: Routes.auth_path(conn, :login_form))elseinvitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{})@@ -101,8 +98,7 @@ defmodule PlausibleWeb.AuthController dodef register_from_invitation(conn, %{"invitation_id" => invitation_id} = params) doif Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do- conn- |> redirect(to: "/login")+ redirect(conn, to: Routes.auth_path(conn, :login_form))elseinvitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)user = Plausible.Auth.User.new(params["user"])@@ -121,10 +117,10 @@ defmodule PlausibleWeb.AuthController docase user.email_verified dofalse ->send_email_verification(user)- redirect(conn, to: "/activate")+ redirect(conn, to: Routes.auth_path(conn, :activate_form))true ->- redirect(conn, to: "/sites")+ redirect(conn, to: Routes.site_path(conn, :index))end{:error, changeset} ->@@ -199,9 +195,9 @@ defmodule PlausibleWeb.AuthController docase Auth.verify_email(user, code) do:ok ->if has_invitation do- redirect(conn, to: "/sites")+ redirect(conn, to: Routes.site_path(conn, :index))else- redirect(conn, to: "/sites/new")+ redirect(conn, to: Routes.site_path(conn, :new))end{:error, :incorrect} ->@@ -231,7 +227,7 @@ defmodule PlausibleWeb.AuthController doconn|> put_flash(:success, "Activation code was sent to #{user.email}")- |> redirect(to: "/activate")+ |> redirect(to: Routes.auth_path(conn, :activate_form))enddef password_reset_request_form(conn, _) do@@ -313,7 +309,7 @@ defmodule PlausibleWeb.AuthController do|> put_flash(:login_instructions, "Please log in with your new credentials")|> put_session(:current_user_id, nil)|> delete_resp_cookie("logged_in")- |> redirect(to: "/login")+ |> redirect(to: Routes.auth_path(conn, :login_form)){:error, changeset} ->render(conn, "password_reset_form.html",@@ -344,7 +340,7 @@ defmodule PlausibleWeb.AuthController do{:ok, user} <- find_user(email),:ok <- check_user_rate_limit(user),:ok <- check_password(user, password) do- login_dest = get_session(conn, :login_dest) || "/sites"+ login_dest = get_session(conn, :login_dest) || Routes.site_path(conn, :index)conn|> put_session(:current_user_id, user.id)@@ -463,7 +459,7 @@ defmodule PlausibleWeb.AuthController do{:ok, _user} ->conn|> put_flash(:success, "Account settings saved successfully")- |> redirect(to: "/settings")+ |> redirect(to: Routes.auth_path(conn, :user_settings)){:error, changeset} ->render(conn, "user_settings.html",diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 786dc1fba5..35ddcc97e5 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -86,7 +86,7 @@ defmodule PlausibleWeb.SiteController doconn|> put_session(site.domain <> "_offer_email_report", true)- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/snippet")+ |> redirect(to: Routes.site_path(conn, :add_snippet, site.domain)){:error, :site, changeset, _} ->render(conn, "new.html",@@ -142,7 +142,7 @@ defmodule PlausibleWeb.SiteController do{:ok, _} ->conn|> put_flash(:success, "Goal created successfully")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/goals")+ |> redirect(to: Routes.site_path(conn, :settings_goals, site.domain)){:error, changeset} ->conn@@ -160,11 +160,11 @@ defmodule PlausibleWeb.SiteController doconn|> put_flash(:success, "Goal deleted successfully")- |> redirect(to: "/#{URI.encode_www_form(website)}/settings/goals")+ |> redirect(to: Routes.site_path(conn, :settings_goals, website))enddef settings(conn, %{"website" => website}) do- redirect(conn, to: "/#{URI.encode_www_form(website)}/settings/general")+ redirect(conn, to: Routes.site_path(conn, :settings_general, website))enddef settings_general(conn, _params) do@@ -285,7 +285,7 @@ defmodule PlausibleWeb.SiteController doconn|> put_flash(:success, "Google integration saved successfully")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console")+ |> redirect(to: Routes.site_path(conn, :settings_search_console, site.domain))enddef delete_google_auth(conn, _params) do@@ -297,7 +297,7 @@ defmodule PlausibleWeb.SiteController doconn|> put_flash(:success, "Google account unlinked from Plausible")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console")+ |> redirect(to: Routes.site_path(conn, :settings_search_console, site.domain))enddef update_settings(conn, %{"site" => site_params}) do@@ -312,7 +312,7 @@ defmodule PlausibleWeb.SiteController doconn|> put_session(site_session_key, nil)|> put_flash(:success, "Your site settings have been saved")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")+ |> redirect(to: Routes.site_path(conn, :settings_general, site.domain)){:error, changeset} ->render(conn, "settings_general.html", site: site, changeset: changeset)@@ -347,7 +347,7 @@ defmodule PlausibleWeb.SiteController doconn|> put_flash(:success, "Stats for #{site.domain} are now public.")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")+ |> redirect(to: Routes.site_path(conn, :settings_visibility, site.domain))enddef make_private(conn, _params) do@@ -358,7 +358,7 @@ defmodule PlausibleWeb.SiteController doconn|> put_flash(:success, "Stats for #{site.domain} are now private.")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")+ |> redirect(to: Routes.site_path(conn, :settings_visibility, site.domain))enddef enable_weekly_report(conn, _params) dodiff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex b6e3f38499..15e0f49d3a 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -28,6 +28,20 @@ defmodule PlausibleWeb.AuthControllerTest doassert subject =~ "is your Plausible email verification code"end+ test "user is redirected to activate page after registration", %{conn: conn} do+ conn =+ post(conn, "/register",+ user: %{+ name: "Jane Doe",+ email: "[email protected]",+ password: "very-secret",+ password_confirmation: "very-secret"+ }+ )++ assert redirected_to(conn, 302) == "/activate"+ end+test "creates user record", %{conn: conn} dopost(conn, "/register",user: %{@@ -121,6 +135,23 @@ defmodule PlausibleWeb.AuthControllerTest doassert subject =~ "is your Plausible email verification code"end+ test "user is redirected to activate page after registration", %{+ conn: conn,+ invitation: invitation+ } do+ conn =+ post(conn, "/register/invitation/#{invitation.invitation_id}",+ user: %{+ name: "Jane Doe",+ email: "[email protected]",+ password: "very-secret",+ password_confirmation: "very-secret"+ }+ )++ assert redirected_to(conn, 302) == "/activate"+ end+test "creates user record", %{conn: conn, invitation: invitation} dopost(conn, "/register/invitation/#{invitation.invitation_id}",user: %{@@ -224,6 +255,12 @@ defmodule PlausibleWeb.AuthControllerTest doassert user_email == user.emailassert subject =~ "is your Plausible email verification code"end++ test "redirets user to /activate", %{conn: conn} do+ conn = post(conn, "/activate/request-code")++ assert redirected_to(conn, 302) == "/activate"+ endenddescribe "POST /activate" do@@ -266,6 +303,23 @@ defmodule PlausibleWeb.AuthControllerTest doassert redirected_to(conn) == "/sites/new"end+ test "redirects to /sites if user has invitation", %{conn: conn, user: user} do+ site = insert(:site)+ insert(:invitation, inviter: build(:user), site: site, email: user.email)+ Repo.update!(Plausible.Auth.User.changeset(user, %{email_verified: false}))+ post(conn, "/activate/request-code")++ code =+ Repo.one(+ from c in "email_verification_codes", where: c.user_id == ^user.id, select: c.code+ )+ |> Integer.to_string()++ conn = post(conn, "/activate", %{code: code})++ assert redirected_to(conn) == "/sites"+ end+test "removes the user association from the verification code", %{conn: conn, user: user} doRepo.update!(Plausible.Auth.User.changeset(user, %{email_verified: false}))post(conn, "/activate/request-code")@@ -396,6 +450,14 @@ defmodule PlausibleWeb.AuthControllerTest douser = Plausible.Repo.get(User, user.id)assert Password.match?("new-password", user.password_hash)end++ test "with valid token - redirects the user to login", %{conn: conn} do+ user = insert(:user)+ token = Token.sign_password_reset(user.email)+ conn = post(conn, "/password/reset", %{token: token, password: "new-password"})++ assert redirected_to(conn, 302) == "/login"+ endenddescribe "GET /settings" do@@ -437,6 +499,12 @@ defmodule PlausibleWeb.AuthControllerTest douser = Plausible.Repo.get(Plausible.Auth.User, user.id)assert user.name == "New name"end++ test "redirects user to /settings", %{conn: conn} do+ conn = put(conn, "/settings", %{"user" => %{"name" => "New name"}})++ assert redirected_to(conn, 302) == "/settings"+ endenddescribe "DELETE /me" dodiff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 474d5893db..ac4b96e8d1 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -300,14 +300,16 @@ defmodule PlausibleWeb.SiteControllerTest dosetup [:create_user, :log_in, :create_site]test "updates the timezone", %{conn: conn, site: site} do- put(conn, "/#{site.domain}/settings", %{- "site" => %{- "timezone" => "Europe/London"- }- })+ conn =+ put(conn, "/#{site.domain}/settings", %{+ "site" => %{+ "timezone" => "Europe/London"+ }+ })updated = Repo.get(Plausible.Site, site.id)assert updated.timezone == "Europe/London"+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/general"endend@@ -315,10 +317,11 @@ defmodule PlausibleWeb.SiteControllerTest dosetup [:create_user, :log_in, :create_site]test "makes the site public", %{conn: conn, site: site} do- post(conn, "/sites/#{site.domain}/make-public")+ conn = post(conn, "/sites/#{site.domain}/make-public")updated = Repo.get(Plausible.Site, site.id)assert updated.public+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/visibility"endend@@ -326,10 +329,11 @@ defmodule PlausibleWeb.SiteControllerTest dosetup [:create_user, :log_in, :create_site]test "makes the site private", %{conn: conn, site: site} do- post(conn, "/sites/#{site.domain}/make-private")+ conn = post(conn, "/sites/#{site.domain}/make-private")updated = Repo.get(Plausible.Site, site.id)refute updated.public+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/visibility"endend@@ -354,12 +358,14 @@ defmodule PlausibleWeb.SiteControllerTest dotest "updates google auth property", %{conn: conn, user: user, site: site} doinsert(:google_auth, user: user, site: site)- put(conn, "/#{site.domain}/settings/google", %{- "google_auth" => %{"property" => "some-new-property.com"}- })+ conn =+ put(conn, "/#{site.domain}/settings/google", %{+ "google_auth" => %{"property" => "some-new-property.com"}+ })updated_auth = Repo.one(Plausible.Site.GoogleAuth)assert updated_auth.property == "some-new-property.com"+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/search-console"endend@@ -368,9 +374,10 @@ defmodule PlausibleWeb.SiteControllerTest dotest "deletes associated google auth", %{conn: conn, user: user, site: site} doinsert(:google_auth, user: user, site: site)- delete(conn, "/#{site.domain}/settings/google")+ conn = delete(conn, "/#{site.domain}/settings/google")refute Repo.exists?(Plausible.Site.GoogleAuth)+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/search-console"endend@@ -388,31 +395,35 @@ defmodule PlausibleWeb.SiteControllerTest dosetup [:create_user, :log_in, :create_site]test "creates a pageview goal for the website", %{conn: conn, site: site} do- post(conn, "/#{site.domain}/goals", %{- goal: %{- page_path: "/success",- event_name: ""- }- })+ conn =+ post(conn, "/#{site.domain}/goals", %{+ goal: %{+ page_path: "/success",+ event_name: ""+ }+ })goal = Repo.one(Plausible.Goal)assert goal.page_path == "/success"assert goal.event_name == nil+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"endtest "creates a custom event goal for the website", %{conn: conn, site: site} do- post(conn, "/#{site.domain}/goals", %{- goal: %{- page_path: "",- event_name: "Signup"- }- })+ conn =+ post(conn, "/#{site.domain}/goals", %{+ goal: %{+ page_path: "",+ event_name: "Signup"+ }+ })goal = Repo.one(Plausible.Goal)assert goal.event_name == "Signup"assert goal.page_path == nil+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"endend@@ -422,9 +433,10 @@ defmodule PlausibleWeb.SiteControllerTest dotest "lists goals for the site", %{conn: conn, site: site} dogoal = insert(:goal, domain: site.domain, event_name: "Custom event")- delete(conn, "/#{site.domain}/goals/#{goal.id}")+ conn = delete(conn, "/#{site.domain}/goals/#{goal.id}")assert Repo.aggregate(Plausible.Goal, :count, :id) == 0+ assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"endend