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