Merge pull request #260 from systemli/Add-Command-to-create-User

🧑‍💻 Add Command to create User

cmd/db.go

@@ -4,7 +4,6 @@ import (
 	"github.com/asdine/storm"
 	"github.com/spf13/cobra"
 	"github.com/systemli/ticker/internal/legacy"
-	"github.com/systemli/ticker/internal/storage"
 )
 
 var (
@@ -27,19 +26,8 @@ var (
 			}
 			defer oldDb.Close()
 
-			db, err := storage.OpenGormDB(cfg.Database.Type, cfg.Database.DSN, log)
-			if err != nil {
-				log.WithError(err).Fatal("Unable to open the new database")
-			}
-
-			if err := storage.MigrateDB(db); err != nil {
-				log.WithError(err).Fatal("Unable to migrate the database")
-			}
-
 			legacyStorage := legacy.NewLegacyStorage(oldDb)
-			newStorage := storage.NewSqlStorage(db, cfg.UploadPath)
-
-			migration := legacy.NewMigration(legacyStorage, newStorage)
+			migration := legacy.NewMigration(legacyStorage, store)
 			if err := migration.Do(); err != nil {
 				log.WithError(err).Fatal("Unable to migrate the database")
 			}

cmd/root.go

@@ -9,11 +9,15 @@ import (
 	"github.com/systemli/ticker/internal/bridge"
 	"github.com/systemli/ticker/internal/config"
 	"github.com/systemli/ticker/internal/logger"
+	"github.com/systemli/ticker/internal/storage"
+	"gorm.io/gorm"
 )
 
 var (
 	configPath string
 	cfg        config.Config
+	db         *gorm.DB
+	store      *storage.SqlStorage
 
 	log = logrus.New()
 
@@ -42,11 +46,22 @@ func initConfig() {
 	}
 
 	log = logger.NewLogrus(cfg.LogLevel, cfg.LogFormat)
+
+	var err error
+	db, err = storage.OpenGormDB(cfg.Database.Type, cfg.Database.DSN, log)
+	if err != nil {
+		log.WithError(err).Fatal("could not connect to database")
+	}
+	store = storage.NewSqlStorage(db, cfg.UploadPath)
+	if err := storage.MigrateDB(db); err != nil {
+		log.WithError(err).Fatal("could not migrate database")
+	}
 }
 
 func Execute() {
 	rootCmd.AddCommand(runCmd)
 	rootCmd.AddCommand(dbCmd)
+	rootCmd.AddCommand(userCmd)
 	rootCmd.AddCommand(versionCmd)
 
 	if err := rootCmd.Execute(); err != nil {

cmd/run.go

@@ -8,11 +8,8 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/sethvargo/go-password/password"
 	"github.com/spf13/cobra"
 	"github.com/systemli/ticker/internal/api"
-	"github.com/systemli/ticker/internal/config"
-	"github.com/systemli/ticker/internal/storage"
 )
 
 var (
@@ -36,23 +33,12 @@ var (
 				log.Fatal(http.ListenAndServe(cfg.MetricsListen, nil))
 			}()
 
-			db, err := storage.OpenGormDB(cfg.Database.Type, cfg.Database.DSN, log)
-			if err != nil {
-				log.WithError(err).Fatal("could not connect to database")
-			}
-			store := storage.NewSqlStorage(db, cfg.UploadPath)
-			if err := storage.MigrateDB(db); err != nil {
-				log.WithError(err).Fatal("could not migrate database")
-			}
-
 			router := api.API(cfg, store, log)
 			server := &http.Server{
 				Addr:    cfg.Listen,
 				Handler: router,
 			}
 
-			firstRun(store, cfg)
-
 			go func() {
 				if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 					log.Fatal(err)
@@ -75,30 +61,3 @@ var (
 		},
 	}
 )
-
-func firstRun(store storage.Storage, config config.Config) {
-	count, err := store.CountUser()
-	if err != nil {
-		log.Fatal("error using database")
-	}
-
-	if count == 0 {
-		pw, err := password.Generate(24, 3, 3, false, false)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		user, err := storage.NewUser(config.Initiator, pw)
-		user.IsSuperAdmin = true
-		if err != nil {
-			log.Fatal("could not create first user")
-		}
-
-		err = store.SaveUser(&user)
-		if err != nil {
-			log.Fatal("could not persist first user")
-		}
-
-		log.WithField("email", user.Email).WithField("password", pw).Info("admin user created (change password now!)")
-	}
-}

cmd/user.go

@@ -0,0 +1,61 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/systemli/ticker/internal/storage"
+
+	pwd "github.com/sethvargo/go-password/password"
+)
+
+var (
+	email        string
+	password     string
+	isSuperAdmin bool
+
+	userCmd = &cobra.Command{
+		Use:   "user",
+		Short: "Manage users",
+		Long:  "Commands for managing users.",
+		Args:  cobra.ExactArgs(1),
+	}
+
+	userCreateCmd = &cobra.Command{
+		Use:   "create",
+		Short: "Create a new user",
+		Run: func(cmd *cobra.Command, args []string) {
+			var err error
+			if email == "" {
+				log.Fatal("email is required")
+			}
+			if password == "" {
+				password, err = pwd.Generate(24, 3, 3, false, false)
+				if err != nil {
+					log.WithError(err).Fatal("could not generate password")
+				}
+			}
+
+			user, err := storage.NewUser(email, password)
+			if err != nil {
+				log.WithError(err).Fatal("could not create user")
+			}
+			user.IsSuperAdmin = isSuperAdmin
+
+			if err := store.SaveUser(&user); err != nil {
+				log.WithError(err).Fatal("could not save user")
+			}
+
+			fmt.Printf("Created user %d\n", user.ID)
+			fmt.Printf("Password: %s\n", password)
+		},
+	}
+)
+
+func init() {
+	userCmd.AddCommand(userCreateCmd)
+
+	userCreateCmd.Flags().StringVar(&email, "email", "", "email address of the user")
+	userCreateCmd.Flags().StringVar(&password, "password", "", "password of the user")
+	userCreateCmd.Flags().BoolVar(&isSuperAdmin, "super-admin", false, "make the user a super admin")
+}

config.yml.dist

@@ -4,8 +4,6 @@ listen: "localhost:8080"
 log_level: "error"
 # log_format sets log format for logrus (default: json)
 log_format: "json"
-# initiator is the email for the first admin user (see password in logs)
-initiator: "[email protected]"
 # configuration for the database
 database:
     type: "sqlite" # postgres, mysql, sqlite

docs/configuration.md

@@ -7,8 +7,6 @@ listen: "localhost:8080"
 log_level: "error"
 # log_format sets log format for logrus (default: json)
 log_format: "json"
-# initiator is the email for the first admin user (see password in logs)
-initiator: "[email protected]"
 # configuration for the database
 database:
     type: "sqlite" # postgres, mysql, sqlite

docs/index.md

@@ -25,6 +25,10 @@ This repository contains the API for the [Systemli Ticker Project](https://www.s
 
         curl http://localhost:8080/healthz
 
+4. Create a user
+
+        go run . user create --email <email-address> --password <password> --super-admin
+
 ## Testing
 
 ```shell

internal/config/config.go

@@ -15,7 +15,6 @@ type Config struct {
 	Listen           string   `mapstructure:"listen"`
 	LogLevel         string   `mapstructure:"log_level"`
 	LogFormat        string   `mapstructure:"log_format"`
-	Initiator        string   `mapstructure:"initiator"`
 	Secret           string   `mapstructure:"secret"`
 	Database         Database `mapstructure:"database"`
 	TelegramBotToken string   `mapstructure:"telegram_bot_token"`
@@ -39,7 +38,6 @@ func NewConfig() Config {
 		Listen:        ":8080",
 		LogLevel:      "debug",
 		LogFormat:     "json",
-		Initiator:     "[email protected]",
 		Secret:        secret,
 		Database:      Database{Type: "sqlite", DSN: "ticker.db"},
 		MetricsListen: ":8181",
@@ -63,7 +61,6 @@ func LoadConfig(path string) Config {
 	viper.SetDefault("listen", c.Listen)
 	viper.SetDefault("log_level", c.LogLevel)
 	viper.SetDefault("log_format", c.LogFormat)
-	viper.SetDefault("initiator", c.Initiator)
 	viper.SetDefault("secret", c.Secret)
 	viper.SetDefault("database", c.Database)
 	viper.SetDefault("metrics_listen", c.MetricsListen)

internal/storage/sql_storage.go

@@ -21,13 +21,6 @@ func NewSqlStorage(db *gorm.DB, uploadPath string) *SqlStorage {
 	}
 }
 
-func (s *SqlStorage) CountUser() (int, error) {
-	var count int64
-	err := s.DB.Model(&User{}).Count(&count).Error
-
-	return int(count), err
-}
-
 func (s *SqlStorage) FindUsers() ([]User, error) {
 	users := make([]User, 0)
 	err := s.DB.Find(&users).Error

internal/storage/sql_storage_test.go

@@ -46,16 +46,6 @@ var _ = Describe("SqlStorage", func() {
 		db.Exec("DELETE FROM uploads")
 	})
 
-	Describe("CountUser", func() {
-		It("returns the number of users", func() {
-			Expect(store.CountUser()).To(Equal(0))
-
-			err := db.Create(&User{}).Error
-			Expect(err).ToNot(HaveOccurred())
-			Expect(store.CountUser()).To(Equal(1))
-		})
-	})
-
 	Describe("FindUsers", func() {
 		It("returns all users", func() {
 			users, err := store.FindUsers()

internal/storage/storage.go

@@ -9,7 +9,6 @@ import (
 var log = logrus.WithField("package", "storage")
 
 type Storage interface {
-	CountUser() (int, error)
 	FindUsers() ([]User, error)
 	FindUserByID(id int) (User, error)
 	FindUsersByIDs(ids []int) ([]User, error)

internal/storage/user.go

@@ -10,7 +10,7 @@ type User struct {
 	ID                int `gorm:"primaryKey"`
 	CreatedAt         time.Time
 	UpdatedAt         time.Time
-	Email             string `storm:"unique"`
+	Email             string `gorm:"uniqueIndex;not null"`
 	EncryptedPassword string
 	IsSuperAdmin      bool
 	Tickers           []Ticker `gorm:"many2many:ticker_users;"`