From 2f407493debfba279f85f52c43f834595565f184 Mon Sep 17 00:00:00 2001
From: Yoland Y <4950057+yoland68@users.noreply.github.com>
Date: Tue, 26 Aug 2025 13:45:01 -0700
Subject: [PATCH 1/2] [feat] Add account deletion functionality to UserPanel
component
- Implemented a new button for deleting user accounts in UserPanel.vue
- Added confirmation dialog for account deletion using dialogService
- Integrated deleteAccount action in useFirebaseAuthActions
- Updated en files to include new translation keys for account deletion
---
.../dialog/content/setting/UserPanel.vue | 29 +++++++++++++------
src/composables/auth/useCurrentUser.ts | 20 ++++++++++++-
.../auth/useFirebaseAuthActions.ts | 11 +++++++
src/locales/en/main.json | 9 ++++++
src/stores/firebaseAuthStore.ts | 10 +++++++
5 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/src/components/dialog/content/setting/UserPanel.vue b/src/components/dialog/content/setting/UserPanel.vue
index 147625b323..7497e926cc 100644
--- a/src/components/dialog/content/setting/UserPanel.vue
+++ b/src/components/dialog/content/setting/UserPanel.vue
@@ -57,14 +57,23 @@
class="w-8 h-8 mt-4"
style="--pc-spinner-color: #000"
/>
-
+
+
+
+
@@ -100,6 +109,7 @@ const dialogService = useDialogService()
const {
loading,
isLoggedIn,
+ isApiKeyLogin,
isEmailProvider,
userDisplayName,
userEmail,
@@ -107,6 +117,7 @@ const {
providerName,
providerIcon,
handleSignOut,
- handleSignIn
+ handleSignIn,
+ handleDeleteAccount
} = useCurrentUser()
diff --git a/src/composables/auth/useCurrentUser.ts b/src/composables/auth/useCurrentUser.ts
index eb2f73b8c3..3999aa9c16 100644
--- a/src/composables/auth/useCurrentUser.ts
+++ b/src/composables/auth/useCurrentUser.ts
@@ -1,5 +1,8 @@
import { computed } from 'vue'
+import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { t } from '@/i18n'
+import { useDialogService } from '@/services/dialogService'
import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
import { useCommandStore } from '@/stores/commandStore'
import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
@@ -8,6 +11,8 @@ export const useCurrentUser = () => {
const authStore = useFirebaseAuthStore()
const commandStore = useCommandStore()
const apiKeyStore = useApiKeyAuthStore()
+ const dialogService = useDialogService()
+ const { deleteAccount } = useFirebaseAuthActions()
const firebaseUser = computed(() => authStore.currentUser)
const isApiKeyLogin = computed(() => apiKeyStore.isAuthenticated)
@@ -85,6 +90,18 @@ export const useCurrentUser = () => {
await commandStore.execute('Comfy.User.OpenSignInDialog')
}
+ const handleDeleteAccount = async () => {
+ const confirmed = await dialogService.confirm({
+ title: t('auth.deleteAccount.confirmTitle'),
+ message: t('auth.deleteAccount.confirmMessage'),
+ type: 'delete'
+ })
+
+ if (confirmed) {
+ await deleteAccount()
+ }
+ }
+
return {
loading: authStore.loading,
isLoggedIn,
@@ -96,6 +113,7 @@ export const useCurrentUser = () => {
providerName,
providerIcon,
handleSignOut,
- handleSignIn
+ handleSignIn,
+ handleDeleteAccount
}
}
diff --git a/src/composables/auth/useFirebaseAuthActions.ts b/src/composables/auth/useFirebaseAuthActions.ts
index 466d0ef82f..ac0afecc23 100644
--- a/src/composables/auth/useFirebaseAuthActions.ts
+++ b/src/composables/auth/useFirebaseAuthActions.ts
@@ -135,6 +135,16 @@ export const useFirebaseAuthActions = () => {
reportError
)
+ const deleteAccount = wrapWithErrorHandlingAsync(async () => {
+ await authStore.deleteAccount()
+ toastStore.add({
+ severity: 'success',
+ summary: t('auth.deleteAccount.success'),
+ detail: t('auth.deleteAccount.successDetail'),
+ life: 5000
+ })
+ }, reportError)
+
return {
logout,
sendPasswordReset,
@@ -146,6 +156,7 @@ export const useFirebaseAuthActions = () => {
signInWithEmail,
signUpWithEmail,
updatePassword,
+ deleteAccount,
accessError
}
}
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 50b6d8c3e6..51d7c30a5f 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -1601,6 +1601,15 @@
"passwordUpdate": {
"success": "Password Updated",
"successDetail": "Your password has been updated successfully"
+ },
+ "deleteAccount": {
+ "deleteAccount": "Delete Account",
+ "confirmTitle": "Delete Account",
+ "confirmMessage": "Are you sure you want to delete your account? This action cannot be undone and will permanently remove all your data.",
+ "confirm": "Delete Account",
+ "cancel": "Cancel",
+ "success": "Account Deleted",
+ "successDetail": "Your account has been successfully deleted."
}
},
"validation": {
diff --git a/src/stores/firebaseAuthStore.ts b/src/stores/firebaseAuthStore.ts
index 65b468001a..161ec9d567 100644
--- a/src/stores/firebaseAuthStore.ts
+++ b/src/stores/firebaseAuthStore.ts
@@ -8,6 +8,7 @@ import {
type UserCredential,
browserLocalPersistence,
createUserWithEmailAndPassword,
+ deleteUser,
onAuthStateChanged,
sendPasswordResetEmail,
setPersistence,
@@ -287,6 +288,14 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
await updatePassword(currentUser.value, newPassword)
}
+ /** Delete the current user account */
+ const _deleteAccount = async (): Promise => {
+ if (!currentUser.value) {
+ throw new FirebaseAuthStoreError(t('toastMessages.userNotAuthenticated'))
+ }
+ await deleteUser(currentUser.value)
+ }
+
const addCredits = async (
requestBodyContent: CreditPurchasePayload
): Promise => {
@@ -385,6 +394,7 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
accessBillingPortal,
sendPasswordReset,
updatePassword: _updatePassword,
+ deleteAccount: _deleteAccount,
getAuthHeader
}
})
From 4fc67223a38b89ded312fd32b76243f921c709f4 Mon Sep 17 00:00:00 2001
From: github-actions
Date: Tue, 26 Aug 2025 20:53:07 +0000
Subject: [PATCH 2/2] Update locales [skip ci]
---
src/locales/ar/main.json | 9 +++++++++
src/locales/es/main.json | 9 +++++++++
src/locales/fr/main.json | 9 +++++++++
src/locales/ja/main.json | 9 +++++++++
src/locales/ko/main.json | 9 +++++++++
src/locales/ru/main.json | 9 +++++++++
src/locales/zh-TW/main.json | 9 +++++++++
src/locales/zh/main.json | 9 +++++++++
8 files changed, 72 insertions(+)
diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json
index 82f8d1c166..ce7a8d1313 100644
--- a/src/locales/ar/main.json
+++ b/src/locales/ar/main.json
@@ -27,6 +27,15 @@
"title": "مفتاح API",
"whitelistInfo": "حول المواقع غير المدرجة في القائمة البيضاء"
},
+ "deleteAccount": {
+ "cancel": "إلغاء",
+ "confirm": "حذف الحساب",
+ "confirmMessage": "هل أنت متأكد أنك تريد حذف حسابك؟ لا يمكن التراجع عن هذا الإجراء وسيتم حذف جميع بياناتك نهائيًا.",
+ "confirmTitle": "حذف الحساب",
+ "deleteAccount": "حذف الحساب",
+ "success": "تم حذف الحساب",
+ "successDetail": "تم حذف حسابك بنجاح."
+ },
"login": {
"andText": "و",
"confirmPasswordLabel": "تأكيد كلمة المرور",
diff --git a/src/locales/es/main.json b/src/locales/es/main.json
index a3ba819462..45421b6514 100644
--- a/src/locales/es/main.json
+++ b/src/locales/es/main.json
@@ -27,6 +27,15 @@
"title": "Clave API",
"whitelistInfo": "Acerca de los sitios no incluidos en la lista blanca"
},
+ "deleteAccount": {
+ "cancel": "Cancelar",
+ "confirm": "Eliminar cuenta",
+ "confirmMessage": "¿Estás seguro de que deseas eliminar tu cuenta? Esta acción no se puede deshacer y eliminará permanentemente todos tus datos.",
+ "confirmTitle": "Eliminar cuenta",
+ "deleteAccount": "Eliminar cuenta",
+ "success": "Cuenta eliminada",
+ "successDetail": "Tu cuenta ha sido eliminada exitosamente."
+ },
"login": {
"andText": "y",
"confirmPasswordLabel": "Confirmar contraseña",
diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json
index cc13f3ac97..528e9b8f5c 100644
--- a/src/locales/fr/main.json
+++ b/src/locales/fr/main.json
@@ -27,6 +27,15 @@
"title": "Clé API",
"whitelistInfo": "À propos des sites non autorisés"
},
+ "deleteAccount": {
+ "cancel": "Annuler",
+ "confirm": "Supprimer le compte",
+ "confirmMessage": "Êtes-vous sûr de vouloir supprimer votre compte ? Cette action est irréversible et supprimera définitivement toutes vos données.",
+ "confirmTitle": "Supprimer le compte",
+ "deleteAccount": "Supprimer le compte",
+ "success": "Compte supprimé",
+ "successDetail": "Votre compte a été supprimé avec succès."
+ },
"login": {
"andText": "et",
"confirmPasswordLabel": "Confirmer le mot de passe",
diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json
index 9b3838f695..f152cf5a13 100644
--- a/src/locales/ja/main.json
+++ b/src/locales/ja/main.json
@@ -27,6 +27,15 @@
"title": "APIキー",
"whitelistInfo": "ホワイトリストに登録されていないサイトについて"
},
+ "deleteAccount": {
+ "cancel": "キャンセル",
+ "confirm": "アカウントを削除",
+ "confirmMessage": "本当にアカウントを削除しますか？この操作は元に戻せず、すべてのデータが完全に削除されます。",
+ "confirmTitle": "アカウントを削除",
+ "deleteAccount": "アカウントを削除",
+ "success": "アカウントが削除されました",
+ "successDetail": "アカウントは正常に削除されました。"
+ },
"login": {
"andText": "および",
"confirmPasswordLabel": "パスワードの確認",
diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json
index b9e5086bda..a63b8d2a9f 100644
--- a/src/locales/ko/main.json
+++ b/src/locales/ko/main.json
@@ -27,6 +27,15 @@
"title": "API 키",
"whitelistInfo": "비허용 사이트에 대하여"
},
+ "deleteAccount": {
+ "cancel": "취소",
+ "confirm": "계정 삭제",
+ "confirmMessage": "정말로 계정을 삭제하시겠습니까? 이 작업은 되돌릴 수 없으며 모든 데이터가 영구적으로 삭제됩니다.",
+ "confirmTitle": "계정 삭제",
+ "deleteAccount": "계정 삭제",
+ "success": "계정이 삭제되었습니다",
+ "successDetail": "계정이 성공적으로 삭제되었습니다."
+ },
"login": {
"andText": "및",
"confirmPasswordLabel": "비밀번호 확인",
diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json
index a6da070ae3..01d1235141 100644
--- a/src/locales/ru/main.json
+++ b/src/locales/ru/main.json
@@ -27,6 +27,15 @@
"title": "API-ключ",
"whitelistInfo": "О не включённых в белый список сайтах"
},
+ "deleteAccount": {
+ "cancel": "Отмена",
+ "confirm": "Удалить аккаунт",
+ "confirmMessage": "Вы уверены, что хотите удалить свой аккаунт? Это действие необратимо и приведёт к безвозвратному удалению всех ваших данных.",
+ "confirmTitle": "Удалить аккаунт",
+ "deleteAccount": "Удалить аккаунт",
+ "success": "Аккаунт удалён",
+ "successDetail": "Ваш аккаунт был успешно удалён."
+ },
"login": {
"andText": "и",
"confirmPasswordLabel": "Подтвердите пароль",
diff --git a/src/locales/zh-TW/main.json b/src/locales/zh-TW/main.json
index f1ec65bb19..9c50faca2a 100644
--- a/src/locales/zh-TW/main.json
+++ b/src/locales/zh-TW/main.json
@@ -27,6 +27,15 @@
"title": "API 金鑰",
"whitelistInfo": "關於未列入白名單的網站"
},
+ "deleteAccount": {
+ "cancel": "取消",
+ "confirm": "刪除帳號",
+ "confirmMessage": "您確定要刪除您的帳號嗎？此操作無法復原，且將永久移除您所有的資料。",
+ "confirmTitle": "刪除帳號",
+ "deleteAccount": "刪除帳號",
+ "success": "帳號已刪除",
+ "successDetail": "您的帳號已成功刪除。"
+ },
"login": {
"andText": "以及",
"confirmPasswordLabel": "確認密碼",
diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json
index eef7782898..1b345df59d 100644
--- a/src/locales/zh/main.json
+++ b/src/locales/zh/main.json
@@ -27,6 +27,15 @@
"title": "API 密钥",
"whitelistInfo": "关于非白名单网站"
},
+ "deleteAccount": {
+ "cancel": "取消",
+ "confirm": "删除账户",
+ "confirmMessage": "您确定要删除您的账户吗？此操作无法撤销，并且会永久删除您的所有数据。",
+ "confirmTitle": "删除账户",
+ "deleteAccount": "删除账户",
+ "success": "账户已删除",
+ "successDetail": "您的账户已成功删除。"
+ },
"login": {
"andText": "和",
"confirmPasswordLabel": "确认密码",