sync

services/auth.service.js

@@ -32,19 +32,19 @@ async function syncUser(user) {
                 console.log('user ' + user.login + ' updated in database')
             });
         } else {
-            User.create({
-                id: user.id,
-                login: user.login,
-                avatar: user.avatar_url,
-                displayName: user.name
-            }).then(() => {
-                User.findAll().then((users) => {
-                  if (users.length === 1) {
-                    userService.makeAdmin(user.login)
-                  }
+            User.findAll().then((users) => {
+                User.create({
+                    id: user.id,
+                    login: user.login,
+                    avatar: user.avatar_url,
+                    displayName: user.name,
+                    admin: (users.length === 1),
+                    serverUsername: false,
+
+                }).then(() => {
+                    console.log('user ' + user.login + ' added to database')
                 })
-                console.log('user ' + user.login + ' added to database')
-            });
+            })
         }
     });
 }

services/server.service.js

@@ -84,6 +84,12 @@ async function getServerKeys(server) {
     return result
 }
 
+async function getServerUsers(server) {
+    const dump = await sequelize.query('SELECT DISTINCT serverUsername FROM servers JOIN users on users.id = members.userId JOIN accesses on accesses.serverHostname = servers.hostname JOIN members on members.groupName = accesses.groupName WHERE serverHostname = \'' + server + '\'', {});
+    return dump[0]
+}
+
+
 async function getServerListForUserId(userId) {
     const dump = await sequelize.query('SELECT hostname, username, ip, lastPull FROM servers JOIN accesses ON servers.hostname = accesses.serverHostname JOIN members ON members.groupName = accesses.groupName WHERE userId  = \'' + userId + '\'', {});
     result = {}
@@ -105,6 +111,7 @@ async function getServerListForUserId(userId) {
 
 
 module.exports = {
+    getServerUsers,
     addServer,
     delServer,
     getServerKeys,