lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-05-14 09:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复某些情况下AuthorizationFailedEvent事件不触发的问题

Browse Source
This commit is contained in:
zhou-hao
2020-07-20 17:47:26 +08:00
parent d66f0946e1
commit ee50a4f4ec
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/AuthorizationController.java
View File

@@ -85,15 +85,18 @@ public class AuthorizationController {
private Mono<Map<String, Object>> doLogin(Mono<Map<String, Object>> parameter) {
return parameter.flatMap(parameters -> {
String username = (String) parameters.get("username");
String password = (String) parameters.get("password");
String username_ = (String) parameters.get("username");
String password_ = (String) parameters.get("password");
Assert.hasLength(username, "用户名不能为空");
Assert.hasLength(password, "密码不能为空");
Assert.hasLength(username_, "用户名不能为空");
Assert.hasLength(password_, "密码不能为空");
AuthorizationFailedEvent.Reason reason = AuthorizationFailedEvent.Reason.OTHER;
Function<String, Object> parameterGetter = parameters::get;
try {
return Mono.defer(() -> {
String username = username_;
String password = password_;
AuthorizationDecodeEvent decodeEvent = new AuthorizationDecodeEvent(username, password, parameterGetter);
eventPublisher.publishEvent(decodeEvent);
username = decodeEvent.getUsername();
@@ -111,12 +114,12 @@ public class AuthorizationController {
eventPublisher.publishEvent(event);
return event.getResult();
});
} catch (Exception e) {
AuthorizationFailedEvent failedEvent = new AuthorizationFailedEvent(username, password, parameterGetter, reason);
failedEvent.setException(e);
}).onErrorResume(err -> {
AuthorizationFailedEvent failedEvent = new AuthorizationFailedEvent(username_, password_, parameterGetter, reason);
failedEvent.setException(err);
eventPublisher.publishEvent(failedEvent);
return Mono.error(failedEvent.getException());
}
});
});
}