Registered clients disappear #1199

GluuFederation · Nov 27, 2019 · 254e5f1 · 254e5f1
1 parent 979afd2
commit 254e5f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/Server/src/main/java/org/gluu/oxauth/register/ws/rs/RegisterRestWebServiceImpl.java b/Server/src/main/java/org/gluu/oxauth/register/ws/rs/RegisterRestWebServiceImpl.java
@@ -217,17 +217,16 @@ private Response registerClientImpl(String requestParams, HttpServletRequest htt
             client.setClientSecret(clientService.encryptSecret(generatedClientSecret));
             client.setRegistrationAccessToken(HandleTokenFactory.generateHandleToken());
             client.setIdTokenTokenBindingCnf(r.getIdTokenTokenBindingCnf());
-            client.setDeletable(true);
 
             final Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
             client.setClientIdIssuedAt(calendar.getTime());
 
             if (appConfiguration.getDynamicRegistrationExpirationTime() > 0) { // #883 : expiration can be -1, mean does not expire
                 calendar.add(Calendar.SECOND, appConfiguration.getDynamicRegistrationExpirationTime());
                 client.setClientSecretExpiresAt(calendar.getTime());
-                client.setDeletable(true);
                 client.setExpirationDate(calendar.getTime());
             }
+            client.setDeletable(client.getClientSecretExpiresAt() != null);
 
             if (StringUtils.isBlank(r.getClientName()) && r.getRedirectUris() != null && !r.getRedirectUris().isEmpty()) {
                 try {

diff --git a/Server/src/main/java/org/gluu/oxauth/service/ClientService.java b/Server/src/main/java/org/gluu/oxauth/service/ClientService.java
@@ -222,14 +222,6 @@ public List<Client> getAllClients(String[] returnAttributes, int size) {
 		return result;
 	}
 
-	public List<Client> getClientsWithExpirationDate(BatchOperation<Client> batchOperation, String[] returnAttributes,
-			int sizeLimit, int chunkSize) {
-		String baseDN = staticConfiguration.getBaseDn().getClients();
-		Filter filter = Filter.createPresenceFilter("oxAuthClientSecretExpiresAt");
-		return ldapEntryManager.findEntries(baseDN, Client.class, filter, SearchScope.SUB, returnAttributes,
-				batchOperation, 0, sizeLimit, chunkSize);
-	}
-
 	public String buildClientDn(String p_clientId) {
 		final StringBuilder dn = new StringBuilder();
 		dn.append(String.format("inum=%s,", p_clientId));