diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 83a257b5..584dc210 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,9 +10,9 @@ jobs: env: JWT_SECRET: ${{ secrets.JWT_SECRET }} - JWT_ACCESS_EXP_TIME: ${{ secrets.JWT_ACCESS_EXP_TIME }} - JWT_REFRESH_EXP_TIME: ${{ secrets.JWT_REFRESH_EXP_TIME }} - JWT_JWT_HEADER: ${{ secrets.JWT_JWT_HEADER }} + JWT_ACCESS_EXPIRATION: ${{ secrets.JWT_ACCESS_EXPIRATION }} + JWT_REFRESH_EXPIRATION: ${{ secrets.JWT_REFRESH_EXPIRATION }} + JWT_HEADER: ${{ secrets.JWT_HEADER }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cde75d29..fe899af7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: env: JWT_SECRET: ${{ secrets.JWT_SECRET }} - JWT_ACCESS_EXP_TIME: ${{ secrets.JWT_ACCESS_EXP_TIME }} - JWT_REFRESH_EXP_TIME: ${{ secrets.JWT_REFRESH_EXP_TIME }} - JWT_JWT_HEADER: ${{ secrets.JWT_JWT_HEADER }} + JWT_ACCESS_EXPIRATION: ${{ secrets.JWT_ACCESS_EXPIRATION }} + JWT_REFRESH_EXPIRATION: ${{ secrets.JWT_REFRESH_EXPIRATION }} + JWT_HEADER: ${{ secrets.JWT_HEADER }} steps: - uses: actions/checkout@v4 diff --git a/src/main/java/com/haru/api/domain/user/security/jwt/JwtAuthenticationFilter.java b/src/main/java/com/haru/api/domain/user/security/jwt/JwtAuthenticationFilter.java index 202e2d9c..77537a77 100644 --- a/src/main/java/com/haru/api/domain/user/security/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/com/haru/api/domain/user/security/jwt/JwtAuthenticationFilter.java @@ -25,7 +25,7 @@ @Slf4j //??? public class JwtAuthenticationFilter extends OncePerRequestFilter { - @Value("${jwt.JWT_HEADER}") + @Value("${jwt.header}") private String jwtHeader; private static final String[] whitelist = { "/api/v1/users/signup", diff --git a/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java b/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java index 434867c6..7916e8b7 100644 --- a/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java +++ b/src/main/java/com/haru/api/domain/user/service/UserCommandServiceImpl.java @@ -29,9 +29,9 @@ @RequiredArgsConstructor public class UserCommandServiceImpl implements UserCommandService{ - @Value("${jwt.ACCESS_EXP_TIME}") + @Value("${jwt.access-expiration}") private int accessExpTime; - @Value("${jwt.REFRESH_EXP_TIME}") + @Value("${jwt.refresh-expiration}") private int refreshExpTime; private final UserRepository userRepository; private final PasswordEncoder passwordEncoder;