Return "nameAlreadyExists" error properly

When trying to create a user that already exist return a proper error, that clients can check for.
owncloud · May 24, 2022 · d322e50 · d322e50
1 parent a6f05e7
commit d322e50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/extensions/graph/pkg/identity/ldap.go b/extensions/graph/pkg/identity/ldap.go
@@ -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
 	}
 

diff --git a/extensions/graph/pkg/service/v0/users.go b/extensions/graph/pkg/service/v0/users.go
@@ -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
 	}