From b0a7ebd9b154544c0eb674b7d27ca84c24fc4cce Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 10 Jul 2012 14:56:44 -0400 Subject: [PATCH 1/2] fixed JWK algorithm display --- .../main/java/org/mitre/openid/connect/view/JwkKeyListView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java index 8467e5cd1..f1895e744 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java @@ -106,7 +106,7 @@ public class JwkKeyListView extends AbstractView { JsonObject o = new JsonObject(); 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("exp", e64); o.addProperty("kid", keyId); From 9f16f309bdee53c42040c4e731925e41fbad86ee Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 10 Jul 2012 16:44:29 -0400 Subject: [PATCH 2/2] updated userinfouserdetailsservice to use username instead of userid -- this should actually be a wrapper class though --- .../connect/service/impl/UserInfoUserDetailsService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java index 11b73364b..f4e252b83 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UserInfoUserDetailsService.java @@ -53,7 +53,8 @@ public class UserInfoUserDetailsService implements UserDetailsService { 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; } else { return null;