@@ -36,7 +36,6 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
36
36
const [ isAuthenticated , setIsAuthenticated ] = useState ( false ) ;
37
37
const { setCurrentUser} = useContext ( UserContext ) ;
38
38
const [ isLoading , setIsLoading ] = useState ( true ) ;
39
- const [ isFetching , setIsFetching ] = useState ( false ) ;
40
39
const [ fetchUserDataIsComplited , setFetchUserDataIsComplited ] = useState ( false ) ;
41
40
42
41
@@ -59,7 +58,6 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
59
58
} ;
60
59
61
60
62
- const isFetchingRef = useRef ( false ) ;
63
61
let isFetchingInProgress = false ;
64
62
65
63
@@ -72,18 +70,11 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
72
70
if ( isFetchingInProgress ) return ;
73
71
isFetchingInProgress = true ;
74
72
75
- if ( isFetching ) {
76
- console . log ( 'Fetch in progress, skipping' ) ;
77
- return ;
78
- }
79
- isFetchingRef . current = true ;
80
- setIsFetching ( true ) ;
73
+
81
74
const token = localStorage . getItem ( 'token' ) ;
82
75
if ( ! token ) {
83
76
setIsAuthenticated ( false ) ;
84
77
setCurrentUser ( null ) ;
85
- isFetchingRef . current = false ;
86
- setIsFetching ( false ) ;
87
78
return ;
88
79
}
89
80
@@ -128,14 +119,12 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
128
119
console . error ( 'Unknown error' , error ) ;
129
120
}
130
121
} finally {
131
- isFetchingRef . current = false ;
132
- setIsFetching ( false ) ;
133
122
setIsLoading ( false ) ;
134
123
isFetchingInProgress = false ;
135
124
setFetchUserDataIsComplited ( true ) ;
136
125
137
126
}
138
- } , [ refreshAccessToken , isFetching , fetchUserDataIsComplited ] ) ;
127
+ } , [ refreshAccessToken , fetchUserDataIsComplited ] ) ;
139
128
140
129
useEffect ( ( ) => {
141
130
console . log ( 'Fetching user data from useEffect' ) ;
0 commit comments