Skip to content

Fix destroying of group #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mekanix merged 1 commit into from
Jan 8, 2026
Merged

Fix destroying of group #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion freenit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.3.22"
__version__ = "0.3.23"
4 changes: 2 additions & 2 deletions freenit/api/domain/ldap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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


Expand Down
3 changes: 2 additions & 1 deletion freenit/models/ldap/group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down