Update auth.ts

src/store/auth.ts

@@ -2,7 +2,7 @@ import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
 import type { User } from '../types'
 import { authApi } from '../api/auth'
-import { tokenStorage, isTokenValid } from '../utils/token'
+import { tokenStorage, isTokenValid, tokenRefreshManager } from '../utils/token'
 
 export interface TelegramWidgetData {
   id: number
@@ -34,6 +34,10 @@ interface AuthState {
   loginWithEmail: (email: string, password: string) => Promise<void>
 }
 
+// Блокировка для предотвращения race condition при инициализации
+let initializePromise: Promise<void> | null = null
+let isInitializing = false
+
 export const useAuthStore = create<AuthState>()(
   persist(
     (set, get) => ({
@@ -64,7 +68,9 @@ export const useAuthStore = create<AuthState>()(
       logout: () => {
         const { refreshToken } = get()
         if (refreshToken) {
-          authApi.logout(refreshToken).catch(console.error)
+          authApi.logout(refreshToken).catch((error) => {
+            console.error('[Auth] Logout API call failed:', error)
+          })
         }
         tokenStorage.clearTokens()
         set({
@@ -93,7 +99,7 @@ export const useAuthStore = create<AuthState>()(
             set({ isAdmin: data.is_admin })
           }
         } catch (error) {
-          console.error('Failed to check admin status:', error)
+          console.error('[Auth] Failed to check admin status:', error)
           set({ isAdmin: false })
         }
       },
@@ -103,11 +109,19 @@ export const useAuthStore = create<AuthState>()(
           const user = await authApi.getMe()
           set({ user })
         } catch (error) {
-          console.error('Failed to refresh user:', error)
+          console.error('[Auth] Failed to refresh user:', error)
         }
       },
 
       initialize: async () => {
+        // Защита от race condition - если уже идёт инициализация, ждём её завершения
+        if (isInitializing && initializePromise) {
+          return initializePromise
+        }
+
+        isInitializing = true
+        initializePromise = (async () => {
+          try {
             set({ isLoading: true })
 
             // Миграция токенов из localStorage (для обратной совместимости)
@@ -123,21 +137,19 @@ export const useAuthStore = create<AuthState>()(
 
             // Проверяем валидность токена перед использованием
             if (!isTokenValid(accessToken)) {
-          // Токен истёк, пробуем обновить
+              // Используем централизованный менеджер для refresh
-          try {
+              const newToken = await tokenRefreshManager.refreshAccessToken()
-            const response = await authApi.refreshToken(refreshToken)
+              if (newToken) {
-            tokenStorage.setAccessToken(response.access_token)
                 const user = await authApi.getMe()
                 set({
-              accessToken: response.access_token,
+                  accessToken: newToken,
                   refreshToken,
                   user,
                   isAuthenticated: true,
                   isLoading: false,
                 })
                 get().checkAdminStatus()
-            return
+              } else {
-          } catch {
                 tokenStorage.clearTokens()
                 set({
                   accessToken: null,
@@ -146,8 +158,8 @@ export const useAuthStore = create<AuthState>()(
                   isAuthenticated: false,
                   isLoading: false,
                 })
-            return
               }
+              return
             }
 
             try {
@@ -161,20 +173,32 @@ export const useAuthStore = create<AuthState>()(
               })
               get().checkAdminStatus()
             } catch (error) {
-          // Token might be invalid, try to refresh
+              console.error('[Auth] getMe failed, trying refresh:', error)
+              // Token might be invalid on server, try to refresh
+              const newToken = await tokenRefreshManager.refreshAccessToken()
+              if (newToken) {
                 try {
-            const response = await authApi.refreshToken(refreshToken)
-            tokenStorage.setAccessToken(response.access_token)
                   const user = await authApi.getMe()
                   set({
-              accessToken: response.access_token,
+                    accessToken: newToken,
                     refreshToken,
                     user,
                     isAuthenticated: true,
                     isLoading: false,
                   })
                   get().checkAdminStatus()
-          } catch {
+                } catch (userError) {
+                  console.error('[Auth] getMe failed after refresh:', userError)
+                  tokenStorage.clearTokens()
+                  set({
+                    accessToken: null,
+                    refreshToken: null,
+                    user: null,
+                    isAuthenticated: false,
+                    isLoading: false,
+                  })
+                }
+              } else {
                 // Refresh failed, logout
                 tokenStorage.clearTokens()
                 set({
@@ -186,6 +210,13 @@ export const useAuthStore = create<AuthState>()(
                 })
               }
             }
+          } finally {
+            isInitializing = false
+            initializePromise = null
+          }
+        })()
+
+        return initializePromise
       },
 
       loginWithTelegram: async (initData) => {