Reorganize & Add DB Bootstrapping

This commit is contained in:
2021-01-12 17:06:27 -05:00
parent bc3b437ebc
commit fe932de37e
7 changed files with 49 additions and 40 deletions

View File

@@ -1,17 +1,14 @@
package auth
import (
"errors"
"gorm.io/gorm"
"golang.org/x/crypto/bcrypt"
log "github.com/sirupsen/logrus"
"reichard.io/imagini/internal/query"
"reichard.io/imagini/internal/models"
)
func authenticateLocalUser(user models.User, pw string) bool {
bPassword :=[]byte(pw)
err := bcrypt.CompareHashAndPassword([]byte(user.HashedPassword), bPassword)
err := bcrypt.CompareHashAndPassword([]byte(user.Password), bPassword)
if err == nil {
log.Info("[auth] Authentication successfull: ", user.Username)
return true
@@ -19,20 +16,3 @@ func authenticateLocalUser(user models.User, pw string) bool {
log.Warn("[auth] Authentication failed: ", user.Username)
return false
}
func CreateUser(db *gorm.DB, user models.User, pw string) error {
log.Info("[auth] Creating user: ", user.Username)
_, err := query.User(db, user)
if !errors.Is(err, gorm.ErrRecordNotFound) {
log.Warn("[auth] User already exists: ", user.Username)
return errors.New("User already exists")
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(pw), bcrypt.DefaultCost)
if err != nil {
log.Error(err)
return err
}
user.HashedPassword = string(hashedPassword)
return query.CreateUser(db, user)
}