From 71d53daa90312f335b2bdc92a6c8d703870565fe Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Tue, 5 Jul 2022 15:37:39 +0800
Subject: [PATCH] login fail message

---
 .../src/main/java/org/maxkey/entity/Message.java   |  5 +++++
 .../org/maxkey/web/contorller/LoginEntryPoint.java |  5 +++++
 .../org/maxkey/web/contorller/LoginEntryPoint.java | 14 +++++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/maxkey-common/src/main/java/org/maxkey/entity/Message.java b/maxkey-common/src/main/java/org/maxkey/entity/Message.java
index fa251edf7..dbe748192 100644
--- a/maxkey-common/src/main/java/org/maxkey/entity/Message.java
+++ b/maxkey-common/src/main/java/org/maxkey/entity/Message.java
@@ -76,6 +76,11 @@ public class Message<T> {
 	public void setMessage(String message) {
 		this.message = message;
 	}
+	
+	public void setMessage(int code,String message) {
+		this.code = code;
+		this.message = message;
+	}
 
 	public T getData() {
 		return data;
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java
index 7be927b4c..b19b47423 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java
@@ -190,6 +190,11 @@ public class LoginEntryPoint {
 		 					(Integer)WebContext.getAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE));
 		 			authJwtMessage = new Message<AuthJwt>(authJwt);
 		 			
+		 		}else {//fail
+	 				String errorMsg = WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE) == null ? 
+							  "" : WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE).toString();
+	 				authJwtMessage.setMessage(errorMsg);
+	 				_logger.debug("login fail , message {}",errorMsg);
 		 		}
  	        }else {
  	        	_logger.error("Login AuthN type must eq normal , tfa or mobile . ");
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java
index c2eacc365..07d4c4262 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java
@@ -81,12 +81,20 @@ public class LoginEntryPoint {
  	
  	@RequestMapping(value={"/signin"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> signin( @RequestBody LoginCredential loginCredential) {
+ 		Message<AuthJwt> authJwtMessage = new Message<AuthJwt>(Message.FAIL);
  		if(authTokenService.validateJwtToken(loginCredential.getState())){
 	 		Authentication  authentication  = authenticationProvider.authenticate(loginCredential);
-	 		AuthJwt authJwt = authTokenService.genAuthJwt(authentication);
-	 		return new Message<AuthJwt>(authJwt).buildResponse();
+	 		if(authentication != null) {
+	 			AuthJwt authJwt = authTokenService.genAuthJwt(authentication);
+	 			authJwtMessage = new Message<AuthJwt>(authJwt);
+	 		}else {//fail
+ 				String errorMsg = WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE) == null ? 
+						  "" : WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE).toString();
+				authJwtMessage.setMessage(Message.FAIL,errorMsg);
+				_logger.debug("login fail , message {}",errorMsg);
+	 		}
  		}
- 		return new Message<AuthJwt>(Message.FAIL).buildResponse();
+ 		return authJwtMessage.buildResponse();
  	}
  	
 }
-- 
GitLab