From 085b1492ccc92bdc7f03399918304773109e1493 Mon Sep 17 00:00:00 2001 From: Stavros Date: Fri, 24 Jan 2025 17:51:32 +0200 Subject: [PATCH] fix: ignore new lines in password file --- cmd/root.go | 3 +-- internal/utils/utils.go | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 3b3d61a..c0ba144 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -2,7 +2,6 @@ package cmd import ( "os" - "strings" cmd "tinyauth/cmd/user" "tinyauth/internal/api" "tinyauth/internal/auth" @@ -48,7 +47,7 @@ var rootCmd = &cobra.Command{ log.Info().Msg("Reading users from file") usersFromFile, readErr := utils.GetUsersFromFile(config.UsersFile) HandleError(readErr, "Failed to read users from file") - usersFromFileParsed := strings.Join(strings.Split(usersFromFile, "\n"), ",") + usersFromFileParsed := utils.ParseFileToLine(usersFromFile) if usersString != "" { usersString = usersString + "," + usersFromFileParsed } else { diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 239f3dc..3e4a79c 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -59,3 +59,18 @@ func GetUsersFromFile(usersFile string) (string, error) { return string(data), nil } + +func ParseFileToLine(content string) string { + lines := strings.Split(content, "\n") + users := make([]string, 0) + + for _, line := range lines { + if strings.TrimSpace(line) == "" { + continue + } + + users = append(users, line) + } + + return strings.Join(users, ",") +}