🐛 Add missing self-titled user group

alan-turing-institute · Feb 23, 2024 · 52f4436 · 52f4436
1 parent b55d3a2
commit 52f4436
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/apricot/models/ldap_posix_group.py b/apricot/models/ldap_posix_group.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel, validator
 
-ID_MIN = 3000
+ID_MIN = 2000
 ID_MAX = 4294967295
 
 

diff --git a/apricot/oauth/oauth_client.py b/apricot/oauth/oauth_client.py
@@ -121,7 +121,14 @@ def validated_groups(self) -> list[LDAPAttributeDict]:
         Validate output via pydantic and return a list of LDAPAttributeDict
         """
         output = []
-        for group_dict in self.groups():
+        # Add one self-titled group for each user
+        user_group_dicts = []
+        for user_dict in self.users():
+            user_dict["memberUid"] = [user_dict["uid"]]
+            user_dict["member"] = [f"CN={user_dict['uid']},OU=users,{self.root_dn}"]
+            user_group_dicts.append(user_dict)
+        # Iterate over groups and validate them
+        for group_dict in self.groups() + user_group_dicts:
             try:
                 attributes = {"objectclass": ["top"]}
                 # Add 'groupOfNames' attributes