From 2804a6edf2e0191e0a218472a714e0ea1e5a5ad9 Mon Sep 17 00:00:00 2001
From: ugurtafrali <tafraliugur@gmail.com>
Date: Wed, 11 Mar 2026 00:16:06 +0300
Subject: [PATCH] Fix #3354: delete oauth grants before user deletion

---
 inventory/user.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/inventory/user.go b/inventory/user.go
index 569c579d..bb0391fe 100644
--- a/inventory/user.go
+++ b/inventory/user.go
@@ -16,6 +16,7 @@ import (
 	"github.com/cloudreve/Cloudreve/v4/ent"
 	"github.com/cloudreve/Cloudreve/v4/ent/davaccount"
 	"github.com/cloudreve/Cloudreve/v4/ent/file"
+	"github.com/cloudreve/Cloudreve/v4/ent/oauthgrant"
 	"github.com/cloudreve/Cloudreve/v4/ent/passkey"
 	"github.com/cloudreve/Cloudreve/v4/ent/schema"
 	"github.com/cloudreve/Cloudreve/v4/ent/task"
@@ -214,6 +215,11 @@ func (c *userClient) Delete(ctx context.Context, uid int) error {
 		return fmt.Errorf("failed to delete tasks: %w", err)
 	}
 
+	// OAuth grants
+	if _, err := c.client.OAuthGrant.Delete().Where(oauthgrant.UserID(uid)).Exec(schema.SkipSoftDelete(ctx)); err != nil {
+		return fmt.Errorf("failed to delete oauth grants: %w", err)
+	}
+
 	return c.client.User.DeleteOneID(uid).Exec(schema.SkipSoftDelete(ctx))
 }