Removed duplicate clients in user client lists.
Change-Id: If9806e5a2f98153b1428498f74c5bded989b7d70
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
index 23b8267..f1e4de0 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/OAuth2ClientService.java
@@ -346,11 +346,6 @@
return clientDao.retrieveClientById(clientId);
}
- public List<OAuth2Client> retrieveUserClients (String username)
- throws KustvaktException {
- return clientDao.retrieveUserClients(username);
- }
-
public List<OAuth2UserClientDto> listUserClients (String username,
String clientId, String clientSecret) throws KustvaktException {
OAuth2Client client = authenticateClient(clientId, clientSecret);
@@ -359,9 +354,10 @@
"Only super client is allowed to list user clients.",
OAuth2Error.UNAUTHORIZED_CLIENT);
}
- List<OAuth2Client> userClients = retrieveUserClients(username);
+ List<OAuth2Client> userClients =
+ clientDao.retrieveUserClients(username);
Collections.sort(userClients);
-
+
List<OAuth2UserClientDto> dtoList = new ArrayList<>(userClients.size());
for (OAuth2Client uc : userClients) {
if (uc.isSuper()) continue;