Skip to content
Snippets Groups Projects
Commit 9a44924c authored by fakanpeter's avatar fakanpeter
Browse files

Refactor Controller: Make jwtTokenProvider non-static and remove debug print statements

parent d3abb138
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ import java.util.regex.Pattern; ...@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
public class Controller { public class Controller {
private final DogService dogService; private final DogService dogService;
private final UserService userService; private final UserService userService;
private static final JwtTokenProvider jwtTokenProvider = JwtTokenProvider.getInstance(); private final JwtTokenProvider jwtTokenProvider = JwtTokenProvider.getInstance();
@Autowired @Autowired
public Controller(DogService dogService, UserService userService) { public Controller(DogService dogService, UserService userService) {
...@@ -53,7 +53,6 @@ public class Controller { ...@@ -53,7 +53,6 @@ public class Controller {
@PostMapping("/newdog") @PostMapping("/newdog")
public ResponseEntity<?> addNewDog(@RequestBody DetailedDogDTO dto, @RequestHeader("Authorization") String token) { public ResponseEntity<?> addNewDog(@RequestBody DetailedDogDTO dto, @RequestHeader("Authorization") String token) {
System.out.println(token);
if(!isValidToken(token)) return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); if(!isValidToken(token)) return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
// Save the dog and picture // Save the dog and picture
......
...@@ -23,7 +23,6 @@ public class JwtTokenProvider { ...@@ -23,7 +23,6 @@ public class JwtTokenProvider {
.setSubject(String.valueOf(userId)) .setSubject(String.valueOf(userId))
.signWith(secretKey) .signWith(secretKey)
.compact(); .compact();
System.out.println("Generated Token: " + token);
return token; return token;
} }
...@@ -36,12 +35,10 @@ public class JwtTokenProvider { ...@@ -36,12 +35,10 @@ public class JwtTokenProvider {
.parseClaimsJws(token) .parseClaimsJws(token)
.getBody() .getBody()
.getSubject(); .getSubject();
System.out.println(userId);
// Check if the username is not null or empty // Check if the username is not null or empty
return userId != null && !userId.isEmpty(); return userId != null && !userId.isEmpty();
} catch (JwtException | IllegalArgumentException e) { } catch (JwtException | IllegalArgumentException e) {
// Token is invalid or malformed // Token is invalid or malformed
System.out.println("Token validation failed: " + e.getMessage());
return false; return false;
} }
} }
......
...@@ -48,7 +48,6 @@ public class UserService { ...@@ -48,7 +48,6 @@ public class UserService {
UserDTO userDTO = new UserDTO(); UserDTO userDTO = new UserDTO();
userDTO.setUsername(request.getUsername()); userDTO.setUsername(request.getUsername());
userDTO.setToken(token); userDTO.setToken(token);
System.out.println("login: " + token);
return userDTO; return userDTO;
} }
} }
...@@ -56,10 +55,6 @@ public class UserService { ...@@ -56,10 +55,6 @@ public class UserService {
return null; return null;
} }
private String generateToken(Integer userId, JwtTokenProvider jwtTokenProvider) {
return jwtTokenProvider.generateToken(userId);
}
public boolean isUserExists(String username) { public boolean isUserExists(String username) {
return userRepository.existsByUsername(username); return userRepository.existsByUsername(username);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment