weplantaforest #221 - Refactor token handling

admin/src/main/java/org/dicadeveloper/weplantaforest/admin/WebSecurityConfigurerAdapterExt.java

@@ -1,10 +1,10 @@
 package org.dicadeveloper.weplantaforest.admin;
 
 import org.dicadeveloper.weplantaforest.admin.security.PasswordEncrypter;
-import org.dicadeveloper.weplantaforest.admin.security.StatelessAuthenticationFilter;
-import org.dicadeveloper.weplantaforest.admin.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.admin.security.UserDetailsService;
 import org.dicadeveloper.weplantaforest.common.user.Role;
+import org.dicadeveloper.weplantaforest.security.StatelessAuthenticationFilter;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

admin/src/main/java/org/dicadeveloper/weplantaforest/admin/user/User.java

@@ -18,16 +18,19 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.dicadeveloper.weplantaforest.admin.team.Team;
 import org.dicadeveloper.weplantaforest.admin.views.Views;
 import org.dicadeveloper.weplantaforest.common.support.Language;
+import org.dicadeveloper.weplantaforest.common.user.IUser;
 import org.dicadeveloper.weplantaforest.common.user.Role;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
 
 import lombok.EqualsAndHashCode;
@@ -39,7 +42,7 @@
 @Setter
 @EqualsAndHashCode
 @Table(name = "User")
-public class User implements UserDetails {
+public class User implements UserDetails, IUser {
 
     /**
      * 
@@ -114,6 +117,10 @@ public class User implements UserDetails {
     @Column(name = "ELEMENT")
     private Set<Role> roles = new HashSet<Role>();
 
+    @Transient
+    @JsonProperty("authenticationExpiresAt")
+    private Long authenticationExpiresAt;
+
     public void addRole(final Role role) {
         roles.add(role);
     }
@@ -126,6 +133,7 @@ public boolean hasRole(Role role) {
         return roles.contains(role);
     }
 
+    @Override
     @JsonView(Views.OverviewUser.class)
     public boolean isAdmin() {
         return roles.contains(Role.ADMIN);
@@ -146,11 +154,6 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
         return authorities;
     }
 
-    @Override
-    public String toString() {
-        return "'" + name + "'(" + mail + ")[" + id + "]";
-    }
-
     @Override
     public String getUsername() {
         return name;

admin/src/test/java/org/dicadeveloper/weplantaforest/admin/cart/CartControllerTest.java

@@ -12,7 +12,6 @@
 import javax.transaction.Transactional;
 
 import org.dicadeveloper.weplantaforest.admin.project.Project;
-import org.dicadeveloper.weplantaforest.admin.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.admin.support.Uris;
 import org.dicadeveloper.weplantaforest.admin.testSupport.DbInjecter;
 import org.dicadeveloper.weplantaforest.admin.tree.TreeRepository;
@@ -21,6 +20,7 @@
 import org.dicadeveloper.weplantaforest.admin.user.UserRepository;
 import org.dicadeveloper.weplantaforest.common.testsupport.CleanDbRule;
 import org.dicadeveloper.weplantaforest.common.testsupport.TestUtil;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

admin/src/test/java/org/dicadeveloper/weplantaforest/admin/project/ProjectControllerTest.java

@@ -14,14 +14,15 @@
 import javax.transaction.Transactional;
 
 import org.dicadeveloper.weplantaforest.admin.FileSystemInjector;
-import org.dicadeveloper.weplantaforest.admin.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.admin.support.Uris;
 import org.dicadeveloper.weplantaforest.admin.testSupport.DbInjecter;
 import org.dicadeveloper.weplantaforest.admin.treeType.TreeType;
 import org.dicadeveloper.weplantaforest.admin.user.User;
 import org.dicadeveloper.weplantaforest.admin.user.UserRepository;
 import org.dicadeveloper.weplantaforest.common.testsupport.CleanDbRule;
 import org.dicadeveloper.weplantaforest.common.testsupport.TestUtil;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

admin/src/test/java/org/dicadeveloper/weplantaforest/admin/tree/TreeControllerTest.java

@@ -6,14 +6,14 @@
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
 
 import org.dicadeveloper.weplantaforest.admin.project.Project;
-import org.dicadeveloper.weplantaforest.admin.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.admin.support.Uris;
 import org.dicadeveloper.weplantaforest.admin.testSupport.DbInjecter;
 import org.dicadeveloper.weplantaforest.admin.treeType.TreeType;
 import org.dicadeveloper.weplantaforest.admin.user.User;
 import org.dicadeveloper.weplantaforest.admin.user.UserRepository;
 import org.dicadeveloper.weplantaforest.common.testsupport.CleanDbRule;
 import org.dicadeveloper.weplantaforest.common.testsupport.TestUtil;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

admin/src/test/java/org/dicadeveloper/weplantaforest/admin/treeType/TreeTypeControllerTest.java

@@ -10,12 +10,12 @@
 import java.io.IOException;
 
 import org.dicadeveloper.weplantaforest.admin.FileSystemInjector;
-import org.dicadeveloper.weplantaforest.admin.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.admin.support.Uris;
 import org.dicadeveloper.weplantaforest.admin.testSupport.DbInjecter;
 import org.dicadeveloper.weplantaforest.admin.user.UserRepository;
 import org.dicadeveloper.weplantaforest.common.testsupport.CleanDbRule;
 import org.dicadeveloper.weplantaforest.common.testsupport.TestUtil;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

admin/src/test/java/org/dicadeveloper/weplantaforest/admin/user/UserControllerTest.java

@@ -5,9 +5,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
 
-import org.dicadeveloper.weplantaforest.admin.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.admin.testSupport.DbInjecter;
 import org.dicadeveloper.weplantaforest.common.testsupport.CleanDbRule;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

article-manager/src/main/java/org/dicadeveloper/weplantaforest/articlemanager/WebSecurityConfigurerAdapterExt.java

@@ -1,10 +1,10 @@
 package org.dicadeveloper.weplantaforest.articlemanager;
 
 import org.dicadeveloper.weplantaforest.articlemanager.security.PasswordEncrypter;
-import org.dicadeveloper.weplantaforest.articlemanager.security.StatelessAuthenticationFilter;
-import org.dicadeveloper.weplantaforest.articlemanager.security.TokenAuthenticationService;
 import org.dicadeveloper.weplantaforest.articlemanager.security.UserDetailsService;
 import org.dicadeveloper.weplantaforest.common.user.Role;
+import org.dicadeveloper.weplantaforest.security.StatelessAuthenticationFilter;
+import org.dicadeveloper.weplantaforest.security.TokenAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;