From acee4380e938e940b824f4ad340887d17dac8125 Mon Sep 17 00:00:00 2001
From: thareekanvar <thareekanvar@gmail.com>
Date: Tue, 28 Feb 2023 08:58:00 +0530
Subject: [PATCH] fix

---
 server/auth.go         | 6 +++---
 web/src/pages/Auth.tsx | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/auth.go b/server/auth.go
index a5b68a1c..d2ff3308 100644
--- a/server/auth.go
+++ b/server/auth.go
@@ -31,10 +31,10 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		}
 		user, err := s.Store.FindUser(ctx, userFind)
 		if err != nil && common.ErrorCode(err) != common.NotFound {
-			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by username %s", signin.Username)).SetInternal(err)
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Your login credentials are incorrect please check")).SetInternal(err)
 		}
 		if user == nil {
-			return echo.NewHTTPError(http.StatusUnauthorized, fmt.Sprintf("User not found with username %s", signin.Username))
+			return echo.NewHTTPError(http.StatusUnauthorized, fmt.Sprintf("Your login credentials are incorrect please check"))
 		} else if user.RowStatus == api.Archived {
 			return echo.NewHTTPError(http.StatusForbidden, fmt.Sprintf("User has been archived with username %s", signin.Username))
 		}
@@ -42,7 +42,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
 		// Compare the stored hashed password, with the hashed version of the password that was received.
 		if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(signin.Password)); err != nil {
 			// If the two passwords don't match, return a 401 status.
-			return echo.NewHTTPError(http.StatusUnauthorized, "Incorrect password").SetInternal(err)
+			return echo.NewHTTPError(http.StatusUnauthorized, "Your login credentials are incorrect please check").SetInternal(err)
 		}
 
 		if err = setUserSession(c, user); err != nil {
diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsx
index 979cb0c9..59e201b4 100644
--- a/web/src/pages/Auth.tsx
+++ b/web/src/pages/Auth.tsx
@@ -63,11 +63,11 @@ const Auth = () => {
       if (user) {
         window.location.href = "/";
       } else {
-        toastHelper.error(t("message.login-failed"));
+        toastHelper.error(t("message.login-failed"),5000);
       }
     } catch (error: any) {
       console.error(error);
-      toastHelper.error(error.response.data.error);
+      toastHelper.error(error.response.data.error,5000);
     }
     actionBtnLoadingState.setFinish();
   };