diff --git a/backend/internal/controller/user_controller.go b/backend/internal/controller/user_controller.go index 95b7f19b..534e42fa 100644 --- a/backend/internal/controller/user_controller.go +++ b/backend/internal/controller/user_controller.go @@ -170,7 +170,7 @@ func (uc *UserController) getCurrentUserHandler(c *gin.Context) { // @Success 204 "No Content" // @Router /api/users/{id} [delete] func (uc *UserController) deleteUserHandler(c *gin.Context) { - if err := uc.userService.DeleteUser(c.Param("id")); err != nil { + if err := uc.userService.DeleteUser(c.Param("id"), false); err != nil { _ = c.Error(err) return } diff --git a/backend/internal/service/ldap_service.go b/backend/internal/service/ldap_service.go index dfd5e1c5..ce8282b4 100644 --- a/backend/internal/service/ldap_service.go +++ b/backend/internal/service/ldap_service.go @@ -289,7 +289,7 @@ func (s *LdapService) SyncUsers() error { // Delete users that no longer exist in LDAP for _, user := range ldapUsersInDb { if _, exists := ldapUserIDs[*user.LdapID]; !exists { - if err := s.userService.DeleteUser(user.ID); err != nil { + if err := s.userService.DeleteUser(user.ID, true); err != nil { log.Printf("Failed to delete user %s with: %v", user.Username, err) } else { log.Printf("Deleted user %s", user.Username) diff --git a/backend/internal/service/user_service.go b/backend/internal/service/user_service.go index fd318891..27add3ba 100644 --- a/backend/internal/service/user_service.go +++ b/backend/internal/service/user_service.go @@ -121,14 +121,14 @@ func (s *UserService) UpdateProfilePicture(userID string, file io.Reader) error return nil } -func (s *UserService) DeleteUser(userID string) error { +func (s *UserService) DeleteUser(userID string, allowLdapDelete bool) error { var user model.User if err := s.db.Where("id = ?", userID).First(&user).Error; err != nil { return err } // Disallow deleting the user if it is an LDAP user and LDAP is enabled - if user.LdapID != nil && s.appConfigService.DbConfig.LdapEnabled.IsTrue() { + if !allowLdapDelete && user.LdapID != nil && s.appConfigService.DbConfig.LdapEnabled.IsTrue() { return &common.LdapUserUpdateError{} }