mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-06 08:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return "nameAlreadyExists" error properly

Browse Source 
When trying to create a user that already exist return a proper
error, that clients can check for.
This commit is contained in:
Ralf Haferkamp
2022-05-24 08:51:07 +02:00
committed by Ralf Haferkamp
parent a6f05e761e
commit d322e50167
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/graph/pkg/identity/ldap.go
View File

@@ -161,6 +161,13 @@ func (i *LDAP) CreateUser(ctx context.Context, user libregraph.User) (*libregrap
ar.Attribute("sn", []string{sn})
if err := i.conn.Add(&ar); err != nil {
var lerr *ldap.Error
i.logger.Debug().Err(err).Msg("error adding user")
if errors.As(err, &lerr) {
if lerr.ResultCode == ldap.LDAPResultEntryAlreadyExists {
err = errorcode.New(errorcode.NameAlreadyExists, lerr.Error())
}
}
return nil, err
}

7
extensions/graph/pkg/service/v0/users.go
View File

@@ -117,7 +117,12 @@ func (g Graph) PostUser(w http.ResponseWriter, r *http.Request) {
}
if u, err = g.identityBackend.CreateUser(r.Context(), *u); err != nil {
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, err.Error())
var ecErr errorcode.Error
if errors.As(err, &ecErr) {
ecErr.Render(w, r)
} else {
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, err.Error())
}
return
}