From 4d306d87d9980250ba689d5d7e02dc05fc092b8a Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Tue, 19 Dec 2017 14:50:30 +0100
Subject: [PATCH] Explicitly treat zero

---
 client/App.vue  | 4 ++--
 server/users.js | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/App.vue b/client/App.vue
index 2973b7d..cde8809 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -29,11 +29,11 @@
             <h4>Add external users</h4>
             <p>Employees and students are allowed to create external users for collaboration with actors outside of Linköpings University.<br/>
               This application will track and allow creation of such external users, up to a number configurable by the administrators.<br/></p>
-            <button class="btn btn-success" :disabled="user.eum_settings.external_limit > 0 && external.length >= user.eum_settings.external_limit" @click="showCreationForm = !showCreationForm">New External User</button>
+            <button class="btn btn-success" :disabled="user.eum_settings.external_limit >= 0 && external.length >= user.eum_settings.external_limit" @click="showCreationForm = !showCreationForm">New External User</button>
           </div>
         </transition>
 
-        <h2 class="mt-4 mb-3">Existing external users: ({{ external.length }}/<span v-if="user.eum_settings.external_limit > 0">{{ user.eum_settings.external_limit }}</span><span v-else>&infin;</span>)</h2>
+        <h2 class="mt-4 mb-3">Existing external users: ({{ external.length }}/<span v-if="user.eum_settings.external_limit >= 0">{{ user.eum_settings.external_limit }}</span><span v-else>&infin;</span>)</h2>
         <hr/>
         <transition name="fade" mode="out-in">
           <ul class="list-unstyled" is="transition-group" name="flip-list" v-if="external">
diff --git a/server/users.js b/server/users.js
index 078b8bf..71ba3c1 100644
--- a/server/users.js
+++ b/server/users.js
@@ -40,6 +40,10 @@ router.post('/', async (req, res) => {
     .reduce( (rs, key) => (rs[key] = req.body[key], rs), {} )
   )
 
+  if (req.user.eum_settings.external_limit == 0) {
+      return res.status(401).send({ 'message': 'No external users allowed' });
+  }
+
   if (req.user.eum_settings.external_limit > 0) {
     try {
       const queryText = 'SELECT * FROM external_users WHERE owner_id = $1';
-- 
GitLab