From 979afd2ade79c8a772f98b1e72278eff2f478908 Mon Sep 17 00:00:00 2001 From: yurem Date: Tue, 26 Nov 2019 22:31:14 +0300 Subject: [PATCH] Registered clients disappear #1199 --- .../gluu/oxauth/model/registration/Client.java | 15 +++++++++++++-- .../ws/rs/RegisterRestWebServiceImpl.java | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Server/src/main/java/org/gluu/oxauth/model/registration/Client.java b/Server/src/main/java/org/gluu/oxauth/model/registration/Client.java index 88d7cff236..f080a4b2b8 100644 --- a/Server/src/main/java/org/gluu/oxauth/model/registration/Client.java +++ b/Server/src/main/java/org/gluu/oxauth/model/registration/Client.java @@ -52,7 +52,7 @@ public class Client extends DeletableEntity implements Serializable, ClientRefer @AttributeName(name = "oxAuthClientIdIssuedAt") private Date clientIdIssuedAt; - @AttributeName(name = "oxAuthClientSecretExpiresAt") + @AttributeName(name = "oxAuthExpiration") private Date clientSecretExpiresAt; @AttributeName(name = "oxAuthRedirectURI") @@ -215,6 +215,9 @@ public class Client extends DeletableEntity implements Serializable, ClientRefer @JsonObject private ClientAttributes attributes; + @AttributeName(name = "del") + private boolean deletable; + public ClientAttributes getAttributes() { if (attributes == null) { attributes = new ClientAttributes(); @@ -1172,7 +1175,15 @@ public void setSoftwareStatement(String softwareStatement) { this.softwareStatement = softwareStatement; } - public static Client instance() { + public boolean isDeletable() { + return deletable; + } + + public void setDeletable(boolean deletable) { + this.deletable = deletable; + } + + public static Client instance() { return new Client(); } 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 index 5e2548984a..ab244bd9bf 100644 --- 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 @@ -225,6 +225,7 @@ private Response registerClientImpl(String requestParams, HttpServletRequest htt 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()); }