Merge pull request #187 from mekanix/group-destroy

Fix destroying of group

Author: mekanix

freenit/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.22"
+__version__ = "0.3.23"

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
 
 

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):