DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Cleaner params handling for users jwt cmd

Browse Source
This commit is contained in:
Denis Arh
2019-05-08 10:44:45 +02:00
parent e41b55324e
commit ac817a3e69
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
system/cli/users.go
View File

@@ -3,6 +3,7 @@ package cli
import (
"context"
"fmt"
"regexp"
"strconv"
"syscall"
@@ -145,16 +146,18 @@ func usersCmd(ctx context.Context, db *factory.DB) *cobra.Command {
userStr = args[0]
)
if user, err = userRepo.FindByEmail(userStr); !repository.ErrUserNotFound.Eq(err) {
exit(cmd, err)
} else if user == nil || user.ID == 0 {
if ID, err = strconv.ParseUint(userStr, 10, 64); err != nil {
exit(cmd, err)
} else if user, err = userRepo.FindByID(ID); err != nil {
exit(cmd, err)
if user, err = userRepo.FindByEmail(userStr); repository.ErrUserNotFound.Eq(err) {
if regexp.MustCompile(`/^\d+$/`).MatchString(userStr) {
if ID, err = strconv.ParseUint(userStr, 10, 64); err == nil {
user, err = userRepo.FindByID(ID)
}
}
}
if err != nil {
exit(cmd, err)
}
cmd.Println(auth.DefaultJwtHandler.Encode(user))
},
}