camzalewski/personal-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added email field to user.

Browse source
This commit is contained in:
mikestefanello 2021-12-14 21:16:48 -05:00
parent dee7a13cba
commit 6ec1b77684
16 changed files with 410 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

6
routes/login.go
View file

@ -19,7 +19,7 @@ type (
}
LoginForm struct {
Username string `form:"username" validate:"required" label:"Username"`
Email string `form:"email" validate:"required,email" label:"Email address"`
Password string `form:"password" validate:"required" label:"Password"`
}
)
@ -54,7 +54,7 @@ func (l *Login) Post(c echo.Context) error {
// Attempt to load the user
u, err := l.Container.ORM.User.
Query().
Where(user.Username(l.form.Username)).
Where(user.Email(l.form.Email)).
First(c.Request().Context())
if err != nil {
@ -80,6 +80,6 @@ func (l *Login) Post(c echo.Context) error {
return fail("unable to log in user", err)
}
msg.Success(c, fmt.Sprintf("Welcome back, %s. You are now logged in.", u.Username))
msg.Success(c, fmt.Sprintf("Welcome back, %s. You are now logged in.", u.Name))
return l.Redirect(c, "home")
}

13
routes/register.go
View file

@ -15,8 +15,10 @@ type (
}
RegisterForm struct {
Username string `form:"username" validate:"required"`
Password string `form:"password" validate:"required"`
Name string `form:"name" validate:"required" label:"Name"`
Email string `form:"email" validate:"required,email" label:"Email address"`
Password string `form:"password" validate:"required" label:"Password"`
ConfirmPassword string `form:"password-confirm" validate:"required,eqfield=Password" label:"Confirm password"` // TODO validate same
}
)
@ -44,7 +46,7 @@ func (r *Register) Post(c echo.Context) error {
// Validate the form
if err := c.Validate(r.form); err != nil {
msg.Danger(c, "All fields are required.")
r.SetValidationErrorMessages(c, err, r.form)
return r.Get(c)
}
@ -57,7 +59,8 @@ func (r *Register) Post(c echo.Context) error {
// Attempt creating the user
u, err := r.Container.ORM.User.
Create().
SetUsername(r.form.Username).
SetName(r.form.Name).
SetEmail(r.form.Email).
SetPassword(pwHash).
Save(c.Request().Context())
@ -65,7 +68,7 @@ func (r *Register) Post(c echo.Context) error {
return fail("unable to create user", err)
}
c.Logger().Infof("user created: %s", u.Username)
c.Logger().Infof("user created: %s", u.Name)
err = auth.Login(c, u.ID)
if err != nil {