Body not needed in AccessTokenTO

Author: ilgrosso

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.java

@@ -18,14 +18,11 @@
  */
 package org.apache.syncope.client.console.panels;
 
-import com.nimbusds.jwt.SignedJWT;
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import org.apache.syncope.client.console.commons.IdRepoConstants;
@@ -43,13 +40,9 @@
 import org.apache.syncope.common.lib.types.IdRepoEntitlement;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.ResourceModel;
@@ -90,28 +83,6 @@ protected List<IColumn<AccessTokenTO, String>> getColumns() {
 
         columns.add(new PropertyColumn<>(new ResourceModel("owner"), "owner", "owner"));
 
-        columns.add(new AbstractColumn<>(new ResourceModel("issuedAt", "")) {
-
-            private static final long serialVersionUID = -1822504503325964706L;
-
-            @Override
-            public void populateItem(
-                    final Item<ICellPopulator<AccessTokenTO>> cellItem,
-                    final String componentId,
-                    final IModel<AccessTokenTO> model) {
-
-                try {
-                    SignedJWT jwt = SignedJWT.parse(model.getObject().getBody());
-                    cellItem.add(new Label(
-                            componentId,
-                            SyncopeConsoleSession.get().getDateFormat().format(jwt.getJWTClaimsSet().getIssueTime())));
-                } catch (ParseException e) {
-                    LOG.error("Could not parse JWT {}", model.getObject().getBody(), e);
-                    cellItem.add(new Label(componentId, StringUtils.EMPTY));
-                }
-            }
-        });
-
         columns.add(new DatePropertyColumn<>(new ResourceModel("expirationTime"), "expirationTime", "expirationTime"));
 
         return columns;

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.properties

@@ -18,4 +18,3 @@ any.edit=Edit access token ${accessTokenTO.owner}
 any.new=New access token
 owner=Owner
 expirationTime=Expiry
-issuedAt=Start

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel_fr_CA.properties

@@ -18,4 +18,3 @@ any.edit=Jeton modification acc\u00e8s ${accessTokenTO.owner}
 any.new=Jeton nouvel acc\u00e8s
 owner=Propri\u00e9taire
 expirationTime=Expiration
-issuedAt=D\u00e9but

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel_it.properties

@@ -18,4 +18,3 @@ any.edit=Modifica token di accesso ${accessTokenTO.owner}
 any.new=Nuovo token di accesso
 owner=Proprietario
 expirationTime=Termine
-issuedAt=Inizio

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel_ja.properties

@@ -18,4 +18,3 @@ any.edit=\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3 ${accessTokenTO.owner}
 any.new=\u65b0\u3057\u3044\u30a2\u30af\u30bb\u30b9\u30c8\u30fc\u30af\u30f3
 owner=\u30aa\u30fc\u30ca\u30fc
 expirationTime=\u671f\u9650
-issuedAt=\u958b\u59cb

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel_pt_BR.properties

@@ -18,4 +18,3 @@ any.edit=Edit access token ${accessTokenTO.owner}
 any.new=Novo token de acesso
 owner=Propriet\u00e1rio
 expirationTime=Termo
-issuedAt=Iniciar

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel_ru.properties

@@ -19,4 +19,3 @@ any.edit=Edit access token ${accessTokenTO.owner}
 any.new=\u041d\u043e\u0432\u044b\u0439 \u043c\u0430\u0440\u043a\u0435\u0440 \u0434\u043e\u0441\u0442\u0443\u043f\u0430
 owner=\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446
 expirationTime=\u0438\u0441\u0442\u0435\u0447\u0435\u043d\u0438\u0435 \u0441\u0440\u043e\u043a\u0430
-issuedAt=\u041d\u0430\u0447\u0430\u043b\u043e

common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/AccessTokenTO.java

@@ -28,8 +28,6 @@ public class AccessTokenTO implements EntityTO {
 
     private String key;
 
-    private String body;
-
     private OffsetDateTime expirationTime;
 
     private String owner;
@@ -44,14 +42,6 @@ public void setKey(final String key) {
         this.key = key;
     }
 
-    public String getBody() {
-        return body;
-    }
-
-    public void setBody(final String body) {
-        this.body = body;
-    }
-
     public OffsetDateTime getExpirationTime() {
         return expirationTime;
     }
@@ -82,7 +72,6 @@ public boolean equals(final Object obj) {
         AccessTokenTO other = (AccessTokenTO) obj;
         return new EqualsBuilder().
                 append(key, other.key).
-                append(body, other.body).
                 append(expirationTime, other.expirationTime).
                 append(owner, other.owner).
                 build();
@@ -92,7 +81,6 @@ public boolean equals(final Object obj) {
     public int hashCode() {
         return new HashCodeBuilder().
                 append(key).
-                append(body).
                 append(expirationTime).
                 append(owner).
                 build();

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java

@@ -198,7 +198,6 @@ public AccessTokenInfo update(final AccessToken accessToken, final byte[] author
     public AccessTokenTO getAccessTokenTO(final AccessToken accessToken) {
         AccessTokenTO accessTokenTO = new AccessTokenTO();
         accessTokenTO.setKey(accessToken.getKey());
-        accessTokenTO.setBody(accessToken.getBody());
         accessTokenTO.setExpirationTime(accessToken.getExpirationTime());
         accessTokenTO.setOwner(accessToken.getOwner());