From f9b4f59abaf42291eba3a64cd4b8713648f11ee6 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Fri, 15 Dec 2017 15:12:27 +0100
Subject: [PATCH] Ensure LiU mails are rejected

---
 client/UserCreation.vue | 3 +--
 server/users.js         | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/UserCreation.vue b/client/UserCreation.vue
index 69fe541..973943e 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 b0b8fca..078b8bf 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
 
-- 
GitLab