refactor(client): remove avatarType, add auth effects, simplify UserAvatar

client/src/shared/model/auth.ts

@@ -11,11 +11,15 @@ export type AuthUser = {
   lastName?: string | null
   gender?: string | null
   avatar?: string | null
-  avatarType?: string | null
   avatarStyle?: string | null
   isAdmin?: boolean
 }
 
+export type AuthMethod = {
+  type: 'password' | 'vk' | 'yandex'
+  active: boolean
+}
+
 export const tokenSet = createEvent<string | null>()
 export const logout = createEvent()
 
@@ -72,7 +76,6 @@ export const verifyEmailChangeFx = createEffect(async (params: { newEmail: strin
 export type UpdateProfileParams = {
   displayName: string | null
   avatar?: string | null
-  avatarType?: string | null
   avatarStyle?: string | null
 }
 
@@ -81,6 +84,35 @@ export const updateProfileFx = createEffect(async (params: UpdateProfileParams)
   return data.user
 })
 
+// ----- Auth effects -----
+
+export const loginFx = createEffect(async (params: { email: string; password: string }) => {
+  const { data } = await apiClient.post<{ token: string; user: AuthUser }>('auth/login', params)
+  tokenSet(data.token)
+  return data.user
+})
+
+export const registerFx = createEffect(
+  async (params: { email: string; password: string; displayName?: string }) => {
+    const { data } = await apiClient.post<{ token: string; user: AuthUser }>('auth/register', params)
+    tokenSet(data.token)
+    return data.user
+  },
+)
+
+export const fetchAuthMethodsFx = createEffect(async () => {
+  const { data } = await apiClient.get<{ methods: AuthMethod[] }>('me/auth-methods')
+  return data.methods
+})
+
+export const setPasswordFx = createEffect(async (password: string) => {
+  await apiClient.post('me/password', { password })
+})
+
+export const unlinkOAuthFx = createEffect(async (provider: 'vk' | 'yandex') => {
+  await apiClient.delete(`me/oauth/${provider}`)
+})
+
 // ----- Error stores -----
 
 export const $requestEmailChangeCodeError = createErrorStore(requestEmailChangeCodeFx).$error

client/src/shared/ui/UserAvatar.tsx

@@ -7,20 +7,19 @@ import { DEFAULT_STYLE_ID, getStyleById } from '@/shared/lib/avatar-styles'
 type UserAvatarProps = {
   userId: string
   avatarUrl?: string | null
-  avatarType?: string | null
   avatarStyle?: string | null
   size?: number
   sx?: SxProps<Theme>
 }
 
-export function UserAvatar({ userId, avatarUrl, avatarType, avatarStyle, size = 40, sx }: UserAvatarProps) {
+export function UserAvatar({ userId, avatarUrl, avatarStyle, size = 40, sx }: UserAvatarProps) {
   const generatedSrc = useMemo(() => {
     const styleDef = getStyleById(avatarStyle || DEFAULT_STYLE_ID)
     const avatar = createAvatar(styleDef.style, { seed: userId })
     return avatar.toDataUri()
   }, [userId, avatarStyle])
 
-  const src = avatarType && avatarUrl ? avatarUrl : generatedSrc
+  const src = avatarUrl || generatedSrc
 
   return (
     <Avatar src={src} sx={{ width: size, height: size, bgcolor: 'primary.main', ...sx }}>