github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote branch 'origin/master'

pull/105/merge M-2
Michael Jett 2012-07-10 17:00:30 -04:00
parent 30addb5439 9f16f309bd
commit 7a3ae5a757
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java
View File

@ -53,7 +53,8 @@ public class UserInfoUserDetailsService implements UserDetailsService {
authorities.add(ROLE_ADMIN); authorities.add(ROLE_ADMIN);
} }
User user = new User(userInfo.getUserId(), password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); // TODO: this should really be our own UserDetails wrapper class, shouldn't it?
User user = new User(userInfo.getPreferredUsername(), password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
return user; return user;
} else { } else {
return null; return null;

2
openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
View File

@ -106,7 +106,7 @@ public class JwkKeyListView extends AbstractView {
JsonObject o = new JsonObject(); JsonObject o = new JsonObject();
o.addProperty("use", "sig"); // since we don't do encryption yet o.addProperty("use", "sig"); // since we don't do encryption yet
o.addProperty("alg", rsaSigner.getAlgorithm()); // we know this is RSA o.addProperty("alg", "RSA"); //rsaSigner.getAlgorithm()); // we know this is RSA
o.addProperty("mod", m64); o.addProperty("mod", m64);
o.addProperty("exp", e64); o.addProperty("exp", e64);
o.addProperty("kid", keyId); o.addProperty("kid", keyId);