Changeset 335fee0

Timestamp:

01/26/26 12:40:55 (6 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

ecd0016

Parents:

62acea2

Message:

replace hardcoded auth constants with config

Location:

finkwave/src/main

Files:

• java/com/ukim/finki/develop/finkwave/config/AuthProperties.java (added)
• java/com/ukim/finki/develop/finkwave/config/JwtProperties.java (deleted)
• java/com/ukim/finki/develop/finkwave/controller/AuthController.java (modified) (6 diffs)
• java/com/ukim/finki/develop/finkwave/service/AuthService.java (modified) (4 diffs)
• java/com/ukim/finki/develop/finkwave/service/CustomUserDetailsService.java (modified) (1 diff)
• java/com/ukim/finki/develop/finkwave/service/JwtService.java (modified) (3 diffs)
• java/com/ukim/finki/develop/finkwave/service/RefreshTokenService.java (modified) (3 diffs)
• resources/application-example.properties (modified) (1 diff)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java

@@ -3 +3 @@
 import java.util.Map;
 
+import com.ukim.finki.develop.finkwave.config.AuthProperties;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28 +29 @@
 @RequiredArgsConstructor
 public class AuthController {
-    // todo: read from config
-    private final int accessTokenMaxAge = 900;
+    private final AuthProperties authProperties;
     private final AuthService authService;
 
@@ -40 +40 @@
             return ResponseEntity.ok(Map.of(
                     "user", userResponseDto,
-                    "tokenExpiresIn", accessTokenMaxAge
+                    "tokenExpiresIn", authProperties.getAccessTokenMaxAge()
             ));
         } catch (Exception e){
@@ -57 +57 @@
             return ResponseEntity.ok(Map.of(
                     "user", userResponseDto,
-                    "tokenExpiresIn", accessTokenMaxAge
+                    "tokenExpiresIn", authProperties.getAccessTokenMaxAge()
                     )
             );
@@ -77 +77 @@
         authService.refreshAccessTokenAndAddCookie(httpServletResponse, refreshToken);
         return ResponseEntity.ok(Map.of(
-                "tokenExpiresIn", accessTokenMaxAge
+                "tokenExpiresIn", authProperties.getAccessTokenMaxAge()
         ));
     }
@@ -102 +102 @@
         UserResponseDto userDto = authService.getUserDtoByUsername(username);
         return ResponseEntity.ok(Map.of(
-                "tokenExpiresIn", accessTokenMaxAge,
+                "tokenExpiresIn", authProperties.getAccessTokenMaxAge(),
                 "user", userDto
         ));

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.service;
 
+import com.ukim.finki.develop.finkwave.config.AuthProperties;
 import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -26 +27 @@
     private final JwtService jwtService;
     private final RefreshTokenService refreshTokenService;
-    private final int accessTokenMaxAge = 900;
-    private final int refreshTokenMaxAge = 10 * 24 * 60 * 60;
+    private final AuthProperties authProperties;
 
 
@@ -81 +81 @@
         accessCookie.setSecure(false);
         accessCookie.setPath("/");
-        accessCookie.setMaxAge(accessTokenMaxAge);
+        accessCookie.setMaxAge(authProperties.getAccessTokenMaxAge());
         response.addCookie(accessCookie);
     }
@@ -127 +127 @@
         refreshCookie.setSecure(false);
         refreshCookie.setPath("/");
-        refreshCookie.setMaxAge(refreshTokenMaxAge);
+        refreshCookie.setMaxAge(authProperties.getRefreshTokenMaxAge());
         response.addCookie(refreshCookie);
 

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/CustomUserDetailsService.java

@@ -22 +22 @@
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("user not found"));
-//        List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
+        // todo: fix hardcoded role
+        // List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
         List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_NONADMIN"));
         return new org.springframework.security.core.userdetails.User(

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/JwtService.java

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.service;
 
+import com.ukim.finki.develop.finkwave.config.AuthProperties;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -11 +14 @@
 
 @Service
+@RequiredArgsConstructor
 public class JwtService {
-    // todo: read from config
-    private final int accessTokenMaxAge = 900; // 900s - 15min
-    // todo: replace hardcoded secret
-    private final String secretKey = "very-really-extremely-secret-key-123";
+    private final AuthProperties authProperties;
 
     public String generateToken(String username, String role){
-        SecretKey key = Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8));
+        SecretKey key = Keys.hmacShaKeyFor(authProperties.getSecret().getBytes(StandardCharsets.UTF_8));
         return Jwts.builder()
                 .setSubject(username)
                 .claim("role", "ROLE_" + role)
-                .setExpiration(new Date(System.currentTimeMillis() + (long) accessTokenMaxAge * 1000))
+                .setExpiration(new Date(System.currentTimeMillis() + (long) authProperties.getAccessTokenMaxAge() * 1000))
                 .signWith(key)
                 .compact();
@@ -28 +29 @@
 
     public Claims extractClaims(String token){
-        SecretKey key = Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8));
+        SecretKey key = Keys.hmacShaKeyFor(authProperties.getSecret().getBytes(StandardCharsets.UTF_8));
         return Jwts.parserBuilder()
                 .setSigningKey(key)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/RefreshTokenService.java

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.service;
 
+import com.ukim.finki.develop.finkwave.config.AuthProperties;
 import com.ukim.finki.develop.finkwave.model.RefreshToken;
 import com.ukim.finki.develop.finkwave.model.User;
@@ -16 +17 @@
 public class RefreshTokenService {
     private final RefreshTokenRepository refreshTokenRepository;
+    private final AuthProperties authProperties;
 
     public RefreshToken createRefreshToken(User user){
@@ -21 +23 @@
         refreshToken.setUser(user);
         refreshToken.setToken(UUID.randomUUID().toString());
-        refreshToken.setExpiresAt(Instant.now().plus(14, ChronoUnit.DAYS));
+        refreshToken.setExpiresAt(Instant.now().plus(authProperties.getRefreshTokenMaxAge(), ChronoUnit.SECONDS));
         return refreshTokenRepository.save(refreshToken);
     }

finkwave/src/main/resources/application-example.properties

@@ -5 +5 @@
 spring.datasource.password=x
 spring.datasource.hikari.schema=x
+
+auth.secret=x
+
+# 15 minutes
+auth.access-token-max-age=900
+
+# 10 days = 10 * 24 * 60 * 60
+auth.refresh-token-max-age=864000