From 8ca78b95aa1633d2ccb5be9b0e2a54dcbb6438cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Thu, 8 Jan 2026 22:49:23 +0100 Subject: [PATCH] Fix destroying of group --- freenit/__init__.py | 2 +- freenit/api/domain/ldap.py | 4 ++-- freenit/models/ldap/group.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/freenit/__init__.py b/freenit/__init__.py index c3aa137..db42fed 100644 --- a/freenit/__init__.py +++ b/freenit/__init__.py @@ -1 +1 @@ -__version__ = "0.3.22" +__version__ = "0.3.23" diff --git a/freenit/api/domain/ldap.py b/freenit/api/domain/ldap.py index 6cb12dd..89bcbcd 100644 --- a/freenit/api/domain/ldap.py +++ b/freenit/api/domain/ldap.py @@ -81,7 +81,7 @@ async def post(name, data: GroupCreate, _: User = Depends(group_perms)) -> Group domain = await Domain.get(name) if data.name == "": raise HTTPException(status_code=409, detail="Name is mandatory") - group = Group.create(domain.ou, data.name) + group = Group.create(data.name, domain.ou) try: await group.save() except bonsai.errors.AlreadyExists: @@ -101,7 +101,7 @@ async def get(name, group, _: User = Depends(group_perms)) -> Group: async def delete(name, group, _: User = Depends(group_perms)) -> Group: domain = await Domain.get(name) gr = await Group.get(group, domain.ou) - gr.destroy() + await gr.destroy() return gr diff --git a/freenit/models/ldap/group.py b/freenit/models/ldap/group.py index 623eec4..c27e3c2 100644 --- a/freenit/models/ldap/group.py +++ b/freenit/models/ldap/group.py @@ -25,7 +25,7 @@ def from_entry(cls, entry): @classmethod def create(cls, name, domain): - group = cls(dn=config.ldap.groupDN.format(domain, name), cn=name, users=[]) + group = cls(dn=config.ldap.groupDN.format(name, domain), cn=name, users=[]) return group @classmethod @@ -66,6 +66,7 @@ async def save(self): data = LDAPEntry(self.dn) data["objectClass"] = config.ldap.groupClasses data["gidNumber"] = 0 + data["cn"] = self.cn await save_data(data) async def destroy(self):