Cleanup

Author: Rajeev Kumar Singh

polling-app-server/src/main/java/com/example/polls/controller/AuthController.java

@@ -7,7 +7,7 @@
 import com.example.polls.model.RoleName;
 import com.example.polls.model.User;
 import com.example.polls.payload.*;
-import com.example.polls.repository.RefreshTokenRepository;
+import com.example.polls.repository.JwtRefreshTokenRepository;
 import com.example.polls.repository.RoleRepository;
 import com.example.polls.repository.UserRepository;
 import com.example.polls.security.JwtTokenProvider;
@@ -56,7 +56,7 @@ public class AuthController {
     JwtTokenProvider tokenProvider;
 
     @Autowired
-    RefreshTokenRepository refreshTokenRepository;
+    JwtRefreshTokenRepository jwtRefreshTokenRepository;
 
     @Value("${app.jwtExpirationInMs}")
     private long jwtExpirationInMs;
@@ -85,7 +85,7 @@ public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest login
 
     @PostMapping("/refreshToken")
     public ResponseEntity<?> refreshAccessToken(@Valid @RequestBody RefreshTokenRequest refreshTokenRequest) {
-        return refreshTokenRepository.findById(refreshTokenRequest.getRefreshToken()).map(jwtRefreshToken -> {
+        return jwtRefreshTokenRepository.findById(refreshTokenRequest.getRefreshToken()).map(jwtRefreshToken -> {
             User user = jwtRefreshToken.getUser();
             String accessToken = tokenProvider.generateToken(UserPrincipal.create(user));
             return ResponseEntity.ok(new JwtAuthenticationResponse(accessToken, jwtRefreshToken.getToken(), jwtExpirationInMs));
@@ -101,7 +101,7 @@ private void saveRefreshToken(UserPrincipal userPrincipal, String refreshToken)
         Instant expirationDateTime = Instant.now().plus(360, ChronoUnit.DAYS);  // Todo Add this in application.properties
         jwtRefreshToken.setExpirationDateTime(expirationDateTime);
 
-        refreshTokenRepository.save(jwtRefreshToken);
+        jwtRefreshTokenRepository.save(jwtRefreshToken);
     }
 
     @PostMapping("/signup")

polling-app-server/src/main/java/com/example/polls/repository/RefreshTokenRepository.java polling-app-server/src/main/java/com/example/polls/repository/JwtRefreshTokenRepository.java

@@ -5,6 +5,6 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface RefreshTokenRepository extends JpaRepository<JwtRefreshToken, String> {
+public interface JwtRefreshTokenRepository extends JpaRepository<JwtRefreshToken, String> {
 
 }

polling-app-server/src/main/resources/application.properties

@@ -25,8 +25,7 @@ spring.jackson.time-zone= UTC
 
 ## App Properties
 app.jwtSecret= JWTSuperSecretKey
-#app.jwtExpirationInMs = 604800000
-app.jwtExpirationInMs = 60000
+app.jwtExpirationInMs = 604800000
 
 ## Spring Profiles
 # spring.profiles.active=prod