Removed client authentication from the client deregistration &
client-secret reset APIs.
Change-Id: I9af0c65b5a7e34af761db6d519ea72a2c6d9c46e
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java
index 2ee4bc2..3183beb 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/OAuth2ClientControllerTest.java
@@ -136,13 +136,11 @@
assertNotNull(clientSecret);
testRegisterClientNonUniqueURL();
+ testResetConfidentialClientSecret(clientId, clientSecret);
- String newclientSecret =
- testResetConfidentialClientSecret(clientId, clientSecret);
-
- testDeregisterConfidentialClientMissingSecret(clientId);
- testDeregisterClientIncorrectCredentials(clientId, clientSecret);
- testDeregisterConfidentialClient(clientId, newclientSecret);
+// testDeregisterConfidentialClientMissingSecret(clientId);
+// testDeregisterClientIncorrectCredentials(clientId, clientSecret);
+ testDeregisterConfidentialClient(clientId);
}
private void testRegisterClientNonUniqueURL () throws KustvaktException {
@@ -291,24 +289,20 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
}
- private void testDeregisterConfidentialClient (String clientId,
- String clientSecret) throws UniformInterfaceException,
- ClientHandlerException, KustvaktException {
-
- MultivaluedMap<String, String> form = new MultivaluedMapImpl();
- form.add("client_secret", clientSecret);
+ private void testDeregisterConfidentialClient (String clientId)
+ throws UniformInterfaceException, ClientHandlerException,
+ KustvaktException {
ClientResponse response = resource().path(API_VERSION).path("oauth2")
.path("client").path("deregister").path(clientId)
.header(Attributes.AUTHORIZATION, HttpAuthorizationHandler
.createBasicAuthorizationHeaderValue(username, "pass"))
- .header(HttpHeaders.CONTENT_TYPE,
- ContentType.APPLICATION_FORM_URLENCODED)
- .entity(form).delete(ClientResponse.class);
+ .delete(ClientResponse.class);
assertEquals(Status.OK.getStatusCode(), response.getStatus());
}
+ @Deprecated
private void testDeregisterConfidentialClientMissingSecret (String clientId)
throws KustvaktException {
@@ -329,6 +323,7 @@
node.at("/error_description").asText());
}
+ @Deprecated
private void testDeregisterClientIncorrectCredentials (String clientId,
String clientSecret) throws UniformInterfaceException,
ClientHandlerException, KustvaktException {
@@ -424,7 +419,7 @@
testAccessTokenAfterUpgradingClient(clientId, accessToken);
testAccessTokenAfterDegradingSuperClient(clientId, accessToken);
- testDeregisterConfidentialClient(clientId, clientSecret);
+ testDeregisterConfidentialClient(clientId);
}
// old access tokens retain their scopes