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

cleaned up UMA discovery components

multiparty
Justin Richer 2015-12-30 12:51:04 -05:00
parent f407b0da3a
commit 446ccd0ba7
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
uma-server-webapp/src/main/webapp/WEB-INF/application-context.xml
View File

@ -131,12 +131,6 @@
<security:expression-handler ref="oauthWebExpressionHandler" />
</security:http>
<security:http pattern="/#{T(org.mitre.uma.web.AuthorizationRequestEndpoint).URL}/**" use-expressions="true" entry-point-ref="oauthAuthenticationEntryPoint" create-session="never">
<security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" />
<security:custom-filter ref="corsFilter" after="SECURITY_CONTEXT_FILTER" />
<security:expression-handler ref="oauthWebExpressionHandler" />
</security:http>
<security:http pattern="/#{T(org.mitre.openid.connect.web.UserInfoEndpoint).URL}**" use-expressions="true" entry-point-ref="oauthAuthenticationEntryPoint" create-session="stateless">
<security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" />
<security:custom-filter ref="corsFilter" after="SECURITY_CONTEXT_FILTER" />

4
uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
View File

@ -65,7 +65,7 @@ public class ResourceSetRegistrationEndpoint {
private static final Logger logger = LoggerFactory.getLogger(ResourceSetRegistrationEndpoint.class);
public static final String URL = "/resource_set";
public static final String URL = "resource_set";
@Autowired
private ResourceSetService resourceSetService;
@ -280,7 +280,7 @@ public class ResourceSetRegistrationEndpoint {
rs.setName(getAsString(o, "name"));
rs.setIconUri(getAsString(o, "icon_uri"));
rs.setType(getAsString(o, "type"));
rs.setScopes(getAsStringSet(o, "scopes"));
rs.setScopes(getAsStringSet(o, "resource_set_scopes"));
rs.setUri(getAsString(o, "uri"));
return rs;

2
uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
View File

@ -54,10 +54,8 @@ public class UmaDiscoveryEndpoint {
m.put("issuer", issuer);
m.put("pat_profiles_supported", tokenProfiles);
m.put("aat_profiles_supported", tokenProfiles);
m.put("rpt_profiles_supported", tokenProfiles);
m.put("pat_grant_types_supported", grantTypes);
m.put("aat_grant_types_supported", grantTypes);
m.put("claim_token_profiles_supported", ImmutableSet.of());
m.put("uma_profiles_supported", ImmutableSet.of());
m.put("registration_endpoint", issuer + DynamicClientRegistrationEndpoint.URL);