From d30d205f0b66acf8c67d25210cff5aab2b562b45 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 Jul 2026 11:57:16 +0400
Subject: [PATCH] fix(oauth): preserve dependent app cleanup

---
 .../optimize-orphaned-apps-cleanup.change     |  2 +-
 lib/pleroma/web/o_auth/app.ex                 | 31 ++++++++++++-------
 test/pleroma/web/o_auth/app_test.exs          | 12 ++++++-
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/changelog.d/optimize-orphaned-apps-cleanup.change b/changelog.d/optimize-orphaned-apps-cleanup.change
index e86b75524..3f037f125 100644
--- a/changelog.d/optimize-orphaned-apps-cleanup.change
+++ b/changelog.d/optimize-orphaned-apps-cleanup.change
@@ -1 +1 @@
-- Optimize orphaned OAuth apps cleanup by using a single delete query instead of deleting records one by one.
+- Optimize orphaned OAuth apps cleanup by deleting records in batches instead of one by one.
diff --git a/lib/pleroma/web/o_auth/app.ex b/lib/pleroma/web/o_auth/app.ex
index 4ea02ee01..9a3dcfcea 100644
--- a/lib/pleroma/web/o_auth/app.ex
+++ b/lib/pleroma/web/o_auth/app.ex
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.OAuth.App do
   import Ecto.Query
   alias Pleroma.Repo
   alias Pleroma.User
-  alias Pleroma.Web.OAuth.Token
+  alias Pleroma.Web.OAuth.{Authorization, Token}
 
   @type t :: %__MODULE__{}
 
@@ -193,18 +193,25 @@ defmodule Pleroma.Web.OAuth.App do
   def remove_orphans(limit \\ 100) do
     fifteen_mins_ago = NaiveDateTime.add(NaiveDateTime.utc_now(), -900)
 
-    # First get the IDs of apps to delete
-    app_ids =
-      from(a in __MODULE__,
-        where: is_nil(a.user_id) and a.inserted_at < ^fifteen_mins_ago,
-        limit: ^limit,
-        select: a.id
-      )
-      |> Repo.all()
+    Repo.transaction(fn ->
+      app_ids =
+        from(a in __MODULE__,
+          where: is_nil(a.user_id) and a.inserted_at < ^fifteen_mins_ago,
+          limit: ^limit,
+          lock: "FOR UPDATE SKIP LOCKED",
+          select: a.id
+        )
+        |> Repo.all()
 
-    # Then delete those specific apps
-    from(a in __MODULE__, where: a.id in ^app_ids)
-    |> Repo.delete_all()
+      # Bulk deletes bypass the schema's association cleanup.
+      from(a in Authorization, where: a.app_id in ^app_ids) |> Repo.delete_all()
+      from(t in Token, where: t.app_id in ^app_ids) |> Repo.delete_all()
+
+      from(a in __MODULE__,
+        where: a.id in ^app_ids and is_nil(a.user_id) and a.inserted_at < ^fifteen_mins_ago
+      )
+      |> Repo.delete_all()
+    end)
 
     :ok
   end
diff --git a/test/pleroma/web/o_auth/app_test.exs b/test/pleroma/web/o_auth/app_test.exs
index 4d100cd13..26879d6ee 100644
--- a/test/pleroma/web/o_auth/app_test.exs
+++ b/test/pleroma/web/o_auth/app_test.exs
@@ -5,7 +5,9 @@
 defmodule Pleroma.Web.OAuth.AppTest do
   use Pleroma.DataCase, async: true
 
-  alias Pleroma.Web.OAuth.App
+  alias Pleroma.MFA.Token, as: MFAToken
+  alias Pleroma.Web.OAuth.{App, Authorization, Token}
+  alias Pleroma.Web.Push.Subscription
   import Pleroma.Factory
 
   describe "get_or_make/2" do
@@ -57,6 +59,10 @@ defmodule Pleroma.Web.OAuth.AppTest do
   test "removes orphaned apps" do
     attrs = %{client_name: "Mastodon-Local", redirect_uris: "."}
     {:ok, %App{} = old_app} = App.get_or_make(attrs, ["write"])
+    authorization = insert(:oauth_authorization, app: old_app)
+    token = insert(:oauth_token, app: old_app)
+    mfa_token = insert(:mfa_token, authorization: authorization)
+    push_subscription = insert(:push_subscription, token: token)
 
     user = insert(:user)
     attrs = %{client_name: "OldButValid", redirect_uris: ".", user_id: user.id}
@@ -74,6 +80,10 @@ defmodule Pleroma.Web.OAuth.AppTest do
     App.remove_orphans()
 
     refute Repo.get(App, old_app.id)
+    refute Repo.get(Authorization, authorization.id)
+    refute Repo.get(Token, token.id)
+    refute Repo.get(MFAToken, mfa_token.id)
+    refute Repo.get(Subscription, push_subscription.id)
     assert Repo.get(App, recent_app.id)
     assert Repo.get(App, old_owned_app.id)
   end