diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 7a8c531a6..f81c19c41 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -128,6 +128,18 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#google-auth") end + def delete_google_auth(conn, %{"website" => website}) do + site = + Sites.get_for_user!(conn.assigns[:current_user].id, website) + |> Repo.preload(:google_auth) + + Repo.delete!(site.google_auth) + + conn + |> put_flash(:success, "Google account unlinked succesfully") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#google-auth") + end + def update_settings(conn, %{"website" => website, "site" => site_params}) do site = Sites.get_for_user!(conn.assigns[:current_user].id, website) changeset = site |> Plausible.Site.changeset(site_params) diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index c399e16e2..b170f1b45 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -151,6 +151,7 @@ defmodule PlausibleWeb.Router do delete "/:website/goals/:id", SiteController, :delete_goal put "/:website/settings", SiteController, :update_settings put "/:website/settings/google", SiteController, :update_google_auth + delete "/:website/settings/google", SiteController, :delete_google_auth delete "/:website", SiteController, :delete_site get "/share/:slug", StatsController, :shared_link diff --git a/lib/plausible_web/templates/site/settings.html.eex b/lib/plausible_web/templates/site/settings.html.eex index 0eb1125b8..65df0989c 100644 --- a/lib/plausible_web/templates/site/settings.html.eex +++ b/lib/plausible_web/templates/site/settings.html.eex @@ -104,7 +104,9 @@ <%= if @site.google_auth do %>
- Connected Google account: <%= @site.google_auth.email %> + Linked Google account: <%= @site.google_auth.email %> + + <%= link("Unlink Google account", to: "/#{URI.encode_www_form(@site.domain)}/settings/google", class: "inline-block mt-4 px-4 py-2 border border-gray-300 text-sm leading-5 font-medium rounded-md text-red-700 bg-white hover:text-red-500 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:text-red-800 active:bg-gray-50 transition ease-in-out duration-150", method: "delete") %> <%= if @site.google_auth.property && !(@site.google_auth.property in @search_console_domains) do %>

@@ -112,7 +114,7 @@

<% else %>

- Select the Google Search Console property you would like to pull keyword data from. If you don't see your domain, <%= link("set it up and verify", to: "https://docs.#{base_domain()}/google-search-console-integration#1-add-your-site-on-the-search-console", class: "text-indigo-500") %> on Search Console first. + Select the Google Search Console property you would like to pull keyword data from. If you don't see your domain, <%= link("set it up and verify", to: "https://docs.#{base_domain()}/google-search-console-integration", class: "text-indigo-500") %> on Search Console first.

<% end %> diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs index eeda8fc22..4fd689816 100644 --- a/test/plausible_web/controllers/site_controller_test.exs +++ b/test/plausible_web/controllers/site_controller_test.exs @@ -147,6 +147,29 @@ defmodule PlausibleWeb.SiteControllerTest do end end + describe "PUT /:website/settings/google" do + setup [:create_user, :log_in, :create_site] + + test "updates google auth property", %{conn: conn, user: user, site: site} do + insert(:google_auth, user: user, site: site) + 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" + end + end + + describe "DELETE /:website/settings/google" do + setup [:create_user, :log_in, :create_site] + + test "deletes associated google auth", %{conn: conn, user: user, site: site} do + insert(:google_auth, user: user, site: site) + delete(conn, "/#{site.domain}/settings/google") + + refute Repo.exists?(Plausible.Site.GoogleAuth) + end + end + describe "GET /:website/goals/new" do setup [:create_user, :log_in, :create_site]