From 3602d9b9a71dd57b0422fe08c30a67924ad35e78 Mon Sep 17 00:00:00 2001
From: Gucheng Wang <nomeguy@qq.com>
Date: Mon, 7 Mar 2022 15:15:59 +0800
Subject: [PATCH] fix: improve error messages

---
 controllers/application.go  | 3 ++-
 controllers/auth.go         | 2 +-
 controllers/user.go         | 4 ++--
 controllers/verification.go | 9 ++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/controllers/application.go b/controllers/application.go
index 1f89c704..a46d9ada 100644
--- a/controllers/application.go
+++ b/controllers/application.go
@@ -16,6 +16,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/astaxie/beego/utils/pagination"
 	"github.com/casdoor/casdoor/object"
@@ -85,7 +86,7 @@ func (c *ApiController) GetUserApplication() {
 	id := c.Input().Get("id")
 	user := object.GetUser(id)
 	if user == nil {
-		c.ResponseError("No such user.")
+		c.ResponseError(fmt.Sprintf("The user: %s doesn't exist", id))
 		return
 	}
 
diff --git a/controllers/auth.go b/controllers/auth.go
index ed1e0ede..05d34a6f 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -192,7 +192,7 @@ func (c *ApiController) Login() {
 
 			user = object.GetUserByFields(form.Organization, form.Username)
 			if user == nil {
-				c.ResponseError("No such user.")
+				c.ResponseError(fmt.Sprintf("The user: %s/%s doesn't exist", form.Organization, form.Username))
 				return
 			}
 		} else {
diff --git a/controllers/user.go b/controllers/user.go
index fab70139..f7a84841 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -190,7 +190,7 @@ func (c *ApiController) GetEmailAndPhone() {
 
 	user := object.GetUserByFields(form.Organization, form.Username)
 	if user == nil {
-		c.ResponseError("No such user.")
+		c.ResponseError(fmt.Sprintf("The user: %s/%s doesn't exist", form.Organization, form.Username))
 		return
 	}
 
@@ -226,7 +226,7 @@ func (c *ApiController) SetPassword() {
 
 	requestUserId := c.GetSessionUsername()
 	if requestUserId == "" {
-		c.ResponseError("Please login first.")
+		c.ResponseError("Please login first")
 		return
 	}
 
diff --git a/controllers/verification.go b/controllers/verification.go
index a7b68d20..18969d46 100644
--- a/controllers/verification.go
+++ b/controllers/verification.go
@@ -68,13 +68,12 @@ func (c *ApiController) SendVerificationCode() {
 	organization := object.GetOrganization(orgId)
 	application := object.GetApplicationByOrganizationName(organization.Name)
 
-	if checkUser == "true" && user == nil &&
-		object.GetUserByFields(organization.Name, dest) == nil {
-		c.ResponseError("No such user.")
+	if checkUser == "true" && user == nil && object.GetUserByFields(organization.Name, dest) == nil {
+		c.ResponseError("Please login first")
 		return
 	}
 
-	sendResp := errors.New("Invalid dest type.")
+	sendResp := errors.New("Invalid dest type")
 	switch destType {
 	case "email":
 		if !util.IsEmailValid(dest) {
@@ -121,7 +120,7 @@ func (c *ApiController) ResetEmailOrPhone() {
 
 	user := object.GetUser(userId)
 	if user == nil {
-		c.ResponseError("No such user.")
+		c.ResponseError(fmt.Sprintf("The user: %s doesn't exist", userId))
 		return
 	}