bugfixes

src/models/authenticationModel.js

@@ -5,7 +5,7 @@ module.exports = (sequelize) => {
   const Authentication = sequelize.define('Authentication', {
     ObjectGUID: {
       type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
+      defaultValue: DataTypes.UUID,
       primaryKey: true,
       allowNull: false,
     },

src/services/activeDirectoryManager.js

@@ -61,7 +61,7 @@ class ActiveDirectoryManager {
     const options = {
       baseDN: this.ad.baseDN,
       filter: '(&(objectClass=user)(objectCategory=person))',
-      attributes: ['ObjectGUID'
+      attributes: ['objectGUID'
       ,'sAMAccountName'
       ,'mail'
       ,'givenName'

src/services/rbacManager.js

@@ -253,20 +253,19 @@ async syncAuthByActiveDirectory() {
   const auth = await this.db.get('authentication');
   const all = await this.service.get('activeDirectoryManager').getAllUsers();
 
-  await Promise.all(
+  all.forEach(async user => {
-    all.map(async (user) => {
+    user.userAccountControl = user.userAccountControl_ID;
-      user = {...user, userAccountControl_ID: user.userAccountControl};
+    user.distinguishedName = user.distinguishedName;
-      const [record, created] = await auth.findOrCreate({
-        where: { dn: user.dn },
-        defaults: user
-      });
-
-      if (!created) {
-        await record.update(user);
-      }
-    })
-  );
 
+    await auth.upsert({
+      objectGUID: user.ObjectGUID,
+      ObjectSource_ID: 2,
+      userAccountControl_ID: user.userAccountControl,
+      mail: user.mail,
+      displayName: user.displayName
+    });
+  })
+  
   // return all;
 }