Merge branch 'main' into f/admin_invitations

api/docs.md

@@ -203,6 +203,7 @@ This endpoint only returns the addresses of the organizations where the current
 | `400` | `40002` | `email malformed` |
 | `400` | `40003` | `password too short` |
 | `400` | `40004` | `malformed JSON body` |
+| `409` | `40901` | `duplicate conflict` |
 | `500` | `50002` | `internal server error` |
 
 ### ✅ Verify user

api/users.go

@@ -97,11 +97,11 @@ func (a *API) registerHandler(w http.ResponseWriter, r *http.Request) {
 	})
 	if err != nil {
 		if err == db.ErrAlreadyExists {
-			ErrMalformedBody.WithErr(err).Write(w)
+			ErrDuplicateConflict.With("user already exists").Write(w)
 			return
 		}
 		log.Warnw("could not create user", "error", err)
-		ErrGenericInternalServerError.Write(w)
+		ErrGenericInternalServerError.WithErr(err).Write(w)
 		return
 	}
 	// compose the new user and send the verification code
@@ -113,7 +113,7 @@ func (a *API) registerHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	if err := a.sendUserCode(r.Context(), newUser, db.CodeTypeAccountVerification); err != nil {
 		log.Warnw("could not send verification code", "error", err)
-		ErrGenericInternalServerError.Write(w)
+		ErrGenericInternalServerError.WithErr(err).Write(w)
 		return
 	}
 	// send the token back to the user

db/users.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -160,6 +161,9 @@ func (ms *MongoStorage) SetUser(user *User) (uint64, error) {
 		// if the user doesn't exist, create it setting the ID first
 		user.ID = nextID
 		if _, err := ms.users.InsertOne(ctx, user); err != nil {
+			if strings.Contains(err.Error(), "duplicate key error") {
+				return 0, ErrAlreadyExists
+			}
 			return 0, err
 		}
 	}

db/validations.go

@@ -20,7 +20,7 @@ var usersCollectionValidator = bson.M{
 			"email": bson.M{
 				"bsonType":    "string",
 				"description": "must be an email and is required",
-				"pattern":     `^[\w.\-]+@([\w\-]+\.)+[\w]{2,}$`,
+				"pattern":     `^[\w.\+\.\-]+@([\w\-]+\.)+[\w]{2,}$`,
 			},
 			"password": bson.M{
 				"bsonType":    "string",