chore: update utility commands

cmd/root.go

@@ -94,6 +94,7 @@ var rootCmd = &cobra.Command{
 			AppURL:          config.AppURL,
 			CookieSecure:    config.CookieSecure,
 			DisableContinue: config.DisableContinue,
+			CookieExpiry:    config.CookieExpiry,
 		}, hooks, auth, providers)
 
 		// Setup routes
@@ -125,8 +126,8 @@ func init() {
 	rootCmd.Flags().String("address", "0.0.0.0", "Address to bind the server to.")
 	rootCmd.Flags().String("secret", "", "Secret to use for the cookie.")
 	rootCmd.Flags().String("app-url", "", "The tinyauth URL.")
-	rootCmd.Flags().String("users", "", "Comma separated list of users in the format username:bcrypt-hashed-password.")
-	rootCmd.Flags().String("users-file", "", "Path to a file containing users in the format username:bcrypt-hashed-password.")
+	rootCmd.Flags().String("users", "", "Comma separated list of users in the format email:hash.")
+	rootCmd.Flags().String("users-file", "", "Path to a file containing users in the format email:hash.")
 	rootCmd.Flags().Bool("cookie-secure", false, "Send cookie over secure connection only.")
 	rootCmd.Flags().String("github-client-id", "", "Github OAuth client ID.")
 	rootCmd.Flags().String("github-client-secret", "", "Github OAuth client secret.")

cmd/user/create/create.go

@@ -12,7 +12,7 @@ import (
 )
 
 var interactive bool
-var username string
+var email string
 var password string
 var docker bool
 
@@ -24,9 +24,9 @@ var CreateCmd = &cobra.Command{
 		if interactive {
 			form := huh.NewForm(
 				huh.NewGroup(
-					huh.NewInput().Title("Username").Value(&username).Validate((func(s string) error {
+					huh.NewInput().Title("Email").Value(&email).Validate((func(s string) error {
 						if s == "" {
-							return errors.New("username cannot be empty")
+							return errors.New("email cannot be empty")
 						}
 						return nil
 					})),
@@ -49,11 +49,11 @@ var CreateCmd = &cobra.Command{
 			}
 		}
 
-		if username == "" || password == "" {
-			log.Error().Msg("Username and password cannot be empty")
+		if email == "" || password == "" {
+			log.Error().Msg("Email and password cannot be empty")
 		}
 
-		log.Info().Str("username", username).Str("password", password).Bool("docker", docker).Msg("Creating user")
+		log.Info().Str("email", email).Str("password", password).Bool("docker", docker).Msg("Creating user")
 
 		passwordByte, passwordErr := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
 
@@ -67,13 +67,13 @@ var CreateCmd = &cobra.Command{
 			passwordString = strings.ReplaceAll(passwordString, "$", "$$")
 		}
 
-		log.Info().Str("user", fmt.Sprintf("%s:%s", username, passwordString)).Msg("User created")
+		log.Info().Str("user", fmt.Sprintf("%s:%s", email, passwordString)).Msg("User created")
 	},
 }
 
 func init() {
 	CreateCmd.Flags().BoolVar(&interactive, "interactive", false, "Create a user interactively")
 	CreateCmd.Flags().BoolVar(&docker, "docker", false, "Format output for docker")
-	CreateCmd.Flags().StringVar(&username, "username", "", "Username")
+	CreateCmd.Flags().StringVar(&email, "email", "", "Email")
 	CreateCmd.Flags().StringVar(&password, "password", "", "Password")
 }

cmd/user/verify/verify.go

@@ -11,7 +11,7 @@ import (
 )
 
 var interactive bool
-var username string
+var email string
 var password string
 var docker bool
 var user string
@@ -19,20 +19,20 @@ var user string
 var VerifyCmd = &cobra.Command{
 	Use:   "verify",
 	Short: "Verify a user is set up correctly",
-	Long:  `Verify a user is set up correctly meaning that it has a correct password.`,
+	Long:  `Verify a user is set up correctly meaning that it has a correct email and password.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if interactive {
 			form := huh.NewForm(
 				huh.NewGroup(
-					huh.NewInput().Title("User (user:hash)").Value(&user).Validate((func(s string) error {
+					huh.NewInput().Title("User (email:hash)").Value(&user).Validate((func(s string) error {
 						if s == "" {
 							return errors.New("user cannot be empty")
 						}
 						return nil
 					})),
-					huh.NewInput().Title("Username").Value(&username).Validate((func(s string) error {
+					huh.NewInput().Title("Email").Value(&email).Validate((func(s string) error {
 						if s == "" {
-							return errors.New("username cannot be empty")
+							return errors.New("email cannot be empty")
 						}
 						return nil
 					})),
@@ -55,11 +55,11 @@ var VerifyCmd = &cobra.Command{
 			}
 		}
 
-		if username == "" || password == "" || user == "" {
-			log.Fatal().Msg("Username, password and user cannot be empty")
+		if email == "" || password == "" || user == "" {
+			log.Fatal().Msg("Email, password and user cannot be empty")
 		}
 
-		log.Info().Str("user", user).Str("username", username).Str("password", password).Bool("docker", docker).Msg("Verifying user")
+		log.Info().Str("user", user).Str("email", email).Str("password", password).Bool("docker", docker).Msg("Verifying user")
 
 		userSplit := strings.Split(user, ":")
 
@@ -73,8 +73,8 @@ var VerifyCmd = &cobra.Command{
 
 		verifyErr := bcrypt.CompareHashAndPassword([]byte(userSplit[1]), []byte(password))
 
-		if verifyErr != nil || username != userSplit[0] {
-			log.Fatal().Msg("Username or password incorrect")
+		if verifyErr != nil || email != userSplit[0] {
+			log.Fatal().Msg("Email or password incorrect")
 		} else {
 			log.Info().Msg("Verification successful")
 		}
@@ -84,7 +84,7 @@ var VerifyCmd = &cobra.Command{
 func init() {
 	VerifyCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Create a user interactively")
 	VerifyCmd.Flags().BoolVar(&docker, "docker", false, "Is the user formatted for docker?")
-	VerifyCmd.Flags().StringVar(&username, "username", "", "Username")
+	VerifyCmd.Flags().StringVar(&email, "email", "", "Email")
 	VerifyCmd.Flags().StringVar(&password, "password", "", "Password")
 	VerifyCmd.Flags().StringVar(&user, "user", "", "Hash (user:hash combination)")
 }

internal/api/api.go

@@ -55,20 +55,12 @@ func (api *API) Init() {
 
 	domain, domainErr := utils.GetRootURL(api.Config.AppURL)
 
-	log.Info().Str("domain", domain).Msg("Using domain for cookies")
-
 	if domainErr != nil {
 		log.Fatal().Err(domainErr).Msg("Failed to get domain")
 		os.Exit(1)
 	}
 
-	var isSecure bool
-
-	if api.Config.CookieSecure {
-		isSecure = true
-	} else {
-		isSecure = false
-	}
+	log.Info().Str("domain", domain).Msg("Using domain for cookies")
 
 	api.Domain = fmt.Sprintf(".%s", domain)
 
@@ -76,7 +68,7 @@ func (api *API) Init() {
 		Domain:   api.Domain,
 		Path:     "/",
 		HttpOnly: true,
-		Secure:   isSecure,
+		Secure:   api.Config.CookieSecure,
 		MaxAge:   api.Config.CookieExpiry,
 	})