Fixed the token bug.

- Deletes a previously used token. (& not to be reused again for autologin)
- Switched to JpaRespository, which extends PagingAndSortingRepository & CrudRepository.

Author: sean-huni

.idea/misc.xml

@@ -34,7 +34,7 @@ public class User {
     @Column(name = "enabled")
     private Boolean enabled;
 
-    @OneToOne(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.ALL)
+    @OneToOne(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JoinColumn(name = "TOKENLOG_ID")
     private TokenLog token;
 

src/main/java/io/home/pi/persistence/model/User.java

@@ -1,7 +1,7 @@
 package io.home.pi.persistence.repo;
 
 import io.home.pi.persistence.model.Auth;
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
 /**
  * PROJECT   : pi
@@ -10,6 +10,6 @@
  * DATE      : 19-June-2018
  * TIME      : 23:38
  */
-public interface AuthorityRepo extends CrudRepository<Auth, Integer> {
+public interface AuthorityRepo extends JpaRepository<Auth, Integer> {
 
 }

src/main/java/io/home/pi/persistence/repo/AuthorityRepo.java

@@ -1,7 +1,7 @@
 package io.home.pi.persistence.repo;
 
 import io.home.pi.persistence.model.GrpAuth;
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
 /**
  * PROJECT   : pi
@@ -10,6 +10,6 @@
  * DATE      : 19-June-2018
  * TIME      : 23:24
  */
-public interface GroupAuthorityRepo extends CrudRepository<GrpAuth, Integer> {
+public interface GroupAuthorityRepo extends JpaRepository<GrpAuth, Integer> {
 
 }

src/main/java/io/home/pi/persistence/repo/GroupAuthorityRepo.java

@@ -1,7 +1,7 @@
 package io.home.pi.persistence.repo;
 
 import io.home.pi.persistence.model.Team;
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,6 +12,6 @@
  * TIME      : 20:16
  */
 @Repository
-public interface GroupRepo extends CrudRepository<Team, Integer> {
+public interface GroupRepo extends JpaRepository<Team, Integer> {
 
 }

src/main/java/io/home/pi/persistence/repo/GroupRepo.java

@@ -1,7 +1,7 @@
 package io.home.pi.persistence.repo;
 
 import io.home.pi.persistence.model.Team;
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@
  * TIME      : 04:00
  */
 @Repository
-public interface TeamRepo extends CrudRepository<Team, Integer> {
+public interface TeamRepo extends JpaRepository<Team, Integer> {
 }

src/main/java/io/home/pi/persistence/repo/TeamRepo.java

@@ -1,9 +1,9 @@
 package io.home.pi.persistence.repo;
 
 import io.home.pi.persistence.model.TokenLog;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 import java.sql.Timestamp;
@@ -18,7 +18,7 @@
  * TIME      : 01:19
  */
 @Repository
-public interface TokenLogRepo extends CrudRepository<TokenLog, Integer> {
+public interface TokenLogRepo extends JpaRepository<TokenLog, Integer> {
     TokenLog findByUsername(String username);
 
     TokenLog findBySeries(String series);

src/main/java/io/home/pi/persistence/repo/TokenLogRepo.java

@@ -2,7 +2,7 @@
 
 import io.home.pi.persistence.model.TokenLog;
 import io.home.pi.persistence.model.User;
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -15,8 +15,10 @@
  * TIME      : 20:16
  */
 @Repository
-public interface UserRepo extends CrudRepository<User, Integer> {
+public interface UserRepo extends JpaRepository<User, Integer> {
     User findByUsername(String username);
 
     Optional<User> findByToken(TokenLog tokenLog);
+
+
 }

src/main/java/io/home/pi/persistence/repo/UserRepo.java

@@ -5,7 +5,7 @@
 import java.util.Optional;
 
 @Service
-public interface CRUDService<T> {
+public interface JPAService<T> {
     Iterable<T> findAll();
 
     Optional<T> findById(Integer id);

src/main/java/io/home/pi/persistence/service/CRUDService.java src/main/java/io/home/pi/persistence/service/JPAService.java

@@ -9,5 +9,5 @@
  * DATE      : 15-July-2018
  * TIME      : 04:02
  */
-public interface TeamService extends CRUDService<Team> {
+public interface TeamService extends JPAService<Team> {
 }

src/main/java/io/home/pi/persistence/service/TeamService.java

@@ -11,7 +11,7 @@
  * DATE      : 29-June-2018
  * TIME      : 01:21
  */
-public interface TokenLogService extends CRUDService<TokenLog> {
+public interface TokenLogService extends JPAService<TokenLog> {
     Optional<TokenLog> findByUsername(String username);
 
     Optional<TokenLog> findBySeries(String series);

src/main/java/io/home/pi/persistence/service/TokenLogService.java

@@ -13,7 +13,7 @@
  * TIME      : 20:46
  */
 
-public interface UserService extends CRUDService<User> {
+public interface UserService extends JPAService<User> {
     User findByUsername(String username);
 
     Optional<User> findByToken(TokenLog token);

src/main/java/io/home/pi/persistence/service/UserService.java

@@ -93,6 +93,7 @@ public void authWithoutPassword(String username, HttpSession session) {
 
         Authentication authenticationToken = new UsernamePasswordAuthenticationToken(userDetails.getUsername(), userDetails, userDetails.getAuthorities());
 
+
         //ToDo: Test when the user is already registered.
         ((UsernamePasswordAuthenticationToken) authenticationToken).eraseCredentials();
 

src/main/java/io/home/pi/service/impl/UserDetailServiceImpl.java

@@ -68,6 +68,7 @@ public String confirmRegistration(HttpServletRequest request, final Model model,
             if (optionalToken.isPresent()) {
                 User disabledUser = optionalToken.get().getUser();
                 disabledUser.setEnabled(TRUE);
+                disabledUser.setToken(null);  //Delete the token & prevent it from being reused.
 
                 final User enabledUser = userService.saveOrUpdate(disabledUser);
                 userAuthService.authWithoutPassword(enabledUser.getUsername(), request.getSession(TRUE));