🐛 Fix login with incorrect username or password (#330)

* ✨ Add log field for sql caller * 🐛 Fix login with incorrect username or password
go-sigma · Mar 9, 2024 · ef12a26 · ef12a26
1 parent cf2cff4
commit ef12a26
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/pkg/middlewares/auth.go b/pkg/middlewares/auth.go
@@ -93,7 +93,7 @@ func AuthWithConfig(config AuthConfig) echo.MiddlewareFunc {
 					if config.DS {
 						return xerrors.NewDSError(c, xerrors.DSErrCodeUnauthorized)
 					}
-					return xerrors.NewHTTPError(c, xerrors.HTTPErrCodeUnauthorized, err.Error())
+					return xerrors.NewHTTPError(c, xerrors.HTTPErrCodeUnauthorized, "Username or password is not correct")
 				}
 				uid = user.ID
 
@@ -105,7 +105,7 @@ func AuthWithConfig(config AuthConfig) echo.MiddlewareFunc {
 					if config.DS {
 						return xerrors.NewDSError(c, xerrors.DSErrCodeUnauthorized)
 					}
-					return xerrors.NewHTTPError(c, xerrors.HTTPErrCodeUnauthorized)
+					return xerrors.NewHTTPError(c, xerrors.HTTPErrCodeUnauthorized, "Username or password is not correct")
 				}
 			case strings.HasPrefix(authorization, "Bearer"):
 				jti, uid, err = tokenService.Validate(ctx, strings.TrimSpace(strings.TrimPrefix(authorization, "Bearer")))

diff --git a/web/src/main.tsx b/web/src/main.tsx
@@ -18,11 +18,12 @@ import 'react-toastify/dist/ReactToastify.css';
 
 import './index.css';
 
-import ReactDOM from 'react-dom/client';
 import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
+import timezone from 'dayjs/plugin/timezone';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+import ReactDOM from 'react-dom/client';
 import { HashRouter as Router } from 'react-router-dom';
 
 import App from './App';

diff --git a/web/src/utils/refreshToken.ts b/web/src/utils/refreshToken.ts
@@ -19,7 +19,7 @@ import axios from "axios";
 
 let REFRESH_TOKEN_INTERVAL: ReturnType<typeof setInterval> | null;
 
-const REFRESH_TOKEN_INTERVAL_TIMEOUT = 60 * 10 * 1000; // 10 mins
+const REFRESH_TOKEN_INTERVAL_TIMEOUT = 6 * 10 * 1000 // 1 min
 
 export function refreshToken(
   localServer: string,

diff --git a/web/src/utils/request.ts b/web/src/utils/request.ts
@@ -21,7 +21,11 @@ export const setupAxiosInterceptor = (navigate: any) => {
     return response;
   }, error => {
     if (error?.response?.status === 401) {
-      navigate('/login');
+      if (error?.response?.config?.url?.endsWith("/api/v1/users/login")) {
+        return Promise.resolve(error?.response);
+      } else {
+        navigate('/login');
+      }
     } else if (error?.response?.status === 500) {
       return Promise.reject(error);
     } else {