diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index 5581c088e..932f55adb 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -73,17 +73,22 @@ defmodule Plausible.Billing do end end - def needs_to_upgrade?(%Plausible.Auth.User{trial_expiry_date: nil}), do: {true, :no_trial} + @spec check_needs_to_upgrade(Plausible.Auth.User.t()) :: + {:needs_to_upgrade, :no_trial | :no_active_subscription | :grace_period_ended} + | :no_upgrade_needed + def check_needs_to_upgrade(%Plausible.Auth.User{trial_expiry_date: nil}) do + {:needs_to_upgrade, :no_trial} + end - def needs_to_upgrade?(user) do + def check_needs_to_upgrade(user) do user = Plausible.Users.with_subscription(user) trial_is_over = Timex.before?(user.trial_expiry_date, Timex.today()) subscription_active = subscription_is_active?(user.subscription) cond do - trial_is_over && !subscription_active -> {true, :no_active_subscription} - Plausible.Auth.GracePeriod.expired?(user) -> {true, :grace_period_ended} - true -> false + trial_is_over && !subscription_active -> {:needs_to_upgrade, :no_active_subscription} + Plausible.Auth.GracePeriod.expired?(user) -> {:needs_to_upgrade, :grace_period_ended} + true -> :no_upgrade_needed end end @@ -260,34 +265,14 @@ defmodule Plausible.Billing do end end - defp check_lock_status(user) do - Plausible.Billing.SiteLocker.check_sites_for(user) - user - end - - defp maybe_adjust_api_key_limits(user) do - plan = - Repo.get_by(Plausible.Billing.EnterprisePlan, - user_id: user.id, - paddle_plan_id: user.subscription.paddle_plan_id - ) - - if plan do - user_id = user.id - api_keys = from(key in Plausible.Auth.ApiKey, where: key.user_id == ^user_id) - Repo.update_all(api_keys, set: [hourly_request_limit: plan.hourly_api_request_limit]) - end - - user - end - def paddle_api(), do: Application.fetch_env!(:plausible, :paddle_api) defp active_subscription_query(user_id) do - from s in Subscription, + from(s in Subscription, where: s.user_id == ^user_id and s.status == "active", order_by: [desc: s.inserted_at], limit: 1 + ) end defp after_subscription_update(subscription) do @@ -298,7 +283,23 @@ defmodule Plausible.Billing do user |> maybe_remove_grace_period() - |> check_lock_status() + |> tap(&Plausible.Billing.SiteLocker.update_sites_for/1) |> maybe_adjust_api_key_limits() end + + defp maybe_adjust_api_key_limits(user) do + plan = + Repo.get_by(Plausible.Billing.EnterprisePlan, + user_id: user.id, + paddle_plan_id: user.subscription.paddle_plan_id + ) + + if plan do + user_id = user.id + api_keys = from(key in Plausible.Auth.ApiKey, where: key.user_id == ^user_id) + Repo.update_all(api_keys, set: [hourly_request_limit: plan.hourly_api_request_limit]) + end + + user + end end diff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.ex index 1cec2e836..cb4802287 100644 --- a/lib/plausible/billing/site_locker.ex +++ b/lib/plausible/billing/site_locker.ex @@ -1,33 +1,58 @@ defmodule Plausible.Billing.SiteLocker do use Plausible.Repo - def check_sites_for(user) do + @type update_opt() :: {:send_email?, boolean()} + + @type lock_reason() :: + :grace_period_ended_now + | :grace_period_ended_already + | :no_trial + | :no_active_subscription + + @spec update_sites_for(Plausible.Auth.User.t(), [update_opt()]) :: + {:locked, lock_reason()} | :unlocked + def update_sites_for(user, opts \\ []) do + send_email? = Keyword.get(opts, :send_email?, true) + user = Plausible.Users.with_subscription(user) - case Plausible.Billing.needs_to_upgrade?(user) do - {true, :grace_period_ended} -> + case Plausible.Billing.check_needs_to_upgrade(user) do + {:needs_to_upgrade, :grace_period_ended} -> set_lock_status_for(user, true) - if !user.grace_period.is_over do - send_grace_period_end_email(user) - Plausible.Auth.GracePeriod.end_changeset(user) |> Repo.update() + if user.grace_period.is_over != true do + user + |> Plausible.Auth.GracePeriod.end_changeset() + |> Repo.update!() + + if send_email? do + send_grace_period_end_email(user) + end + + {:locked, :grace_period_ended_now} + else + {:locked, :grace_period_ended_already} end - {true, _} -> + {:needs_to_upgrade, reason} -> set_lock_status_for(user, true) + {:locked, reason} - _ -> + :no_upgrade_needed -> set_lock_status_for(user, false) + :unlocked end end + @spec set_lock_status_for(Plausible.Auth.User.t(), boolean()) :: {:ok, non_neg_integer()} def set_lock_status_for(user, status) do site_ids = Repo.all( - from s in Plausible.Site.Membership, + from(s in Plausible.Site.Membership, where: s.user_id == ^user.id, where: s.role == :owner, select: s.site_id + ) ) site_q = @@ -36,10 +61,14 @@ defmodule Plausible.Billing.SiteLocker do where: s.id in ^site_ids ) - Repo.update_all(site_q, set: [locked: status]) + {num_updated, _} = Repo.update_all(site_q, set: [locked: status]) + + {:ok, num_updated} end - defp send_grace_period_end_email(user) do + @spec send_grace_period_end_email(Plausible.Auth.User.t()) :: Plausible.Mailer.result() + def send_grace_period_end_email(user) do + user = Repo.preload(user, :subscription) {_, last_cycle} = Plausible.Billing.last_two_billing_cycles(user) {_, last_cycle_usage} = Plausible.Billing.last_two_billing_months_usage(user) suggested_plan = Plausible.Billing.Plans.suggest(user, last_cycle_usage) diff --git a/lib/plausible/mailer.ex b/lib/plausible/mailer.ex index c63ab3059..f7c6acb0c 100644 --- a/lib/plausible/mailer.ex +++ b/lib/plausible/mailer.ex @@ -2,7 +2,9 @@ defmodule Plausible.Mailer do use Bamboo.Mailer, otp_app: :plausible require Logger - @spec send(Bamboo.Email.t()) :: :ok | {:error, :hard_bounce} | {:error, :unknown_error} + @type result() :: :ok | {:error, :hard_bounce} | {:error, :unknown_error} + + @spec send(Bamboo.Email.t()) :: result() def send(email) do case deliver_now(email) do {:ok, _email} -> :ok diff --git a/lib/plausible/site/membership.ex b/lib/plausible/site/membership.ex index 52e7c94e8..6e663faf5 100644 --- a/lib/plausible/site/membership.ex +++ b/lib/plausible/site/membership.ex @@ -2,6 +2,8 @@ defmodule Plausible.Site.Membership do use Ecto.Schema import Ecto.Changeset + @type t() :: %__MODULE__{} + schema "site_memberships" do field :role, Ecto.Enum, values: [:owner, :admin, :viewer] belongs_to :site, Plausible.Site @@ -10,9 +12,15 @@ defmodule Plausible.Site.Membership do timestamps() end - def changeset(schema, attrs) do - schema - |> cast(attrs, [:user_id, :site_id, :role]) - |> validate_required([:user_id, :site_id]) + def new(site, user) do + %__MODULE__{} + |> change() + |> put_assoc(:site, site) + |> put_assoc(:user, user) + end + + def set_role(changeset, role) do + changeset + |> cast(%{role: role}, [:role]) end end diff --git a/lib/plausible/site/memberships.ex b/lib/plausible/site/memberships.ex new file mode 100644 index 000000000..71dc272d1 --- /dev/null +++ b/lib/plausible/site/memberships.ex @@ -0,0 +1,11 @@ +defmodule Plausible.Site.Memberships do + @moduledoc """ + API for site memberships and invitations + """ + + alias Plausible.Site.Memberships + + defdelegate accept_invitation(invitation_id, user), to: Memberships.AcceptInvitation + defdelegate reject_invitation(invitation_id, user), to: Memberships.RejectInvitation + defdelegate remove_invitation(invitation_id, site), to: Memberships.RemoveInvitation +end diff --git a/lib/plausible/site/memberships/accept_invitation.ex b/lib/plausible/site/memberships/accept_invitation.ex new file mode 100644 index 000000000..95043cd8f --- /dev/null +++ b/lib/plausible/site/memberships/accept_invitation.ex @@ -0,0 +1,163 @@ +defmodule Plausible.Site.Memberships.AcceptInvitation do + @moduledoc """ + Service for accepting invitations, including ownership transfers. + + Accepting invitation accounts for the fact that it's possible + that accepting user has an existing membership for the site and + acts permissively to not unnecessarily disrupt the flow while + also maintaining integrity of site memberships. This also applies + to cases where users update their email address between issuing + the invitation and accepting it. + """ + + import Ecto.Query, only: [from: 2] + + alias Ecto.Multi + alias Plausible.Auth + alias Plausible.Billing + alias Plausible.Memberships.Invitations + alias Plausible.Repo + alias Plausible.Site + alias Plausible.Site.Memberships.Invitations + + require Logger + + @spec accept_invitation(String.t(), Auth.User.t(), Keyword.t()) :: + {:ok, Site.Membership.t()} | {:error, :invitation_not_found | Ecto.Changeset.t()} + def accept_invitation(invitation_id, user, opts \\ []) do + selfhost? = Keyword.get(opts, :selfhost?, Plausible.Release.selfhost?()) + + with {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) do + membership = get_or_create_membership(invitation, user) + + multi = + if invitation.role == :owner do + add_and_transfer_ownership(invitation, membership, user, selfhost?) + else + add(invitation, membership, user) + end + + case Repo.transaction(multi) do + {:ok, changes} -> + if changes[:site_locker] == {:locked, :grace_period_ended_now} do + Billing.SiteLocker.send_grace_period_end_email(changes.user) + end + + notify_invitation_accepted(invitation) + + membership = Repo.preload(changes.membership, [:site, :user]) + + {:ok, membership} + + {:error, _operation, error, _changes} -> + {:error, error} + end + end + end + + defp add_and_transfer_ownership(invitation, membership, user, selfhost?) do + multi = + Multi.new() + |> downgrade_previous_owner(invitation.site, user) + |> maybe_end_trial_of_new_owner(user, selfhost?) + |> Multi.insert_or_update(:membership, membership) + |> Multi.delete(:invitation, invitation) + + if selfhost? do + multi + else + Multi.run(multi, :site_locker, fn _, %{user: updated_user} -> + {:ok, Billing.SiteLocker.update_sites_for(updated_user, send_email?: false)} + end) + end + end + + # If there's an existing membership, we DO NOT change the role + # to avoid accidental role downgrade. + defp add(invitation, membership, _user) do + if membership.data.id do + Multi.new() + |> Multi.put(:membership, membership.data) + |> Multi.delete(:invitation, invitation) + else + Multi.new() + |> Multi.insert(:membership, membership) + |> Multi.delete(:invitation, invitation) + end + end + + defp get_or_create_membership(invitation, user) do + case Repo.get_by(Site.Membership, user_id: user.id, site_id: invitation.site.id) do + nil -> Site.Membership.new(invitation.site, user) + membership -> membership + end + |> Site.Membership.set_role(invitation.role) + end + + # If the new owner is the same as old owner, we do not downgrade them + # to avoid leaving site without an owner! + defp downgrade_previous_owner(multi, site, new_owner) do + new_owner_id = new_owner.id + + previous_owner = + Repo.one( + from( + sm in Site.Membership, + where: sm.site_id == ^site.id, + where: sm.role == :owner + ) + ) + + case previous_owner do + %{user_id: ^new_owner_id} -> + Multi.put(multi, :previous_owner_membership, previous_owner) + + nil -> + Logger.warn( + "Transferring ownership from a site with no owner: #{site.domain} " <> + ", new owner ID: #{new_owner_id}" + ) + + Multi.put(multi, :previous_owner_membership, nil) + + previous_owner -> + Multi.update( + multi, + :previous_owner_membership, + Site.Membership.set_role(previous_owner, :admin) + ) + end + end + + # If the new owner is the same as the old owner, it's a no-op + defp maybe_end_trial_of_new_owner(multi, new_owner, selfhost?) do + new_owner_id = new_owner.id + + cond do + selfhost? -> + Multi.put(multi, :user, new_owner) + + Billing.on_trial?(new_owner) or is_nil(new_owner.trial_expiry_date) -> + Multi.update(multi, :user, fn + %{previous_owner_membership: %{user_id: ^new_owner_id}} -> + Ecto.Changeset.change(new_owner) + + _ -> + Auth.User.end_trial(new_owner) + end) + + true -> + Multi.put(multi, :user, new_owner) + end + end + + defp notify_invitation_accepted(%Auth.Invitation{role: :owner} = invitation) do + PlausibleWeb.Email.ownership_transfer_accepted(invitation) + |> Plausible.Mailer.send() + end + + defp notify_invitation_accepted(invitation) do + PlausibleWeb.Email.invitation_accepted(invitation) + |> Plausible.Mailer.send() + end +end diff --git a/lib/plausible/site/memberships/invitations.ex b/lib/plausible/site/memberships/invitations.ex new file mode 100644 index 000000000..f51e5beb9 --- /dev/null +++ b/lib/plausible/site/memberships/invitations.ex @@ -0,0 +1,45 @@ +defmodule Plausible.Site.Memberships.Invitations do + @moduledoc false + + import Ecto.Query, only: [from: 2] + + alias Plausible.Auth + alias Plausible.Repo + + @spec find_for_user(String.t(), Auth.User.t()) :: + {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found} + def find_for_user(invitation_id, user) do + invitation = + Auth.Invitation + |> Repo.get_by(invitation_id: invitation_id, email: user.email) + |> Repo.preload([:site, :inviter]) + + if invitation do + {:ok, invitation} + else + {:error, :invitation_not_found} + end + end + + @spec find_for_site(String.t(), Plausible.Site.t()) :: + {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found} + def find_for_site(invitation_id, site) do + invitation = + Auth.Invitation + |> Repo.get_by(invitation_id: invitation_id, site_id: site.id) + |> Repo.preload([:site, :inviter]) + + if invitation do + {:ok, invitation} + else + {:error, :invitation_not_found} + end + end + + @spec delete_invitation(Auth.Invitation.t()) :: :ok + def delete_invitation(invitation) do + Repo.delete_all(from(i in Auth.Invitation, where: i.id == ^invitation.id)) + + :ok + end +end diff --git a/lib/plausible/site/memberships/reject_invitation.ex b/lib/plausible/site/memberships/reject_invitation.ex new file mode 100644 index 000000000..40b1a1e2b --- /dev/null +++ b/lib/plausible/site/memberships/reject_invitation.ex @@ -0,0 +1,29 @@ +defmodule Plausible.Site.Memberships.RejectInvitation do + @moduledoc """ + Service for rejecting invitations. + """ + + alias Plausible.Auth + alias Plausible.Site.Memberships.Invitations + + @spec reject_invitation(String.t(), Auth.User.t()) :: + {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found} + def reject_invitation(invitation_id, user) do + with {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) do + Invitations.delete_invitation(invitation) + notify_invitation_rejected(invitation) + + {:ok, invitation} + end + end + + defp notify_invitation_rejected(%Auth.Invitation{role: :owner} = invitation) do + PlausibleWeb.Email.ownership_transfer_rejected(invitation) + |> Plausible.Mailer.send() + end + + defp notify_invitation_rejected(invitation) do + PlausibleWeb.Email.invitation_rejected(invitation) + |> Plausible.Mailer.send() + end +end diff --git a/lib/plausible/site/memberships/remove_invitation.ex b/lib/plausible/site/memberships/remove_invitation.ex new file mode 100644 index 000000000..abb650fe7 --- /dev/null +++ b/lib/plausible/site/memberships/remove_invitation.ex @@ -0,0 +1,18 @@ +defmodule Plausible.Site.Memberships.RemoveInvitation do + @moduledoc """ + Service for removing invitations. + """ + + alias Plausible.Auth + alias Plausible.Site.Memberships.Invitations + + @spec remove_invitation(String.t(), Plausible.Site.t()) :: + {:ok, Auth.Invitation.t()} | {:error, :invitation_not_found} + def remove_invitation(invitation_id, site) do + with {:ok, invitation} <- Invitations.find_for_site(invitation_id, site) do + Invitations.delete_invitation(invitation) + + {:ok, invitation} + end + end +end diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 1823df2ba..ee10cca76 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -6,6 +6,7 @@ defmodule Plausible.Sites do @type invite_error() :: Ecto.Changeset.t() | :already_a_member + | :transfer_to_self | {:over_limit, non_neg_integer()} | :forbidden @@ -28,14 +29,8 @@ defmodule Plausible.Sites do if Quota.within_limit?(usage, limit), do: {:ok, usage}, else: {:error, limit} end) |> Ecto.Multi.insert(:site, site_changeset) - |> Ecto.Multi.run(:site_membership, fn repo, %{site: site} -> - membership_changeset = - Site.Membership.changeset(%Site.Membership{}, %{ - site_id: site.id, - user_id: user.id - }) - - repo.insert(membership_changeset) + |> Ecto.Multi.insert(:site_membership, fn %{site: site} -> + Site.Membership.new(site, user) end) |> maybe_start_trial(user) |> Repo.transaction() @@ -91,6 +86,7 @@ defmodule Plausible.Sites do with :ok <- check_invitation_permissions(site, inviter, role, opts), :ok <- check_team_member_limit(site, role), invitee <- Plausible.Auth.find_user_by(email: invitee_email), + :ok <- ensure_transfer_valid(site, invitee, role), :ok <- ensure_new_membership(site, invitee, role), %Ecto.Changeset{} = changeset <- Plausible.Auth.Invitation.new(attrs), {:ok, invitation} <- Repo.insert(changeset) do @@ -131,6 +127,18 @@ defmodule Plausible.Sites do Plausible.Mailer.send(email) end + defp ensure_transfer_valid(site, invitee, :owner) do + if invitee && role(invitee.id, site) == :owner do + {:error, :transfer_to_self} + else + :ok + end + end + + defp ensure_transfer_valid(_site, _invitee, _role) do + :ok + end + defp ensure_new_membership(_site, _invitee, :owner) do :ok end diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex index 26435f0ff..b8a1934a9 100644 --- a/lib/plausible_web/controllers/invitation_controller.ex +++ b/lib/plausible_web/controllers/invitation_controller.ex @@ -1,136 +1,54 @@ defmodule PlausibleWeb.InvitationController do use PlausibleWeb, :controller - use Plausible.Repo - alias Ecto.Multi - alias Plausible.Auth.Invitation - alias Plausible.Site.Membership plug PlausibleWeb.RequireAccountPlug - @require_owner [:remove_invitation] - - plug PlausibleWeb.AuthorizeSiteAccess, - [:owner, :admin] when action in @require_owner + plug PlausibleWeb.AuthorizeSiteAccess, [:owner, :admin] when action in [:remove_invitation] def accept_invitation(conn, %{"invitation_id" => invitation_id}) do - invitation = - Repo.get_by(Invitation, invitation_id: invitation_id) - |> Repo.preload([:site, :inviter]) - - if invitation do - user = conn.assigns[:current_user] - existing_membership = Repo.get_by(Membership, user_id: user.id, site_id: invitation.site.id) - - multi = - if invitation.role == :owner do - Multi.new() - |> downgrade_previous_owner(invitation.site) - |> maybe_end_trial_of_new_owner(user) - else - Multi.new() - end - - membership_changeset = - (existing_membership || - %Membership{user_id: user.id, site_id: invitation.site.id}) - |> Membership.changeset(%{role: invitation.role}) - - multi = - multi - |> Multi.insert_or_update(:membership, membership_changeset) - |> Multi.delete(:invitation, invitation) - - case Repo.transaction(multi) do - {:ok, changes} -> - updated_user = Map.get(changes, :user, user) - notify_invitation_accepted(invitation) - Plausible.Billing.SiteLocker.check_sites_for(updated_user) - - conn - |> put_flash(:success, "You now have access to #{invitation.site.domain}") - |> redirect(to: "/#{URI.encode_www_form(invitation.site.domain)}") - - {:error, _operation, _value, _changes} -> - conn - |> put_flash(:error, "Something went wrong, please try again") - |> redirect(to: "/sites") - end - else - conn - |> put_flash(:error, "Invitation missing or already accepted") - |> redirect(to: "/sites") - end - end - - defp downgrade_previous_owner(multi, site) do - prev_owner = - from( - sm in Plausible.Site.Membership, - where: sm.site_id == ^site.id, - where: sm.role == :owner - ) - - Multi.update_all(multi, :prev_owner, prev_owner, set: [role: :admin]) - end - - defp maybe_end_trial_of_new_owner(multi, new_owner) do - if Application.get_env(:plausible, :is_selfhost) do - multi - else - end_trial_of_new_owner(multi, new_owner) - end - end - - defp end_trial_of_new_owner(multi, new_owner) do - if Plausible.Billing.on_trial?(new_owner) || is_nil(new_owner.trial_expiry_date) do - Ecto.Multi.update(multi, :user, Plausible.Auth.User.end_trial(new_owner)) - else - multi + case Plausible.Site.Memberships.accept_invitation(invitation_id, conn.assigns.current_user) do + {:ok, membership} -> + conn + |> put_flash(:success, "You now have access to #{membership.site.domain}") + |> redirect(to: "/#{URI.encode_www_form(membership.site.domain)}") + + {:error, :invitation_not_found} -> + conn + |> put_flash(:error, "Invitation missing or already accepted") + |> redirect(to: "/sites") + + {:error, _} -> + conn + |> put_flash(:error, "Something went wrong, please try again") + |> redirect(to: "/sites") end end def reject_invitation(conn, %{"invitation_id" => invitation_id}) do - invitation = - Repo.get_by!(Invitation, invitation_id: invitation_id) - |> Repo.preload([:site, :inviter]) - - Repo.delete!(invitation) - notify_invitation_rejected(invitation) - - conn - |> put_flash(:success, "You have rejected the invitation to #{invitation.site.domain}") - |> redirect(to: "/sites") - end - - defp notify_invitation_accepted(%Invitation{role: :owner} = invitation) do - PlausibleWeb.Email.ownership_transfer_accepted(invitation) - |> Plausible.Mailer.send() - end - - defp notify_invitation_accepted(invitation) do - PlausibleWeb.Email.invitation_accepted(invitation) - |> Plausible.Mailer.send() - end - - defp notify_invitation_rejected(%Invitation{role: :owner} = invitation) do - PlausibleWeb.Email.ownership_transfer_rejected(invitation) - |> Plausible.Mailer.send() - end - - defp notify_invitation_rejected(invitation) do - PlausibleWeb.Email.invitation_rejected(invitation) - |> Plausible.Mailer.send() + case Plausible.Site.Memberships.reject_invitation(invitation_id, conn.assigns.current_user) do + {:ok, invitation} -> + conn + |> put_flash(:success, "You have rejected the invitation to #{invitation.site.domain}") + |> redirect(to: "/sites") + + {:error, :invitation_not_found} -> + conn + |> put_flash(:error, "Invitation missing or already accepted") + |> redirect(to: "/sites") + end end def remove_invitation(conn, %{"invitation_id" => invitation_id}) do - invitation = - Repo.get_by!(Invitation, invitation_id: invitation_id, site_id: conn.assigns[:site].id) - |> Repo.preload(:site) - - Repo.delete!(invitation) - - conn - |> put_flash(:success, "You have removed the invitation for #{invitation.email}") - |> redirect(to: Routes.site_path(conn, :settings_people, invitation.site.domain)) + case Plausible.Site.Memberships.remove_invitation(invitation_id, conn.assigns.site) do + {:ok, invitation} -> + conn + |> put_flash(:success, "You have removed the invitation for #{invitation.email}") + |> redirect(to: Routes.site_path(conn, :settings_people, invitation.site.domain)) + + {:error, :invitation_not_found} -> + conn + |> put_flash(:error, "Invitation missing or already removed") + |> redirect(to: Routes.site_path(conn, :settings_people, conn.assigns.site.domain)) + end end end diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.ex index b90785942..c6004cbf1 100644 --- a/lib/plausible_web/controllers/site/membership_controller.ex +++ b/lib/plausible_web/controllers/site/membership_controller.ex @@ -104,6 +104,13 @@ defmodule PlausibleWeb.Site.MembershipController do |> put_flash(:success, "Site transfer request has been sent to #{email}") |> redirect(to: Routes.site_path(conn, :settings_people, site.domain)) + {:error, :transfer_to_self} -> + conn + |> put_flash(:ttl, :timer.seconds(5)) + |> put_flash(:error_title, "Transfer error") + |> put_flash(:error, "Can't transfer ownership to existing owner") + |> redirect(to: Routes.site_path(conn, :settings_people, site.domain)) + {:error, changeset} -> errors = Plausible.ChangesetHelpers.traverse_errors(changeset) @@ -149,7 +156,8 @@ defmodule PlausibleWeb.Site.MembershipController do if can_grant_role? do membership = membership - |> Membership.changeset(%{role: new_role}) + |> Ecto.Changeset.change() + |> Membership.set_role(new_role) |> Repo.update!() redirect_target = diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index ac994ab0c..db6c18a03 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -45,7 +45,7 @@ defmodule PlausibleWeb.SiteController do sites: sites, visitors: visitors, pagination: pagination, - needs_to_upgrade: user_owns_sites && Plausible.Billing.needs_to_upgrade?(user) + needs_to_upgrade: user_owns_sites && Plausible.Billing.check_needs_to_upgrade(user) ) end diff --git a/lib/plausible_web/templates/site/index.html.eex b/lib/plausible_web/templates/site/index.html.eex index b1c4ac81b..4d50c10c6 100644 --- a/lib/plausible_web/templates/site/index.html.eex +++ b/lib/plausible_web/templates/site/index.html.eex @@ -1,6 +1,6 @@