Justin Richer
							
						 | 
						
							
							
							
							
								
							
								99f2d25fcb
								
							
								
							
						 | 
						
							
							
								
								merged upstream
							
							
							
							
							
						 | 
						
							2012-06-13 16:35:48 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								2e4821e3ed
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:mitreid-connect/OpenID-Connect-Java-Spring-Server
							
							
							
							
							
						 | 
						
							2012-06-13 16:34:51 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								ace5dd1f1e
								
							
								
							
						 | 
						
							
							
								
								imported userinfouserdetails filter from MITRE codebase
							
							
							
							
							
						 | 
						
							2012-06-13 16:33:55 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								004f0d4b3c
								
							
								
							
						 | 
						
							
							
								
								Updated spring-security-oauth reference as it had a broken unit test.
							
							
							
							
							
						 | 
						
							2012-06-13 13:44:14 -04:00 | 
						
					
				
					
						
							
							
								 
								Mike Derryberry
							
						 | 
						
							
							
							
							
								
							
								65dc3daaf8
								
							
								
							
						 | 
						
							
							
								
								smart client
							
							
							
							
							
						 | 
						
							2012-06-12 16:09:01 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								2a05ff995d
								
							
								
							
						 | 
						
							
							
								
								Added support for additional field in ClientDetailsEntity.java.
							
							
							
							
							
						 | 
						
							2012-06-11 16:27:35 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								bbf9591c92
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into issue52
							
							
							
							
							
							
							
							Conflicts:
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
	openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
	openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp 
							
						 | 
						
							2012-06-11 15:04:01 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								bd1d889e4f
								
							
								
							
						 | 
						
							
							
								
								Updated secoauth referrence
							
							
							
							
							
						 | 
						
							2012-06-11 14:58:36 -04:00 | 
						
					
				
					
						
							
							
								 
								Mike Derryberry
							
						 | 
						
							
							
							
							
								
							
								3e810cb5dc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'mitre/master'
							
							
							
							
							
						 | 
						
							2012-06-07 14:29:13 -04:00 | 
						
					
				
					
						
							
							
								 
								Mike Derryberry
							
						 | 
						
							
							
							
							
								
							
								fad6caa968
								
							
								
							
						 | 
						
							
							
								
								Added testing for signers for Hmac, Rsa, and Plaintext
							
							
							
							
							
						 | 
						
							2012-06-07 14:28:09 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								c3cffe1eac
								
							
								
							
						 | 
						
							
							
								
								cleaned up bad config file
							
							
							
							
							
						 | 
						
							2012-06-05 16:42:26 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								195810fc63
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'architecturedocs'
							
							
							
							
							
						 | 
						
							2012-06-05 16:38:07 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								7a207dc162
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'discoveryupdate'
							
							
							
							
							
						 | 
						
							2012-06-05 16:37:04 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								250e0c730e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'jwtupdate'
							
							
							
							
							
						 | 
						
							2012-06-05 16:36:32 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								7df2663e00
								
							
								
							
						 | 
						
							
							
								
								added final slashification of configuration URLs
							
							
							
							
							
						 | 
						
							2012-06-05 16:36:11 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								fbdccdb78e
								
							
								
							
						 | 
						
							
							
								
								added Xrd support (fixes #63), updated configuration locations (fixes #47)
							
							
							
							
							
						 | 
						
							2012-06-05 16:32:49 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								e44697cef9
								
							
								
							
						 | 
						
							
							
								
								updated JWK display to latest, closes #58
							
							
							
							
							
						 | 
						
							2012-06-05 16:07:19 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								3b4e95ac10
								
							
								
							
						 | 
						
							
							
								
								Approval page updates
							
							
							
							
							
						 | 
						
							2012-06-05 15:52:09 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								d424f44b8c
								
							
								
							
						 | 
						
							
							
								
								Removing some whitespace
							
							
							
							
							
						 | 
						
							2012-06-05 13:08:55 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								46cd08071d
								
							
								
							
						 | 
						
							
							
								
								cleaned up sql table references to redirect uris, see #48
							
							
							
							
							
						 | 
						
							2012-06-05 11:45:06 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								8e33a17307
								
							
								
							
						 | 
						
							
							
								
								moved DB schema files up a few levels, fixed test context to point to new locations
							
							
							
							
							
						 | 
						
							2012-06-05 11:32:51 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								5c72d8b95f
								
							
								
							
						 | 
						
							
							
								
								revocation endpoint cleanup, still needs views
							
							
							
							
							
						 | 
						
							2012-06-05 11:24:11 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								27219c066d
								
							
								
							
						 | 
						
							
							
								
								refactored our service to reflect upstream
							
							
							
							
							
						 | 
						
							2012-06-05 10:18:26 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								e95528a08d
								
							
								
							
						 | 
						
							
							
								
								added implementation to stub to read an access token by value
							
							
							
							
							
						 | 
						
							2012-06-05 10:11:24 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								72700a7dfc
								
							
								
							
						 | 
						
							
							
								
								tagging upstream changes -- local patch
							
							
							
							
							
						 | 
						
							2012-06-01 17:18:28 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								c89b1814d6
								
							
								
							
						 | 
						
							
							
								
								Fixed approve.jsp checkboxes (both had the same name).
							
							
							
							
							
						 | 
						
							2012-06-01 17:12:33 -04:00 | 
						
					
				
					
						
							
							
								 
								Mike Derryberry
							
						 | 
						
							
							
							
							
								
							
								ee28d56031
								
							
								
							
						 | 
						
							
							
								
								initial implementation of x509 and JWK key retrieval
							
							
							
							
							
						 | 
						
							2012-06-01 10:51:28 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								8684bb969f
								
							
								
							
						 | 
						
							
							
								
								Updated approve.jsp with Jett's new code to display some checkboxes. This has been tested, and the additional parameters are persisted correctly and are available to the TokenGranter.
							
							
							
							
							
						 | 
						
							2012-05-31 13:39:24 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								68483536a6
								
							
								
							
						 | 
						
							
							
								
								Approval page updates. Approval and denial buttons are now in one form. Generic checkboxes are in place.
							
							
							
							
							
						 | 
						
							2012-05-31 12:12:56 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								424f8bb737
								
							
								
							
						 | 
						
							
							
								
								Refactored to use TokenEnhancer rather than a custom TokenGranter.
							
							
							
							
							
						 | 
						
							2012-05-30 16:14:00 -04:00 | 
						
					
				
					
						
							
							
								 
								nemonik
							
						 | 
						
							
							
							
							
								
							
								998fc7f98b
								
							
								
							
						 | 
						
							
							
								
								cleaned up beans layout
							
							
							
							
							
						 | 
						
							2012-05-30 15:17:33 -04:00 | 
						
					
				
					
						
							
							
								 
								nemonik
							
						 | 
						
							
							
							
							
								
							
								8917e75010
								
							
								
							
						 | 
						
							
							
								
								see issue #19
							
							
							
							
							
						 | 
						
							2012-05-30 15:14:15 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								16aa0c59b5
								
							
								
							
						 | 
						
							
							
								
								Added token enhancer. Now to plug it in.
							
							
							
							
							
						 | 
						
							2012-05-30 12:31:12 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								d4e107caf1
								
							
								
							
						 | 
						
							
							
								
								updating
							
							
							
							
							
						 | 
						
							2012-05-30 12:08:44 -04:00 | 
						
					
				
					
						
							
							
								 
								Amanda Anganes
							
						 | 
						
							
							
							
							
								
							
								2070d2e413
								
							
								
							
						 | 
						
							
							
								
								Updated to use AuthorizationRequestFactory rather than ClientCredentialsChecker.
							
							
							
							
							
						 | 
						
							2012-05-30 12:08:08 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								ce847dd4f7
								
							
								
							
						 | 
						
							
							
								
								updated poco user view to contain name
							
							
							
							
							
						 | 
						
							2012-05-24 15:57:34 -04:00 | 
						
					
				
					
						
							
							
								 
								Stephen Moore
							
						 | 
						
							
							
							
							
								
							
								c418ccabb1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into userInfoEndpoint
							
							
							
							
							
						 | 
						
							2012-05-24 13:06:29 -04:00 | 
						
					
				
					
						
							
							
								 
								Stephen Moore
							
						 | 
						
							
							
							
							
								
							
								1bff5ef19f
								
							
								
							
						 | 
						
							
							
								
								Added POCO view, Added UnknownUserInfoScheamException runtime exception
							
							
							
							
							
						 | 
						
							2012-05-24 11:00:49 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								b838ddb786
								
							
								
							
						 | 
						
							
							
								
								Client ID display fix
							
							
							
							
							
						 | 
						
							2012-05-23 14:24:53 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								a1d85e281e
								
							
								
							
						 | 
						
							
							
								
								Client ID now showing on display and edit page
							
							
							
							
							
						 | 
						
							2012-05-23 14:21:08 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								48ff2d3d77
								
							
								
							
						 | 
						
							
							
								
								Merge remote branch 'origin/master'
							
							
							
							
							
						 | 
						
							2012-05-23 14:01:40 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								f8af7bf884
								
							
								
							
						 | 
						
							
							
								
								Adding help text for time-out options
							
							
							
							
							
						 | 
						
							2012-05-23 14:01:31 -04:00 | 
						
					
				
					
						
							
							
								 
								Stephen Moore
							
						 | 
						
							
							
							
							
								
							
								5c544dfe7c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into userInfoEndpoint
							
							
							
							
							
						 | 
						
							2012-05-23 13:43:32 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								7d4d65c359
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'userinfo_integration'
							
							
							
							
							
						 | 
						
							2012-05-23 13:39:03 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								a8e9f1d2cd
								
							
								
							
						 | 
						
							
							
								
								fixed rendering issues with user info view
							
							
							
							
							
						 | 
						
							2012-05-23 13:36:53 -04:00 | 
						
					
				
					
						
							
							
								 
								Stephen Moore
							
						 | 
						
							
							
							
							
								
							
								9612fde10e
								
							
								
							
						 | 
						
							
							
								
								Check for null address, and added email
							
							
							
							
							
						 | 
						
							2012-05-23 13:35:05 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								08958d4137
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/steve/userInfoEndpoint' into userinfo_integration
							
							
							
							
							
						 | 
						
							2012-05-23 13:11:40 -04:00 | 
						
					
				
					
						
							
							
								 
								Justin Richer
							
						 | 
						
							
							
							
							
								
							
								06fadb5f2b
								
							
								
							
						 | 
						
							
							
								
								oauth provider configuration started
							
							
							
							
							
						 | 
						
							2012-05-23 12:55:21 -04:00 | 
						
					
				
					
						
							
							
								 
								Stephen Moore
							
						 | 
						
							
							
							
							
								
							
								9b03831d4e
								
							
								
							
						 | 
						
							
							
								
								Filled in the UserInfoEndpoint, and added the JSON view for userInfo (openIdSchema)
							
							
							
							
							
						 | 
						
							2012-05-22 16:56:22 -04:00 | 
						
					
				
					
						
							
							
								 
								Michael Jett
							
						 | 
						
							
							
							
							
								
							
								668952ec09
								
							
								
							
						 | 
						
							
							
								
								Fixing typo
							
							
							
							
							
						 | 
						
							2012-05-22 16:12:21 -04:00 |