Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8f15d33
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
9cee7e7
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
9a05c74
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
73f1fec
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
7543850
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
07e9110
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
1698780
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
5f5feaf
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
bd02ae9
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
15e3b71
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
df46be6
refactoring-tool(src\main\java\com\example\modfac\service\EmployeeSer…
chulkin-mdb Nov 4, 2025
a44b7a8
refactoring-tool(src\main\java\com\example\modfac\util\LeaveUtils.java):
chulkin-mdb Nov 4, 2025
4e158f0
refactoring-tool(src\main\java\com\example\modfac\util\LeaveUtils.java):
chulkin-mdb Nov 4, 2025
7358ed1
refactoring-tool(src\main\java\com\example\modfac\service\LeaveServic…
chulkin-mdb Nov 4, 2025
a7373f0
refactoring-tool(src\main\java\com\example\modfac\service\UserService…
chulkin-mdb Nov 4, 2025
cd9c7a1
refactoring-tool(src\main\java\com\example\modfac\security\JwtTokenPr…
chulkin-mdb Nov 4, 2025
818a7ed
refactoring-tool(src\main\java\com\example\modfac\security\JwtTokenPr…
chulkin-mdb Nov 4, 2025
78e693f
refactoring-tool(src\main\java\com\example\modfac\security\JwtAuthent…
chulkin-mdb Nov 4, 2025
b03a666
refactoring-tool(src\main\java\com\example\modfac\controller\Employee…
chulkin-mdb Nov 4, 2025
29a2a5b
refactoring-tool(src\main\java\com\example\modfac\security\CustomUser…
chulkin-mdb Nov 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ build/
# Logs
*.log

# Errorprone issues json
errorprone_issues.json

# Temporary files
*.tmp
*.swp
Expand Down
152 changes: 0 additions & 152 deletions errorprone_issues.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
@RequiredArgsConstructor
public class EmployeeController {
private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(EmployeeController.class);
private static final org.slf4j.Logger APPLICATION_LOGGER = org.slf4j.LoggerFactory.getLogger(EmployeeController.class);
private final DataService dataService;

@PostMapping
public ResponseEntity<Employee> onboardEmployee(
@Valid @RequestBody OnboardEmployeeDTO dto,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
@RequiredArgsConstructor
public class CustomUserDetailsService implements UserDetailsService {
private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(CustomUserDetailsService.class);
private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(CustomUserDetailsService.class);

private final UserRepository userRepository;

@Override
Expand All @@ -32,4 +30,4 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
Collections.singletonList(new SimpleGrantedAuthority("ROLE_" + user.getRole()))
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

@Component
@RequiredArgsConstructor
Expand Down Expand Up @@ -48,7 +49,7 @@ protected void doFilterInternal(

List<GrantedAuthority> authorities = new ArrayList<>();
if (StringUtils.hasText(role)) {
authorities.add(new SimpleGrantedAuthority("ROLE_" + role.toUpperCase()));
authorities.add(new SimpleGrantedAuthority(String.format("ROLE_%s", role.toUpperCase(Locale.ROOT))));
}

UserDetails userDetails = userDetailsService.loadUserByUsername(username);
Expand All @@ -59,8 +60,6 @@ protected void doFilterInternal(
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
SecurityContextHolder.getContext().setAuthentication(authentication);
} else {
// If we reach here, it means the JWT token is invalid or missing
// So we set the WWW-Authenticate header and throw a 401 response
response.setHeader("WWW-Authenticate", "Bearer");
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
return;
Expand Down Expand Up @@ -99,4 +98,4 @@ private String getJwtFromRequest(HttpServletRequest request) {
LOGGER.debug("getJwtFromRequest method finished");
return null;
}
}
}
13 changes: 8 additions & 5 deletions src/main/java/com/example/modfac/security/JwtTokenProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import javax.crypto.SecretKey;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -40,13 +41,13 @@ public String createToken(String username, String role) {
claims.put("sub", username); // subject claim
claims.put("role", role); // custom role claim

Date now = new Date();
Date validity = new Date(now.getTime() + jwtExpiration);
Instant now = Instant.now();
Instant validity = now.plusMillis(jwtExpiration);

String token = Jwts.builder()
.claims(claims)
.issuedAt(now)
.expiration(validity)
.issuedAt(Date.from(now))
.expiration(Date.from(validity))
.signWith(key, Jwts.SIG.HS256)
.compact();

Expand All @@ -70,7 +71,9 @@ public boolean validateToken(String token) {
.build()
.parseSignedClaims(token);

boolean isValid = !claims.getPayload().getExpiration().before(new Date());
Instant expiration = claims.getPayload().getExpiration().toInstant();
boolean isValid = !expiration.isBefore(Instant.now());

LOG.debug("validateToken method finished");
return isValid;
} catch (JwtException | IllegalArgumentException e) {
Expand Down
Loading