SMQ-3001 - Fix issue token return error (#3004)

Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>

api/http/common.go

@@ -231,6 +231,7 @@ func EncodeError(_ context.Context, err error, w http.ResponseWriter) {
 		errors.Contains(err, apiutil.ErrMissingUserID),
 		errors.Contains(err, apiutil.ErrMissingPATID),
 		errors.Contains(err, apiutil.ErrMissingUsername),
+		errors.Contains(err, apiutil.ErrMissingUsernameEmail),
 		errors.Contains(err, apiutil.ErrMissingFirstName),
 		errors.Contains(err, apiutil.ErrMissingLastName),
 		errors.Contains(err, apiutil.ErrInvalidUsername),

api/http/util/errors.go

@@ -265,4 +265,7 @@ var (
 
 	// ErrInvalidRouteFormat indicates invalid route format.
 	ErrInvalidRouteFormat = errors.New("invalid route format")
+
+	// ErrMissingUsernameEmail indicates missing user name / email.
+	ErrMissingUsernameEmail = errors.New("missing username / email")
 )

pkg/sdk/tokens_test.go

@@ -85,7 +85,7 @@ func TestIssueToken(t *testing.T) {
 			svcRes:   &grpcTokenV1.Token{},
 			svcErr:   nil,
 			response: sdk.Token{},
-			err:      errors.NewSDKErrorWithStatus(errors.Wrap(apiutil.ErrValidation, apiutil.ErrMissingIdentity), http.StatusBadRequest),
+			err:      errors.NewSDKErrorWithStatus(errors.Wrap(apiutil.ErrValidation, apiutil.ErrMissingUsernameEmail), http.StatusBadRequest),
 		},
 		{
 			desc: "issue token with empty secret",

users/api/requests.go

@@ -253,7 +253,7 @@ type loginUserReq struct {
 
 func (req loginUserReq) validate() error {
 	if req.Username == "" {
-		return apiutil.ErrMissingIdentity
+		return apiutil.ErrMissingUsernameEmail
 	}
 	if req.Password == "" {
 		return apiutil.ErrMissingPass

users/api/requests_test.go

@@ -533,7 +533,7 @@ func TestLoginUserReqValidate(t *testing.T) {
 				Username: "",
 				Password: secret,
 			},
-			err: apiutil.ErrMissingIdentity,
+			err: apiutil.ErrMissingUsernameEmail,
 		},
 		{
 			desc: "empty secret",