From 97546213079adbb6355896de51f10ef9366784df Mon Sep 17 00:00:00 2001
From: Florent Gluck <florent.gluck@hesge.ch>
Date: Fri, 13 Dec 2024 17:05:38 +0100
Subject: [PATCH] minor changes
---
src/client/cmdToken/tokenRefresh.go | 2 +-
src/client/cmdUser/userCreate.go | 12 ++++++------
src/libclient/user/userCreate.go | 1 -
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/client/cmdToken/tokenRefresh.go b/src/client/cmdToken/tokenRefresh.go
index 5c75abe..984a220 100644
--- a/src/client/cmdToken/tokenRefresh.go
+++ b/src/client/cmdToken/tokenRefresh.go
@@ -35,7 +35,7 @@ func (cmd *Refresh) Run(args []string) int {
token, err := login.RefreshToken()
if err != nil {
- u.PrintlnErr("Error: " + err.Error())
+ u.PrintlnErr(err)
return 1
}
diff --git a/src/client/cmdUser/userCreate.go b/src/client/cmdUser/userCreate.go
index 7eb23ac..14e39b8 100644
--- a/src/client/cmdUser/userCreate.go
+++ b/src/client/cmdUser/userCreate.go
@@ -78,7 +78,7 @@ func (cmd *Add) Run(args []string) int {
}
if err := libclient.UserCreate(*p); err != nil {
- u.PrintlnErr("FAILED creating user " + p.Email + ": " + err.Error())
+ u.PrintlnErr("Failed creating user " + p.Email + ": " + err.Error())
statusCode = 1
} else {
u.Println("Successfully created user " + p.Email)
@@ -88,7 +88,7 @@ func (cmd *Add) Run(args []string) int {
csvFile := args[0]
file, err := os.Open(csvFile)
if err != nil {
- u.PrintlnErr("Error: " + err.Error())
+ u.PrintlnErr(err)
return 1
}
defer file.Close()
@@ -103,20 +103,20 @@ func (cmd *Add) Run(args []string) int {
break
}
if err != nil {
- u.PrintlnErr("FAILED reading " + err.Error())
+ u.PrintlnErr("Failed reading " + err.Error())
continue
}
columnCount := len(columns)
if columnCount < 5 {
- u.PrintlnErr("FAILED reading record on line ", line, ": expecting 5 columns")
+ u.PrintlnErr("Failed reading record on line ", line, ": expecting 5 columns")
statusCode = 1
continue
}
email := columns[0]
if !u.IsEmail(email) {
- u.PrintlnErr("FAILED reading record on line ", line, ": ", email, " is not a valid email")
+ u.PrintlnErr("Failed reading record on line ", line, ": ", email, " is not a valid email")
statusCode = 1
continue
}
@@ -137,7 +137,7 @@ func (cmd *Add) Run(args []string) int {
}
if err := libclient.UserCreate(*p); err != nil {
- u.PrintlnErr("FAILED creating user " + p.Email + ": " + err.Error())
+ u.PrintlnErr("Failed creating user " + p.Email + ": " + err.Error())
statusCode = 1
} else {
u.Println("Successfully created user " + p.Email)
diff --git a/src/libclient/user/userCreate.go b/src/libclient/user/userCreate.go
index 616aaa4..d5a770a 100644
--- a/src/libclient/user/userCreate.go
+++ b/src/libclient/user/userCreate.go
@@ -14,7 +14,6 @@ func UserCreate(p params.UserWithPwd) error {
if err != nil {
return err
}
-
if resp.IsSuccess() {
return nil
} else {
--
GitLab