From 2bfad65f3f4ed0282f53e3ae01fc10c879a734bc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 10:03:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java
index 9bdae1d..9679f27 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/PwdFreeLoginTokenGranter.java
@@ -85,13 +85,14 @@
// 鏋勫缓鎺堟潈淇℃伅
User user = result.getData().getUser();
+ Kv detail = result.getData().getDetail();
+
+ if (Func.isEmpty(user) || Func.isEmpty(user.getId())) {
+ throw new InvalidGrantException("passwordfree grant failure, user is null");
+ }
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁琚仠鐢�
if(user.getUserStatus() == 1){
throw new InvalidGrantException(TokenUtil.USER_LOCK);
- }
- Kv detail = result.getData().getDetail();
- if (user == null || user.getId() == null) {
- throw new InvalidGrantException("passwordfree grant failure, user is null");
}
bladeUserDetails = new BladeUserDetails(user.getId(),
tenantId, result.getData().getOauthId(), user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(result.getData().getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
--
Gitblit v1.9.3