From 137f3bc151d6417ba3cc8362afec1e7457915ef5 Mon Sep 17 00:00:00 2001 From: KaibutsuX <36962438+KaibutsuX@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:06:10 -0400 Subject: [PATCH] chore: assume username instead of id when parsing fails for user commands (#87) Reviewed-On: https://github.com/go-vikunja/api/pull/87 --- pkg/cmd/user.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/user.go b/pkg/cmd/user.go index 38a8ea92951..13194b83564 100644 --- a/pkg/cmd/user.go +++ b/pkg/cmd/user.go @@ -100,12 +100,16 @@ func getPasswordFromFlagOrInput() (pw string) { } func getUserFromArg(s *xorm.Session, arg string) *user.User { + filter := user.User{} id, err := strconv.ParseInt(arg, 10, 64) if err != nil { - log.Fatalf("Invalid user id: %s", err) + log.Infof("Invalid user ID [%s], assuming username instead", arg) + filter.Username = arg + } else { + filter.ID = id } - u, err := user.GetUserWithEmail(s, &user.User{ID: id}) + u, err := user.GetUserWithEmail(s, &filter) if err != nil { log.Fatalf("Could not get user: %s", err) }