opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-22 20:00:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(provisionmanage.go): make RemoveMemberDomain generic

Browse Source 
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
This commit is contained in:
Felix Gateru
2026-02-03 11:24:16 +03:00
committed by nyagamunene
parent c669f7c9a4
commit 0ff4e4e4fa
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/roles/provisionmanage.go
+20 -24
View File
@@ -228,32 +228,28 @@ func (r ProvisionManageService) AddNewEntitiesRoles(ctx context.Context, domainI
}
func (r ProvisionManageService) RemoveMemberFromDomain(ctx context.Context, domainID, memberID string) error {
switch r.entityType {
case policies.ClientType,
policies.ChannelType,
policies.GroupType:
role, err := r.repo.RetrieveRoleByDomainMember(ctx, domainID, memberID)
if err != nil {
return errors.Wrap(svcerr.ErrRemoveEntity, err)
}
pr := policies.Policy{
ObjectType: policies.RoleType,
Object: role,
SubjectType: policies.UserType,
}
if err := r.policy.DeletePolicyFilter(ctx, pr); err != nil {
return errors.Wrap(svcerr.ErrDeletePolicies, err)
}
if err := r.repo.RemoveMemberFromDomain(ctx, domainID, memberID); err != nil {
return err
}
return nil
default:
if r.entityType == policies.DomainType {
return errInvalidOperation
}
role, err := r.repo.RetrieveRoleByDomainMember(ctx, domainID, memberID)
if err != nil {
return errors.Wrap(svcerr.ErrRemoveEntity, err)
}
pr := policies.Policy{
ObjectType: policies.RoleType,
Object: role,
SubjectType: policies.UserType,
}
if err := r.policy.DeletePolicyFilter(ctx, pr); err != nil {
return errors.Wrap(svcerr.ErrDeletePolicies, err)
}
if err := r.repo.RemoveMemberFromDomain(ctx, domainID, memberID); err != nil {
return err
}
return nil
}
func (r ProvisionManageService) AddRole(ctx context.Context, session authn.Session, entityID string, roleName string, optionalActions []string, optionalMembers []string) (retRoleProvision RoleProvision, retErr error) {