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
CRM: allow forceful SSO domain deprovisioning + integration removal (#5539)
Adam Rutkowskice1bd2d4c497
diff --git a/extra/lib/plausible_web/live/customer_support/live/team.ex b/extra/lib/plausible_web/live/customer_support/live/team.exindex d86acd5ffa..35da3130a2 100644--- a/extra/lib/plausible_web/live/customer_support/live/team.ex+++ b/extra/lib/plausible_web/live/customer_support/live/team.ex@@ -99,9 +99,8 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do)}end- def update(%{tab: "members"}, %{assigns: %{team: team}} = socket) do- team_layout = Layout.init(team)- {:ok, assign(socket, team_layout: team_layout, tab: "members")}+ def update(%{tab: "members"}, socket) do+ {:ok, refresh_members(socket)}enddef update(_, socket) do@@ -239,14 +238,27 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do</div><div :if={@tab == "sso"} class="mt-4 mb-4 text-gray-900 dark:text-gray-400">- <p :if={@sso_integration} class="mb-4">- Configured?: <code>{SSO.Integration.configured?(@sso_integration)}</code>- <br /> IDP Signin URL:- <code>- {@sso_integration.config.idp_signin_url}- </code>- <br />IDP Entity ID: <code>{@sso_integration.config.idp_entity_id}</code>- </p>+ <div :if={@sso_integration} class="flex gap-x-8 mb-4 justify-between items-start">+ <p>+ Configured?: <code>{SSO.Integration.configured?(@sso_integration)}</code>+ <br /> IDP Signin URL:+ <code>+ {@sso_integration.config.idp_signin_url}+ </code>+ <br />IDP Entity ID: <code>{@sso_integration.config.idp_entity_id}</code>+ </p>+ <div class="ml-auto">+ <.button+ data-confirm="Are you sure you want to remove this SSO team integration, including all its domains and users?"+ id="remove-sso-integration"+ phx-click="remove-sso-integration"+ phx-target={@myself}+ theme="danger"+ >+ Remove Integration+ </.button>+ </div>+ </div><.table:if={not Enum.empty?(@sso_integration.sso_domains)}rows={@sso_integration.sso_domains}@@ -271,13 +283,12 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do</.td><.td actions><.delete_button- :if={can_delete?(sso_domain)}- id={"remove-domain-#{sso_domain.identifier}"}- phx-click="remove-domain"+ id={"remove-sso-domain-#{sso_domain.identifier}"}+ phx-click="remove-sso-domain"phx-value-identifier={sso_domain.identifier}phx-target={@myself}class="text-sm text-red-600"- data-confirm={"Are you sure you want to remove domain '#{sso_domain.domain}'?"}+ data-confirm={"Are you sure you want to remove domain '#{sso_domain.domain}'? All SSO users will be deprovisioned and logged out."}/></.td></:tbody>@@ -540,6 +551,7 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do<.table rows={Layout.sorted_for_display(@team_layout)}><:thead><.th>User</.th>+ <.th>Sessions</.th><.th>Type</.th><.th>Role</.th></:thead>@@ -569,14 +581,17 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do{member.name} <{member.email}></div></.td>+ <.td>+ {@session_counts[member.meta.user.id] || 0}+ </.td><.td><div class="flex items-center gap-x-1"><span :if={member.meta.user.type == :sso}>SSO </span>{member.type}<.delete_button:if={member.meta.user.type == :sso}- id={"deprovision-user-#{member.id}"}- phx-click="deprovision-user"+ id={"deprovision-sso-user-#{member.id}"}+ phx-click="deprovision-sso-user"phx-value-identifier={member.id}phx-target={@myself}class="text-sm"@@ -655,9 +670,32 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doendend- def handle_event("remove-domain", %{"identifier" => i}, socket) do+ def handle_event("remove-sso-integration", _, socket) do+ :ok = SSO.remove_integration(socket.assigns.sso_integration, force_deprovision?: true)++ socket =+ socket+ |> assign(sso_integration: nil)+ |> put_flash(:success, "SSO integration removed")+ |> refresh_members()+ |> push_navigate(+ to:+ Routes.customer_support_resource_path(+ socket,+ :details,+ :teams,+ :team,+ socket.assigns.team.id+ )+ )++ {:noreply, socket}+ end++ def handle_event("remove-sso-domain", %{"identifier" => i}, socket) dodomain = Enum.find(socket.assigns.sso_integration.sso_domains, &(&1.identifier == i))- SSO.Domains.remove(domain)+ :ok = SSO.Domains.remove(domain, force_deprovision?: true)+ socket = socket |> success("SSO domain removed") |> refresh_members(){:noreply, assign(socket, sso_integration: get_sso_integration(socket.assigns.team))}end@@ -694,14 +732,13 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team doendend- def handle_event("deprovision-user", %{"identifier" => user_id}, socket) do+ def handle_event("deprovision-sso-user", %{"identifier" => user_id}, socket) do[id: String.to_integer(user_id)]|> Plausible.Auth.find_user_by()|> SSO.deprovision_user!()- team_layout = Layout.init(socket.assigns.team)- success(socket, "User deprovisioned")- {:noreply, assign(socket, team_layout: team_layout)}+ socket = socket |> success("SSO user deprovisioned") |> refresh_members()+ {:noreply, socket}enddef handle_event("estimate-cost", %{"enterprise_plan" => params}, socket) do@@ -1037,14 +1074,22 @@ defmodule PlausibleWeb.CustomerSupport.Live.Team do"""end- defp can_delete?(sso_domain) do- Plausible.Auth.SSO.Domains.check_can_remove(sso_domain) == :ok- end-defp get_sso_integration(team) docase SSO.get_integration_for(team) do{:error, :not_found} -> nil{:ok, integration} -> integrationendend++ defp refresh_members(socket) do+ team_layout = Layout.init(socket.assigns.team)++ session_counts =+ team_layout+ |> Enum.map(fn {_, entry} -> entry.meta.user end)+ |> Plausible.Auth.UserSessions.count_for_users()+ |> Enum.into(%{})++ assign(socket, team_layout: team_layout, session_counts: session_counts, tab: "members")+ endenddiff --git a/lib/plausible/auth/user_sessions.ex b/lib/plausible/auth/user_sessions.exindex 76185c2baf..5658843d93 100644--- a/lib/plausible/auth/user_sessions.ex+++ b/lib/plausible/auth/user_sessions.ex@@ -21,6 +21,19 @@ defmodule Plausible.Auth.UserSessions do)end+ @spec count_for_users([Auth.User.t()], NaiveDateTime.t()) :: list()+ def count_for_users(users, now \\ NaiveDateTime.utc_now(:second)) when is_list(users) do+ Repo.all(+ from(us in Auth.UserSession,+ where: us.user_id in ^Enum.map(users, & &1.id),+ where: us.timeout_at >= ^now,+ group_by: us.user_id,+ select: {us.user_id, count(us.id)},+ order_by: [asc: us.user_id]+ )+ )+ end+on_ee doalias Plausible.Teamsdiff --git a/test/plausible/auth/user_sessions_test.exs b/test/plausible/auth/user_sessions_test.exsindex 000521a524..55095fef8b 100644--- a/test/plausible/auth/user_sessions_test.exs+++ b/test/plausible/auth/user_sessions_test.exs@@ -33,6 +33,23 @@ defmodule Plausible.Auth.UserSessionsTest doendend+ describe "count_for_users/2" do+ test "counts user sessions" do+ now = NaiveDateTime.utc_now(:second)+ thirty_minutes_ago = NaiveDateTime.shift(now, minute: -30)++ u1 = insert(:user)+ u2 = insert(:user)+ u3 = insert(:user)++ insert_session(u1, "Recent Device", thirty_minutes_ago)+ insert_session(u1, "Recent Device 2", thirty_minutes_ago)+ insert_session(u2, "Recent Device", thirty_minutes_ago)++ assert UserSessions.count_for_users([u1, u2, u3], now) == [{u1.id, 2}, {u2.id, 1}]+ end+ end+on_ee dodescribe "list_for_sso_team/1,2" dotest "lists only SSO member sessions for a given team" dodiff --git a/test/plausible_web/live/customer_support/teams_test.exs b/test/plausible_web/live/customer_support/teams_test.exsindex f547ce64b8..e2372f6f3f 100644--- a/test/plausible_web/live/customer_support/teams_test.exs+++ b/test/plausible_web/live/customer_support/teams_test.exs@@ -570,7 +570,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest do{:ok, domain} = SSO.Domains.add(integration, "sso1.example.com"){:ok, lv, _html} = live(conn, open_team(team.id, tab: :sso))- lv |> element("button#remove-domain-#{domain.identifier}") |> render_click()+ lv |> element("button#remove-sso-domain-#{domain.identifier}") |> render_click()refute render(lv) =~ "sso1.example.com"end@@ -597,10 +597,23 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest dohtml = render(lv)assert text(html) =~ "SSO membership"- lv |> element("#deprovision-user-#{user.id}") |> render_click()+ lv |> element("#deprovision-sso-user-#{user.id}") |> render_click()assert Plausible.Repo.reload!(user).type == :standardend++ test "removing integration", %{conn: conn, user: user} do+ team = team_of(user)++ SSO.initiate_saml_integration(team)++ {:ok, lv, _html} = live(conn, open_team(team.id, tab: :sso))++ assert {:error, {:live_redirect, %{to: to}}} =+ lv |> element("button#remove-sso-integration") |> render_click()++ assert to == "/cs/teams/team/#{team.id}"+ endendendend