From 2bd7cdd3021c7b463adca5cb15795749afed2d76 Mon Sep 17 00:00:00 2001
From: "manuel.sowada" <manuel.sowada@mail.de>
Date: Fri, 8 May 2026 14:19:11 +0200
Subject: [PATCH] bugfixes

---
 src/models/authenticationModel.js      |  2 +-
 src/services/activeDirectoryManager.js |  2 +-
 src/services/rbacManager.js            | 25 ++++++++++++-------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/models/authenticationModel.js b/src/models/authenticationModel.js
index f3ef5e5..8797903 100644
--- a/src/models/authenticationModel.js
+++ b/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,
     },
diff --git a/src/services/activeDirectoryManager.js b/src/services/activeDirectoryManager.js
index 958dc9c..06760da 100644
--- a/src/services/activeDirectoryManager.js
+++ b/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'
diff --git a/src/services/rbacManager.js b/src/services/rbacManager.js
index db3b696..f9d1219 100644
--- a/src/services/rbacManager.js
+++ b/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.map(async (user) => {
-      user = {...user, userAccountControl_ID: user.userAccountControl};
-      const [record, created] = await auth.findOrCreate({
-        where: { dn: user.dn },
-        defaults: user
-      });
-
-      if (!created) {
-        await record.update(user);
-      }
-    })
-  );
+  all.forEach(async user => {
+    user.userAccountControl = user.userAccountControl_ID;
+    user.distinguishedName = user.distinguishedName;
 
+    await auth.upsert({
+      objectGUID: user.ObjectGUID,
+      ObjectSource_ID: 2,
+      userAccountControl_ID: user.userAccountControl,
+      mail: user.mail,
+      displayName: user.displayName
+    });
+  })
+  
   // return all;
 }