chore: signup user functionality.

puni9869 · Feb 18, 2024 · c4584b5 · c4584b5
1 parent f1bc9cd
commit c4584b5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/internal/signup/service.go b/internal/signup/service.go
@@ -28,18 +28,14 @@ type signupClient struct {
 func (s *signupClient) Register(c *gin.Context, user models.User) error {
 	ctx := middlewares.GetContext(c)
 	err := s.db.Create(&user).Error
-	if errors.Is(err, gorm.ErrDuplicatedKey) {
+	if err != nil {
 		s.log.WithError(err).Error("failed to create user")
 		ctx["Email_HasError"] = true
-		ctx["Email_Err"] = ErrDuplicateEmail.Error()
+		ctx["Email_Error"] = ErrDuplicateEmail.Error()
 		ctx["Password_HasError"] = false
 		ctx["ConfirmPassword_HasError"] = false
 		return ErrDuplicateEmail
 	}
-	if err != nil {
-		s.log.WithError(err).Error("failed to create user")
-		return err
-	}
 	s.log.Infoln("user is created successfully")
 	return nil
 }

diff --git a/pkg/formbinding/binding.go b/pkg/formbinding/binding.go
@@ -53,7 +53,6 @@ func Errorf(data gin.H, errs validator.ValidationErrors) map[string]any {
 	if len(errs) == 0 {
 		return nil
 	}
-	data["HasError"] = false
 	var f Field = new(FieldErrors)
 	for _, err := range errs {
 		data[err.Field()+"_Error"] = fmt.Sprintf("%s%s", err.Field(), f.Error(err.Tag()))

diff --git a/server/auth/signup.go b/server/auth/signup.go
@@ -43,6 +43,7 @@ func SignupPost(signUp signup.Service) gin.HandlerFunc {
 		ctx["email"] = email
 		ctx["password"] = password
 		ctx["confirm_password"] = confirmPassword
+
 		// password check
 		if ctx["Email_HasError"] == false || field.IsValid(password) == false {
 			ctx["Password_HasError"] = true
@@ -65,18 +66,10 @@ func SignupPost(signUp signup.Service) gin.HandlerFunc {
 			h.Write([]byte(password))
 			bs := h.Sum(nil)
 
-			user := models.User{
-				FirstName:       "",
-				LastName:        "",
-				DisplayName:     "",
-				Password:        fmt.Sprintf("%x", bs),
-				EmailVerifyHash: "",
-				IsEmailVerified: false,
-				IsActive:        false,
-				IsProfilePublic: false,
-				Email:           email,
-			}
-			if err := signUp.Register(c, user); err != nil {
+			user := models.User{Password: fmt.Sprintf("%x", bs), Email: email}
+
+			if err := signUp.Register(c, user); err == nil {
+				ctx["HasError"] = true
 				log.WithError(err).Error("error in registering user")
 			}
 		}

diff --git a/server/middlewares/form.go b/server/middlewares/form.go
@@ -29,10 +29,12 @@ func GetContext(c *gin.Context) gin.H {
 // BindForm binding a form obj to a handler's context data
 func BindForm[T any](_ T) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		c.Set(ContextKey, make(map[string]any))
+		data := make(map[string]any)
+		data["HasError"] = false
+		c.Set(ContextKey, data)
 		var theObj = new(T) // create a new form obj for every request but not use obj directly
 		if errs := c.ShouldBindWith(theObj, binding.Form); errs != nil {
-			data := formbinding.Errorf(make(gin.H), errs.(validator.ValidationErrors))
+			data = formbinding.Errorf(make(gin.H), errs.(validator.ValidationErrors))
 			c.Set(ContextKey, data)
 		}
 		c.Set(formKey, theObj)

diff --git a/templates/auth/signup.tmpl b/templates/auth/signup.tmpl
@@ -20,7 +20,7 @@
               value="{{.email}}"
               class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 px-3 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
             />
-            <p class="text-xs text-red-600 {{if .Email_HasError}}visible{{else}}hidden{{end}}">{{.Email_Error}}</p>
+            <p class="pt-1 text-xs text-red-600 {{if .Email_HasError}}visible{{else}}hidden{{end}}">{{.Email_Error}}</p>
           </div>
         </div>