Minor bugfixes
This commit is contained in:
@@ -23,9 +23,12 @@ const LogIn = props => {
|
|||||||
evt => {
|
evt => {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
handleSubmit(emailElement.value, passwordElement.value)
|
handleSubmit(emailElement.value, passwordElement.value)
|
||||||
.then(res => res ? alert(res) : null)
|
.then(([res, ok]) => {
|
||||||
.then(() => emailElement.value = passwordElement.value = '') //clear input
|
alert(res);
|
||||||
.then(() => { window.location.reload(true); }) //BUFGIX: force reload of the header element
|
if (ok) {
|
||||||
|
window.location.reload(true); //BUFGIX: force reload of the header element
|
||||||
|
}
|
||||||
|
})
|
||||||
.catch(e => console.error(e))
|
.catch(e => console.error(e))
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
@@ -64,9 +67,9 @@ const handleSubmit = async (email, password) => {
|
|||||||
const result = await fetch('/api/accounts/login', { method: 'POST', body: formData });
|
const result = await fetch('/api/accounts/login', { method: 'POST', body: formData });
|
||||||
|
|
||||||
if (result.ok) {
|
if (result.ok) {
|
||||||
return result.text();
|
return [await result.text(), true];
|
||||||
} else {
|
} else {
|
||||||
return result.text();
|
return [await result.text(), false];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ const Member = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const logout = async () => {
|
const logout = async () => {
|
||||||
await fetch('/api/accounts/logout')
|
await fetch('/api/accounts/logout', { method: 'POST' })
|
||||||
.catch(e => console.error(e))
|
.catch(e => console.error(e))
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,6 +5,6 @@ const router = express.Router();
|
|||||||
router.post('/signup', require('./signup'));
|
router.post('/signup', require('./signup'));
|
||||||
router.get('/validation', require('./validation'));
|
router.get('/validation', require('./validation'));
|
||||||
router.post('/login', require('./login'));
|
router.post('/login', require('./login'));
|
||||||
router.get('/logout', require('./logout'));
|
router.post('/logout', require('./logout'));
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|||||||
@@ -24,12 +24,16 @@ const route = async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (!account) {
|
||||||
|
return res.status(401).send('incorrect email or password');
|
||||||
|
}
|
||||||
|
|
||||||
//compare passwords
|
//compare passwords
|
||||||
const compare = utils.promisify(bcrypt.compare);
|
const compare = utils.promisify(bcrypt.compare);
|
||||||
const match = await compare(req.fields.password, account.hash);
|
const match = await compare(req.fields.password, account.hash);
|
||||||
|
|
||||||
if (!match) {
|
if (!match) {
|
||||||
return res.status(401).send('passwords don\'t match');
|
return res.status(401).send('incorrect email or password');
|
||||||
}
|
}
|
||||||
|
|
||||||
//save the session and cookie data
|
//save the session and cookie data
|
||||||
|
|||||||
Reference in New Issue
Block a user