|
|
@ -265,7 +265,7 @@ public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements |
|
|
|
writer.beginObject(); |
|
|
|
writer.beginObject(); |
|
|
|
writer.name("name").value(holder.getUserAuth().getName()); |
|
|
|
writer.name("name").value(holder.getUserAuth().getName()); |
|
|
|
writer.name("sourceClass").value(holder.getUserAuth().getSourceClass()); |
|
|
|
writer.name("sourceClass").value(holder.getUserAuth().getSourceClass()); |
|
|
|
|
|
|
|
writer.name("authenticated").value(holder.getUserAuth().isAuthenticated()); |
|
|
|
writer.name("authorities"); |
|
|
|
writer.name("authorities"); |
|
|
|
writer.beginArray(); |
|
|
|
writer.beginArray(); |
|
|
|
for (GrantedAuthority authority : holder.getUserAuth().getAuthorities()) { |
|
|
|
for (GrantedAuthority authority : holder.getUserAuth().getAuthorities()) { |
|
|
@ -682,8 +682,7 @@ public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements |
|
|
|
if (reader.peek() == JsonToken.NULL) { |
|
|
|
if (reader.peek() == JsonToken.NULL) { |
|
|
|
reader.skipValue(); |
|
|
|
reader.skipValue(); |
|
|
|
} else if (name.equals("id")) { |
|
|
|
} else if (name.equals("id")) { |
|
|
|
ahe.setId(reader.nextLong()); |
|
|
|
currentId = reader.nextLong(); |
|
|
|
currentId = ahe.getId(); |
|
|
|
|
|
|
|
} else if (name.equals("requestParameters")) { |
|
|
|
} else if (name.equals("requestParameters")) { |
|
|
|
ahe.setRequestParameters(readMap(reader)); |
|
|
|
ahe.setRequestParameters(readMap(reader)); |
|
|
|
} else if (name.equals("clientId")) { |
|
|
|
} else if (name.equals("clientId")) { |
|
|
@ -751,6 +750,8 @@ public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements |
|
|
|
savedUserAuth.setName(reader.nextString()); |
|
|
|
savedUserAuth.setName(reader.nextString()); |
|
|
|
} else if (name.equals("sourceClass")) { |
|
|
|
} else if (name.equals("sourceClass")) { |
|
|
|
savedUserAuth.setSourceClass(reader.nextString()); |
|
|
|
savedUserAuth.setSourceClass(reader.nextString()); |
|
|
|
|
|
|
|
} else if (name.equals("authenticated")) { |
|
|
|
|
|
|
|
savedUserAuth.setAuthenticated(reader.nextBoolean()); |
|
|
|
} else if (name.equals("authorities")) { |
|
|
|
} else if (name.equals("authorities")) { |
|
|
|
Set<String> authorityStrs = readSet(reader); |
|
|
|
Set<String> authorityStrs = readSet(reader); |
|
|
|
Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>(); |
|
|
|
Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>(); |
|
|
|