Basic Access & Refresh Token

internal/db/db.go

@@ -4,7 +4,7 @@ import (
 	"path"
 
 	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
+	// "gorm.io/gorm/logger"
 	"gorm.io/driver/sqlite"
     log "github.com/sirupsen/logrus"
 
@@ -19,7 +19,7 @@ type DBManager struct {
 func NewMgr(c *config.Config) *DBManager {
     gormConfig := &gorm.Config{
         PrepareStmt: true,
-        Logger: logger.Default.LogMode(logger.Silent),
+        // Logger: logger.Default.LogMode(logger.Silent),
     }
 
     // Create manager
@@ -52,7 +52,7 @@ func NewMgr(c *config.Config) *DBManager {
 
 func (dbm *DBManager) bootstrapDatabase() {
     log.Info("[query] Bootstrapping database.")
-    err := dbm.CreateUser(models.User{
+    _, err := dbm.CreateUser(models.User{
         Username: "admin",
         Password: "admin",
         AuthType: "Local",

internal/db/devices.go

@@ -1,31 +1,17 @@
 package db
 
 import (
-    "errors"
-	"gorm.io/gorm"
-    "golang.org/x/crypto/bcrypt"
+    "github.com/google/uuid"
     log "github.com/sirupsen/logrus"
 
 	"reichard.io/imagini/internal/models"
 )
 
-func (dbm *DBManager) CreateDevice(device models.Device) error {
+func (dbm *DBManager) CreateDevice(device models.Device) (models.Device, error) {
     log.Info("[query] Creating device: ", device.Name)
-    _, err := dbm.Device(device)
-    if !errors.Is(err, gorm.ErrRecordNotFound) {
-        log.Warn("[query] Device already exists: ", device.Name)
-        return errors.New("Device already exists")
-    }
-
-    // Generate random password
-    refreshToken := "asd123"
-    hashedToken, err := bcrypt.GenerateFromPassword([]byte(refreshToken), bcrypt.DefaultCost)
-    if err != nil {
-        log.Error(err)
-        return err
-    }
-    device.RefreshToken = string(hashedToken)
-    return dbm.db.Create(&device).Error
+    device.RefreshKey = uuid.New().String()
+    err := dbm.db.Create(&device).Error
+    return device, err
 }
 
 func (dbm *DBManager) Device (device models.Device) (models.Device, error) {

internal/db/users.go

@@ -1,29 +1,22 @@
 package db
 
 import (
-    "errors"
-	"gorm.io/gorm"
     "golang.org/x/crypto/bcrypt"
     log "github.com/sirupsen/logrus"
 
 	"reichard.io/imagini/internal/models"
 )
 
-func (dbm *DBManager) CreateUser(user models.User) error {
+func (dbm *DBManager) CreateUser(user models.User) (models.User, error) {
     log.Info("[query] Creating user: ", user.Username)
-    _, err := dbm.User(user)
-    if !errors.Is(err, gorm.ErrRecordNotFound) {
-        log.Warn("[query] User already exists: ", user.Username)
-        return errors.New("User already exists")
-    }
-
     hashedPassword, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
     if err != nil {
         log.Error(err)
-        return err
+        return user, err
     }
     user.Password = string(hashedPassword)
-    return dbm.db.Create(&user).Error
+    err = dbm.db.Create(&user).Error
+    return user, err
 }
 
 func (dbm *DBManager) User (user models.User) (models.User, error) {