diff --git a/server/src/classes/User.js b/server/src/classes/User.js index fad7c11..46adb37 100755 --- a/server/src/classes/User.js +++ b/server/src/classes/User.js @@ -223,7 +223,7 @@ class User { const roles = await User.getRoles(username, groups) const user = { - ...adUser, + ...adUser, roles, groups } @@ -302,7 +302,7 @@ class User { const dbUsers = [] let i = 0 - for (let user of allAdUsers) { + allAdUsers.forEach(async user => { const dbUser = await prisma.user.upsert({ where: { sAMAccountName: user.sAMAccountName @@ -318,7 +318,7 @@ class User { process.stdout.write( `\rImportando usuário ${i} de ${allAdUsers.length}.` ) - } + }) console.log('\nOK!') diff --git a/server/src/utils/wifiUtils.js b/server/src/utils/wifiUtils.js index 1c9c261..d5037ef 100644 --- a/server/src/utils/wifiUtils.js +++ b/server/src/utils/wifiUtils.js @@ -44,8 +44,8 @@ const updateDBWithOnlineDevices = async () => { status: 'OFFLINE' } }) - - for (let device of onlineDevices) { + + onlineDevices.forEach(async device => { const newDevice = { ...device, user: device.user ? { connect: { sAMAccountName: device.user } } : null @@ -60,7 +60,8 @@ const updateDBWithOnlineDevices = async () => { } catch (e) { console.log(e) } - } + }) + return true }