Skip to content

Commit bf7b1fb

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
null name issue fixed
1 parent b510ebb commit bf7b1fb

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups)
340340
List<Map<String, String>> groups = tuple2.getT2();
341341
return UserDetail.builder()
342342
.id(user.getId())
343-
.name(user.getName())
343+
.name(StringUtils.isEmpty(user.getName())?user.getId():user.getName())
344344
.avatarUrl(user.getAvatarUrl())
345345
.uiLanguage(user.getUiLanguage())
346346
.email(convertEmail(user.getConnections()))

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.Map;
99

1010
import org.apache.commons.collections4.MapUtils;
11+
import org.apache.commons.lang.StringUtils;
1112
import org.lowcoder.domain.user.model.AuthToken;
1213
import org.lowcoder.domain.user.model.AuthUser;
1314
import org.lowcoder.domain.user.model.User;
@@ -86,10 +87,16 @@ public static AuthToken mapToAuthToken(Map<String, Object> map, HashMap<String,
8687
* @return AuthUser
8788
*/
8889
public static AuthUser mapToAuthUser(Map<String, Object> map, HashMap<String, String> sourceMappings) {
90+
String uid = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "uid"));
91+
String email = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "email"));
92+
String username = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "username"));
93+
if(StringUtils.isEmpty(username)) username = email;
94+
if(StringUtils.isEmpty(username)) username = uid;
95+
String avatar = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar"));
8996
return AuthUser.builder()
90-
.uid(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "uid")))
91-
.username(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "username")))
92-
.avatar(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar")))
97+
.uid(uid)
98+
.username(username)
99+
.avatar(avatar)
93100
.rawUserInfo(map)
94101
.build();
95102
}

0 commit comments

Comments
 (0)