Skip to content

Commit

Permalink
reset default redis setting
Browse files Browse the repository at this point in the history
  • Loading branch information
enbraining committed Dec 31, 2023
1 parent 99ccd0e commit fcb136f
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 54 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
implementation("org.postgresql:postgresql:42.6.0")

implementation("redis.clients:jedis:5.1.0")
compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/gapple/weeingback/WeeingApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;

@SpringBootApplication
public class WeeingApplication {
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import redis.clients.jedis.Jedis;

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
Expand All @@ -34,7 +36,7 @@ public class AuthServiceImpl implements AuthService {
private final MemberRepository memberRepository;
private final PasswordEncoder passwordEncoder;
private final JwtProvider jwtProvider;
private final StringRedisTemplate stringRedisTemplate;
private final Jedis jedis;

@Transactional
public void join(AuthJoinRequest req){
Expand Down Expand Up @@ -69,8 +71,7 @@ public AuthLoginResponse login(AuthLoginRequest request){
String access = jwtProvider.generateAccessToken(authentication);
String refresh = jwtProvider.generateRefreshToken(authentication);

ValueOperations<String, String> stringValueOperations = stringRedisTemplate.opsForValue();
stringValueOperations.set(id, refresh);
jedis.set(id, refresh);

return new AuthLoginResponse(access, refresh);
}
Expand All @@ -86,11 +87,10 @@ public void logout(String headerAuthorization, String headerRefresh) {
Authentication refreshToken = jwtProvider.getAuthentication(refresh);
String refreshKey = refreshToken.getName();

ValueOperations<String, String> stringValueOperations = stringRedisTemplate.opsForValue();
String savedRefresh = stringValueOperations.get(refreshKey);
String savedRefresh = jedis.get(refreshKey);

if(refresh.equals(savedRefresh)){
stringValueOperations.set(refreshKey, "");
jedis.set(refreshKey, "");
} else throw new TokenNotEqualsException();
}

Expand All @@ -111,8 +111,7 @@ public AuthLogoutResponse refresh(String headerAuthorization, String headerRefre
savedId = UUID.fromString(refreshToken.getName());
} else savedId = UUID.fromString(SecurityContextHolder.getContext().getAuthentication().getName());

ValueOperations<String, String> stringValueOperations = stringRedisTemplate.opsForValue();
String token = stringValueOperations.get(savedId.toString());
String token = jedis.get(savedId.toString());

if(refresh.equals(token)){
if(!accessValidate && !refreshValidate){
Expand All @@ -132,11 +131,11 @@ public AuthLogoutResponse refresh(String headerAuthorization, String headerRefre

return new AuthLogoutResponse(newAccessToken, null);
} else if(!refreshValidate){
Authentication authorizationToken = jwtProvider.getAuthentication(authorization); // 오류 발생지
Authentication authorizationToken = jwtProvider.getAuthentication(authorization);
UUID id = UUID.fromString(authorizationToken.getName());
String newRefresh = jwtProvider.generateRefreshToken(authorizationToken);

stringValueOperations.set(id.toString(), newRefresh);
jedis.set(id.toString(), newRefresh);

return new AuthLogoutResponse(null, newRefresh);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public ResponseEntity<Void> joinBoardgame(@Valid @RequestBody BoardgameJoinReque
@GetMapping("/list")
public ResponseEntity<BoardgameShowResponse> showAllBoardgame(){
BoardgameShowResponse response = boardgameService.showAllBoardgame();

return ResponseEntity.ok().body(response);
}

Expand Down
32 changes: 32 additions & 0 deletions src/main/java/com/gapple/weeingback/global/config/RedisConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.gapple.weeingback.global.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import redis.clients.jedis.Jedis;

@Configuration
public class RedisConfig {
private final String host;
private final int port;
private final String auth;


public RedisConfig(
@Value("${redis.host}") String host,
@Value("${redis.port}") int port,
@Value("${redis.auth}") String auth
){
this.host = host;
this.port = port;
this.auth = auth;
}

@Bean
public Jedis jedis(){
Jedis jedis = new Jedis(host, port, true);
jedis.auth(auth);

return jedis;
}
}
9 changes: 7 additions & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spring:
redis:
port: ${REDIS_PORT}
host: ${REDIS_HOST}
password: ${REDIS_PASSWORD}
password: ${REDIS_AUTH}
jedis:
pool:
max-idle: 8
Expand All @@ -45,4 +45,9 @@ spring:
jwt:
secret: ${JWT_SECRET}
access: 1800000
refresh: 259200000
refresh: 259200000

redis:
host: ${REDIS_HOST}
port: ${REDIS_PORT}
auth: ${REDIS_AUTH}

0 comments on commit fcb136f

Please sign in to comment.