Merge remote branch 'origin/master'

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;

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);