|
8 | 8 | import java.util.Map;
|
9 | 9 |
|
10 | 10 | import org.apache.commons.collections4.MapUtils;
|
| 11 | +import org.apache.commons.lang.StringUtils; |
11 | 12 | import org.lowcoder.domain.user.model.AuthToken;
|
12 | 13 | import org.lowcoder.domain.user.model.AuthUser;
|
13 | 14 | import org.lowcoder.domain.user.model.User;
|
@@ -86,10 +87,16 @@ public static AuthToken mapToAuthToken(Map<String, Object> map, HashMap<String,
|
86 | 87 | * @return AuthUser
|
87 | 88 | */
|
88 | 89 | 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")); |
89 | 96 | 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) |
93 | 100 | .rawUserInfo(map)
|
94 | 101 | .build();
|
95 | 102 | }
|
|
0 commit comments