not working (still)

This commit is contained in:
slawk0
2024-08-23 00:04:02 +02:00
parent d30d5391f2
commit 6262f7f292
2 changed files with 28 additions and 23 deletions

View File

@@ -16,6 +16,16 @@ form.addEventListener('submit', (e) => {
input.value = '';
}
});
fetch('/auth/token', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
})
.then(response => {
const token = response.headers.get('Authorization').split(' ')[1];
localStorage.setItem('token', token);
});
socket.on('chat message', (msg) => {
const item = document.createElement('li');

View File

@@ -15,9 +15,9 @@ const { createServer } = require('node:http');
const server = createServer(app);
const io = new Server(server, {
cookie: {
httpOnly: true,
sameSite: "strict",
maxAge: 30 * 24 * 60 * 60 * 1000
httpOnly: true,
sameSite: "strict",
maxAge: 30 * 24 * 60 * 60 * 1000
}
});
@@ -71,6 +71,11 @@ app.get('/signup', (req, res) => {
res.sendFile(path.join(__dirname, '/frontend/routes/signup.html'));
});
app.get('/auth/token', (req, res) => {
const token = req.cookies.token;
res.setHeader('Authorization', `Bearer ${token}`);
})
app.get('/auth/user', (req, res) => {
const token = req.cookies.token;
if(token) {
@@ -105,21 +110,13 @@ app.get('/', (req, res) => {
});
// socket io connection
io.use((socket, next) => {
const token = socket.handshake.auth.token;
if (token) {
jwt.verify(token, jwtSecret, (err, decoded) => {
if (err) return next(new Error('Authentication error'));
socket.username = decoded.username;
next();
});
} else {
next(new Error('Authentication error'));
}
});
io.on('connection', (socket) => {
const username = socket.username;
const token = socket.handshake.headers.cookie.split("=")[1];
jwt.verify(token, jwtSecret, (err, user) => {
if (err) {
return
}
const username = user.username;
console.log(username + ' connected');
// disconnect event
@@ -132,6 +129,7 @@ io.on('connection', (socket) => {
console.log(message);
io.emit('chat message', message);
});
});
})
// run server
server.listen(port, () => {
@@ -177,13 +175,10 @@ async function loginUser(req, res) {
// Compare password
const match = await bcrypt.compare(password, result.rows[0].password);
if (match) {
const token = jwt.sign({username}, jwtSecret, {
const token = jwt.sign({ username }, jwtSecret, {
expiresIn: '30d' // token expires in 30 days
});
res.cookie('token', token, {
httpOnly: true,
maxAge: 30 * 24 * 60 * 60 * 1000 //30 days
});
res.cookie('token', token);
req.session.loggedin = true;
req.session.username = username;
res.send(`
@@ -209,4 +204,4 @@ async function loginUser(req, res) {
res.send('Please enter Username and Password!');
}
res.end();
}
}