mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +00:00
## Summary Refactored `onUserResolved` function in auth composable to use VueUse `whenever` utility instead of manual watch implementation and use `immediate` option instead of invoking manually before creating watcher. ## Changes - **What**: Replaced manual watch + immediate check pattern with [VueUse whenever](https://vueuse.org/shared/whenever/) utility in `useCurrentUser.ts:37` ## Review Focus Behavioral equivalence verification - `whenever` with `immediate: true` should maintain identical callback timing and cleanup semantics. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5718-refactor-Simplify-current-user-resolved-hook-implementation-2766d73d365081008b6de156dd78f940) by [Unito](https://www.unito.io)
139 lines
3.6 KiB
TypeScript
139 lines
3.6 KiB
TypeScript
import { whenever } from '@vueuse/core'
|
|
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'
|
|
import type { AuthUserInfo } from '@/types/authTypes'
|
|
|
|
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)
|
|
const isLoggedIn = computed(
|
|
() => !!isApiKeyLogin.value || firebaseUser.value !== null
|
|
)
|
|
|
|
const resolvedUserInfo = computed<AuthUserInfo | null>(() => {
|
|
if (isApiKeyLogin.value && apiKeyStore.currentUser) {
|
|
return { id: apiKeyStore.currentUser.id }
|
|
}
|
|
|
|
if (firebaseUser.value) {
|
|
return { id: firebaseUser.value.uid }
|
|
}
|
|
|
|
return null
|
|
})
|
|
|
|
const onUserResolved = (callback: (user: AuthUserInfo) => void) =>
|
|
whenever(resolvedUserInfo, callback, { immediate: true })
|
|
|
|
const userDisplayName = computed(() => {
|
|
if (isApiKeyLogin.value) {
|
|
return apiKeyStore.currentUser?.name
|
|
}
|
|
return firebaseUser.value?.displayName
|
|
})
|
|
|
|
const userEmail = computed(() => {
|
|
if (isApiKeyLogin.value) {
|
|
return apiKeyStore.currentUser?.email
|
|
}
|
|
return firebaseUser.value?.email
|
|
})
|
|
|
|
const providerName = computed(() => {
|
|
if (isApiKeyLogin.value) {
|
|
return 'Comfy API Key'
|
|
}
|
|
|
|
const providerId = firebaseUser.value?.providerData[0]?.providerId
|
|
if (providerId?.includes('google')) {
|
|
return 'Google'
|
|
}
|
|
if (providerId?.includes('github')) {
|
|
return 'GitHub'
|
|
}
|
|
return providerId
|
|
})
|
|
|
|
const providerIcon = computed(() => {
|
|
if (isApiKeyLogin.value) {
|
|
return 'pi pi-key'
|
|
}
|
|
|
|
const providerId = firebaseUser.value?.providerData[0]?.providerId
|
|
if (providerId?.includes('google')) {
|
|
return 'pi pi-google'
|
|
}
|
|
if (providerId?.includes('github')) {
|
|
return 'pi pi-github'
|
|
}
|
|
return 'pi pi-user'
|
|
})
|
|
|
|
const isEmailProvider = computed(() => {
|
|
if (isApiKeyLogin.value) {
|
|
return false
|
|
}
|
|
|
|
const providerId = firebaseUser.value?.providerData[0]?.providerId
|
|
return providerId === 'password'
|
|
})
|
|
|
|
const userPhotoUrl = computed(() => {
|
|
if (isApiKeyLogin.value) return null
|
|
return firebaseUser.value?.photoURL
|
|
})
|
|
|
|
const handleSignOut = async () => {
|
|
if (isApiKeyLogin.value) {
|
|
await apiKeyStore.clearStoredApiKey()
|
|
} else {
|
|
await commandStore.execute('Comfy.User.SignOut')
|
|
}
|
|
}
|
|
|
|
const handleSignIn = async () => {
|
|
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,
|
|
isApiKeyLogin,
|
|
isEmailProvider,
|
|
userDisplayName,
|
|
userEmail,
|
|
userPhotoUrl,
|
|
providerName,
|
|
providerIcon,
|
|
resolvedUserInfo,
|
|
handleSignOut,
|
|
handleSignIn,
|
|
handleDeleteAccount,
|
|
onUserResolved
|
|
}
|
|
}
|