From d16f76251ff17094d3942bf9357511b826d0f492 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Mon, 21 Dec 2015 17:34:40 -0500
Subject: [PATCH] moved resource set registration endpoint to root URL
---
.../org/mitre/uma/web/ResourceSetRegistrationEndpoint.java | 3 +--
.../src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java b/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
index 5e1259be6..eb02f8a79 100644
--- a/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
+++ b/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
@@ -65,8 +65,7 @@ public class ResourceSetRegistrationEndpoint {
private static final Logger logger = LoggerFactory.getLogger(ResourceSetRegistrationEndpoint.class);
- public static final String DISCOVERY_URL = "resource_set";
- public static final String URL = DISCOVERY_URL + "/resource_set";
+ public static final String URL = "/resource_set";
@Autowired
private ResourceSetService resourceSetService;
diff --git a/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java b/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
index 86182bb89..bf1607478 100644
--- a/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
+++ b/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
@@ -66,7 +66,7 @@ public class UmaDiscoveryEndpoint {
m.put("authorization_endpoint", issuer + "authorize");
m.put("requesting_party_claims_endpoint", issuer + ClaimsCollectionEndpoint.URL);
m.put("introspection_endpoint", issuer + IntrospectionEndpoint.URL);
- m.put("resource_set_registration_endpoint", issuer + ResourceSetRegistrationEndpoint.DISCOVERY_URL);
+ m.put("resource_set_registration_endpoint", issuer + ResourceSetRegistrationEndpoint.URL);
m.put("permission_registration_endpoint", issuer + PermissionRegistrationEndpoint.URL);
m.put("rpt_endpoint", issuer + AuthorizationRequestEndpoint.URL);