libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #2569 from stianst/KEYCLOAK-2766

Browse source 
KEYCLOAK-2766 Add missing id to AuthenticatorConfigRepresentation
This commit is contained in:
Stian Thorgersen 2016-04-11 08:35:30 +02:00
commit dccc338622
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/main/java/org/keycloak/representations/idm/AuthenticatorConfigRepresentation.java
View file

@ -27,9 +27,17 @@ import java.util.Map;
*/ */
public class AuthenticatorConfigRepresentation implements Serializable { public class AuthenticatorConfigRepresentation implements Serializable {
private String id;
private String alias; private String alias;
private Map<String, String> config = new HashMap<String, String>(); private Map<String, String> config = new HashMap<String, String>();
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getAlias() { public String getAlias() {
return alias; return alias;
@ -39,8 +47,6 @@ public class AuthenticatorConfigRepresentation implements Serializable {
this.alias = alias; this.alias = alias;
} }
public Map<String, String> getConfig() { public Map<String, String> getConfig() {
return config; return config;
} }

1
server-spi/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
View file

@ -717,6 +717,7 @@ public class ModelToRepresentation {
public static AuthenticatorConfigRepresentation toRepresentation(AuthenticatorConfigModel model) { public static AuthenticatorConfigRepresentation toRepresentation(AuthenticatorConfigModel model) {
AuthenticatorConfigRepresentation rep = new AuthenticatorConfigRepresentation(); AuthenticatorConfigRepresentation rep = new AuthenticatorConfigRepresentation();
rep.setId(model.getId());
rep.setAlias(model.getAlias()); rep.setAlias(model.getAlias());
rep.setConfig(model.getConfig()); rep.setConfig(model.getConfig());
return rep; return rep;