gitea/opengist
0
0
Fork 0
mirror of https://github.com/thomiceli/opengist.git synced 2025-07-12 19:01:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced model structs with DTOs

Browse Source
This commit is contained in:
Thomas Miceli
2023-03-17 14:56:39 +01:00
parent 42176c42c5
commit 167abd4ae5
10 changed files with 212 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/web/auth.go
View File

@ -22,35 +22,35 @@ func processRegister(ctx echo.Context) error {
sess := getSession(ctx)
var user = new(models.User)
if err := ctx.Bind(user); err != nil {
var dto = new(models.UserDTO)
if err := ctx.Bind(dto); err != nil {
return errorRes(400, "Cannot bind data", err)
}
if err := ctx.Validate(user); err != nil {
if err := ctx.Validate(dto); err != nil {
addFlash(ctx, validationMessages(&err), "error")
return html(ctx, "auth_form.html")
}
if exists, err := models.UserExists(dto.Username); err != nil || exists {
addFlash(ctx, "Username already exists", "error")
return html(ctx, "auth_form.html")
}
user := dto.ToUser()
password, err := argon2id.hash(user.Password)
if err != nil {
return errorRes(500, "Cannot hash password", err)
}
user.Password = password
var count int64
if err = models.DoesUserExists(user.Username, &count); err != nil || count >= 1 {
addFlash(ctx, "Username already exists", "error")
return html(ctx, "auth_form.html")
}
if err = models.CreateUser(user); err != nil {
if err = user.Create(); err != nil {
return errorRes(500, "Cannot create user", err)
}
if user.ID == 1 {
user.IsAdmin = true
if err = models.SetAdminUser(user); err != nil {
if err = user.SetAdmin(); err != nil {
return errorRes(500, "Cannot set user admin", err)
}
}
@ -68,15 +68,18 @@ func login(ctx echo.Context) error {
}
func processLogin(ctx echo.Context) error {
var err error
sess := getSession(ctx)
user := &models.User{}
if err := ctx.Bind(user); err != nil {
dto := &models.UserDTO{}
if err = ctx.Bind(dto); err != nil {
return errorRes(400, "Cannot bind data", err)
}
password := user.Password
password := dto.Password
if err := models.GetLoginUser(user); err != nil {
var user *models.User
if user, err = models.GetUserByUsername(dto.Username); err != nil {
addFlash(ctx, "Invalid credentials", "error")
return redirect(ctx, "/login")
}