completed

Signed-off-by: PratikforCoding <kotalpratik@gmail.com>
PratikforCoding · Sep 21, 2023 · 4d7656a · 4d7656a
1 parent 3be138c
commit 4d7656a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/controllers/controller.go b/controllers/controller.go
@@ -131,14 +131,15 @@ func (apiCfg *APIConfig)getBusByName(name string) (bson.M, error) {
 	return bus, nil
 }
 
-func (apiCfg *APIConfig)createUser(email, password string) (bson.M, error) {
+func (apiCfg *APIConfig)createUser(username, email, password string) (bson.M, error) {
 	foundUser, err := apiCfg.getUser(email)
 	if err != nil {
 		hash, err := auth.HashedPassword(password)
 		if err != nil {
 			return nil, err
 		}
 		user := bson.M{
+			"username": username,
 			"email": email,
 			"password": hash,
 		}

diff --git a/controllers/handler.go b/controllers/handler.go
@@ -73,8 +73,10 @@ func (apiCfg *APIConfig)HandlerGetBusByName(w http.ResponseWriter, r *http.Reque
 
 func (apiCfg *APIConfig)HandlerCreateAccount(w http.ResponseWriter, r *http.Request) {
 	type parameters struct {
+		Username string `json:"username"`
 		Email string `json:"email"`
 		Password string `json:"password"`
+		ConfirmPassword string `json:"confpassword"`
 	}
 
 	decoder := json.NewDecoder(r.Body)
@@ -85,13 +87,19 @@ func (apiCfg *APIConfig)HandlerCreateAccount(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	user, err := apiCfg.createUser(params.Email, params.Password)
+	if params.Password != params.ConfirmPassword {
+		reply.RespondWtihError(w, http.StatusNotAcceptable, "confirm password correctly")
+		return
+	}
+
+	user, err := apiCfg.createUser(params.Username, params.Email, params.Password)
 	if err != nil {
 		reply.RespondWtihError(w, http.StatusConflict, "User already exists")
 		return
 	}
 	idStr := user["_id"].(primitive.ObjectID).Hex()
 	retUser := bson.M {
+		"username": user["username"].(string),
 		"email": user["email"].(string),
 		"id": idStr,
 	}
@@ -125,6 +133,7 @@ func (apiCfg *APIConfig)HandlerLogin(w http.ResponseWriter, r *http.Request) {
 	}
 	idStr := user["_id"].(primitive.ObjectID).Hex()
 	retUser := bson.M {
+		"username": user["username"].(string),
 		"email": user["email"].(string),
 		"id": idStr,
 	}

diff --git a/out b/out