nikdoof/pocket-id
1
0
Fork 0
mirror of https://github.com/nikdoof/pocket-id.git synced 2025-12-14 15:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: non LDAP users get created with a empty LDAP ID string

Browse Source
This commit is contained in:
Elias Schneider
2025-01-20 10:27:36 +01:00
parent 715040ba04
commit 3f02d08109
6 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/internal/service/user_group_service.go
View File

@@ -62,7 +62,10 @@ func (s *UserGroupService) Create(input dto.UserGroupCreateDto) (group model.Use
group = model.UserGroup{ group = model.UserGroup{
FriendlyName: input.FriendlyName, FriendlyName: input.FriendlyName,
Name: input.Name, Name: input.Name,
LdapID: &input.LdapID, }
if input.LdapID != "" {
group.LdapID = &input.LdapID
} }
if err := s.db.Preload("Users").Create(&group).Error; err != nil { if err := s.db.Preload("Users").Create(&group).Error; err != nil {

5
backend/internal/service/user_service.go
View File

@@ -66,8 +66,11 @@ func (s *UserService) CreateUser(input dto.UserCreateDto) (model.User, error) {
Email: input.Email, Email: input.Email,
Username: input.Username, Username: input.Username,
IsAdmin: input.IsAdmin, IsAdmin: input.IsAdmin,
LdapID: &input.LdapID,
} }
if input.LdapID != "" {
user.LdapID = &input.LdapID
}
if err := s.db.Create(&user).Error; err != nil { if err := s.db.Create(&user).Error; err != nil {
if errors.Is(err, gorm.ErrDuplicatedKey) { if errors.Is(err, gorm.ErrDuplicatedKey) {
return model.User{}, s.checkDuplicatedFields(user) return model.User{}, s.checkDuplicatedFields(user)

2
backend/resources/migrations/postgres/20250120102531_fix_empy_ldap_id_string.down.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE users SET ldap_id = '' WHERE ldap_id IS NULL;
UPDATE user_groups SET ldap_id = '' WHERE ldap_id IS NULL;

2
backend/resources/migrations/postgres/20250120102531_fix_empy_ldap_id_string.up.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE users SET ldap_id = null WHERE ldap_id = '';
UPDATE user_groups SET ldap_id = null WHERE ldap_id = '';

2
backend/resources/migrations/sqlite/20250120102531_fix_empy_ldap_id_string.down.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE users SET ldap_id = '' WHERE ldap_id IS NULL;
UPDATE user_groups SET ldap_id = '' WHERE ldap_id IS NULL;

2
backend/resources/migrations/sqlite/20250120102531_fix_empy_ldap_id_string.up.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE users SET ldap_id = null WHERE ldap_id = '';
UPDATE user_groups SET ldap_id = null WHERE ldap_id = '';