Skip to content

Commit f8d7a39

Browse files
committed
Remove redundant check remaining team memberships
1 parent 6d21c2b commit f8d7a39

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

services/auth/source/ldap/source_group_sync.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,5 @@ func removeMappedMemberships(user *user_model.User, ldapTeamRemove map[string][]
9696
log.Error("LDAP group sync: Could not remove user from team: %v", err)
9797
}
9898
}
99-
if remainingTeams, err := models.GetUserOrgTeams(org.ID, user.ID); err == nil && len(remainingTeams) == 0 {
100-
// only remove organization membership when no team memberships are left for this organization
101-
if isMember, err := models.IsOrganizationMember(org.ID, user.ID); isMember && err == nil {
102-
log.Trace("LDAP group sync: removing user [%s] from organization [%s]", user.Name, org.Name)
103-
} else {
104-
continue
105-
}
106-
err = org.RemoveMember(user.ID)
107-
if err != nil {
108-
log.Error("LDAP group sync: Could not remove user from organization: %v", err)
109-
}
110-
} else if err != nil {
111-
log.Error("LDAP group sync: Could not find users [id: %d] teams for given organization [%s]", user.ID, org.Name)
112-
}
11399
}
114100
}

0 commit comments

Comments
 (0)