|
|
@@ -51,9 +51,12 @@ public class KeycloakServiceImpl implements KeycloakService {
|
|
|
KeycloakUserCO keycloakUserCo = new KeycloakUserCO();
|
|
|
keycloakUserCo.setId(user.getId());
|
|
|
keycloakUserCo.setEmail(user.getEmail());
|
|
|
- keycloakUserCo.setPhone(user.getAttributes().get("phone"));
|
|
|
- keycloakUserCo.setWechat(user.getAttributes().get("wechat"));
|
|
|
- keycloakUserCo.setWechatApplet(user.getAttributes().get("wechat-applet-openid"));
|
|
|
+ Map<String, List<String>> attributes = user.getAttributes();
|
|
|
+ if (attributes != null) {
|
|
|
+ keycloakUserCo.setPhone(attributes.get("phone"));
|
|
|
+ keycloakUserCo.setWechat(attributes.get("wechat"));
|
|
|
+ keycloakUserCo.setWechatApplet(attributes.get("wechat-applet-openid"));
|
|
|
+ }
|
|
|
keycloakUserCos.add(keycloakUserCo);
|
|
|
});
|
|
|
return keycloakUserCos;
|
|
|
@@ -75,9 +78,12 @@ public class KeycloakServiceImpl implements KeycloakService {
|
|
|
KeycloakUserCO keycloakUserCo = new KeycloakUserCO();
|
|
|
keycloakUserCo.setId(userRepresentation.getId());
|
|
|
keycloakUserCo.setEmail(userRepresentation.getEmail());
|
|
|
- keycloakUserCo.setPhone(userRepresentation.getAttributes().get("phone"));
|
|
|
- keycloakUserCo.setWechat(userRepresentation.getAttributes().get("wechat"));
|
|
|
- keycloakUserCo.setWechatApplet(userRepresentation.getAttributes().get("wechat-applet-openid"));
|
|
|
+ Map<String, List<String>> attributes = userRepresentation.getAttributes();
|
|
|
+ if (attributes != null) {
|
|
|
+ keycloakUserCo.setPhone(attributes.get("phone"));
|
|
|
+ keycloakUserCo.setWechat(attributes.get("wechat"));
|
|
|
+ keycloakUserCo.setWechatApplet(attributes.get("wechat-applet-openid"));
|
|
|
+ }
|
|
|
keycloakUserCos.add(keycloakUserCo);
|
|
|
}
|
|
|
});
|