diff --git a/client/UserCreation.vue b/client/UserCreation.vue index 69fe54101f0619c98c79ab4a17e7f3fa55661703..973943ef5c1e4e11dc6afdf5f459300ccec50a13 100644 --- a/client/UserCreation.vue +++ b/client/UserCreation.vue @@ -106,8 +106,7 @@ export default { if (!this.user.email || !this.user.email.includes('@') || !this.user.email.includes('.')) { this.errors.email = "Specify a valid email address"; } - else if (this.user.email.endsWith('@liu.se')) - { + else if (this.user.email.match(/@(.+\.)?liu\.se$/)) { this.errors.email = "LiU users should use their LiU-ID to sign in"; } diff --git a/server/users.js b/server/users.js index b0b8fca0e54cde12e8cadb3b8a97f678d94a94ce..078b8bf6959415eeec59303f9ea5e34d13f74f4b 100644 --- a/server/users.js +++ b/server/users.js @@ -55,6 +55,10 @@ router.post('/', async (req, res) => { } } + if (req.body.email.match(/@(.*\.)?liu\.se$/)) { + return res.status(400).send({ 'message': 'LiU users should use their LiU-ID to sign in here' }) + } + // TODO: Apply further validation on input // XXX Make sure user is allowed to create