mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-01 10:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Omitempty givenName attribute when creating user #5431

Browse Source
This commit is contained in:
Roman Perekhod
2023-05-09 12:29:19 +02:00
parent 233e406be4
commit 11e51b9812
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/fix-omitempty-givenName.md Normal file
View File

@@ -0,0 +1,6 @@
Bugfix: Fix the empty string givenName attribute when creating user
Omitempty givenName attribute when creating user
https://github.com/owncloud/ocis/issues/5431
https://github.com/owncloud/ocis/pull/6259

3
services/graph/pkg/identity/ldap.go
View File

@@ -784,7 +784,6 @@ func (i *LDAP) createUserModelFromLDAP(e *ldap.Entry) *libregraph.User {
if err != nil {
i.logger.Warn().Str("dn", e.DN).Str(i.userAttributeMap.id, e.GetAttributeValue(i.userAttributeMap.id)).Msg("Invalid User. Cannot convert UUID")
}
givenName := e.GetEqualFoldAttributeValue(i.userAttributeMap.givenName)
surname := e.GetEqualFoldAttributeValue(i.userAttributeMap.surname)
if id != "" && opsan != "" {
@@ -793,7 +792,7 @@ func (i *LDAP) createUserModelFromLDAP(e *ldap.Entry) *libregraph.User {
Mail: pointerOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.mail)),
OnPremisesSamAccountName: &opsan,
Id: &id,
GivenName: &givenName,
GivenName: pointerOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.givenName)),
Surname: &surname,
UserType: pointerOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.userType)),
AccountEnabled: booleanOrNil(e.GetEqualFoldAttributeValue(i.userAttributeMap.accountEnabled)),

3
services/graph/pkg/identity/ldap_test.go
View File

@@ -308,6 +308,7 @@ func TestUpdateUser(t *testing.T) {
displayName string
onPremisesSamAccountName string
accountEnabled *bool
givenName *string
userType *string
}
type args struct {
@@ -1441,7 +1442,7 @@ func TestUpdateUser(t *testing.T) {
DisplayName: &tt.want.displayName,
OnPremisesSamAccountName: &tt.want.onPremisesSamAccountName,
Surname: &emptyString,
GivenName: &emptyString,
GivenName: tt.want.givenName,
UserType: tt.want.userType,
}