bugfix
This commit is contained in:
@@ -6,10 +6,12 @@ const AuthContext = createContext(null);
|
|||||||
export const AuthProvider = ({ children }) => {
|
export const AuthProvider = ({ children }) => {
|
||||||
const [user, setUser] = useState(null);
|
const [user, setUser] = useState(null);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [token, setToken] = useState(localStorage.getItem('token'));
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const token = localStorage.getItem('token');
|
const storedToken = localStorage.getItem('token');
|
||||||
if (token) {
|
if (storedToken) {
|
||||||
|
setToken(storedToken);
|
||||||
api.getMe()
|
api.getMe()
|
||||||
.then(data => setUser(data.user))
|
.then(data => setUser(data.user))
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
@@ -25,12 +27,14 @@ export const AuthProvider = ({ children }) => {
|
|||||||
const login = async (email, password) => {
|
const login = async (email, password) => {
|
||||||
const data = await api.login(email, password);
|
const data = await api.login(email, password);
|
||||||
setUser(data.user);
|
setUser(data.user);
|
||||||
|
setToken(data.token);
|
||||||
return data;
|
return data;
|
||||||
};
|
};
|
||||||
|
|
||||||
const register = async (email, username, password) => {
|
const register = async (email, username, password) => {
|
||||||
const data = await api.register(email, username, password);
|
const data = await api.register(email, username, password);
|
||||||
setUser(data.user);
|
setUser(data.user);
|
||||||
|
setToken(data.token);
|
||||||
return data;
|
return data;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -38,10 +42,11 @@ export const AuthProvider = ({ children }) => {
|
|||||||
localStorage.removeItem('token');
|
localStorage.removeItem('token');
|
||||||
api.setToken(null);
|
api.setToken(null);
|
||||||
setUser(null);
|
setUser(null);
|
||||||
|
setToken(null);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AuthContext.Provider value={{ user, login, register, logout, loading }}>
|
<AuthContext.Provider value={{ user, token, login, register, logout, loading }}>
|
||||||
{children}
|
{children}
|
||||||
</AuthContext.Provider>
|
</AuthContext.Provider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ export function SocketProvider({ children }) {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Only connect if user is authenticated
|
// Only connect if user is authenticated
|
||||||
if (!user || !token) {
|
if (!user || !token) {
|
||||||
|
console.log('⏳ Waiting for authentication...', { user: !!user, token: !!token });
|
||||||
if (socket) {
|
if (socket) {
|
||||||
socket.disconnect();
|
socket.disconnect();
|
||||||
setSocket(null);
|
setSocket(null);
|
||||||
@@ -28,10 +29,14 @@ export function SocketProvider({ children }) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('🔄 Initializing socket connection...');
|
||||||
|
|
||||||
// Determine backend URL
|
// Determine backend URL
|
||||||
const backendUrl = import.meta.env.VITE_API_URL ||
|
const backendUrl = import.meta.env.VITE_API_URL ||
|
||||||
(import.meta.env.DEV ? 'http://localhost:4000' : window.location.origin);
|
(import.meta.env.DEV ? 'http://localhost:4000' : window.location.origin);
|
||||||
|
|
||||||
|
console.log('🌐 Connecting to:', backendUrl);
|
||||||
|
|
||||||
// Create socket connection with JWT authentication
|
// Create socket connection with JWT authentication
|
||||||
const newSocket = io(backendUrl, {
|
const newSocket = io(backendUrl, {
|
||||||
auth: {
|
auth: {
|
||||||
@@ -53,7 +58,8 @@ export function SocketProvider({ children }) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
newSocket.on('connect_error', (error) => {
|
newSocket.on('connect_error', (error) => {
|
||||||
console.error('Socket connection error:', error.message);
|
console.error('❌ Socket connection error:', error.message);
|
||||||
|
console.error(' Error details:', error);
|
||||||
});
|
});
|
||||||
|
|
||||||
setSocket(newSocket);
|
setSocket(newSocket);
|
||||||
|
|||||||
Reference in New Issue
Block a user