diff --git a/dodam-application/dodam-rest-api/src/main/resources/application.yml b/dodam-application/dodam-rest-api/src/main/resources/application.yml index cc573554..5f31323a 100644 --- a/dodam-application/dodam-rest-api/src/main/resources/application.yml +++ b/dodam-application/dodam-rest-api/src/main/resources/application.yml @@ -65,6 +65,7 @@ app: generateAccess: ${TOKEN_GENERATE_ACCESS_URL} generateRefresh: ${TOKEN_GENERATE_REFRESH_URL} verify: ${TOKEN_VERIFY_URL} + key: ${TOKEN_GENERATE_KEY} jwt: issuer: ${JWT_ISSUER} tokenServer: ${TOKEN_SERVER_URL} diff --git a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/DodamTokenClient.java b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/DodamTokenClient.java index 2ba68b1d..0252e781 100644 --- a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/DodamTokenClient.java +++ b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/DodamTokenClient.java @@ -40,7 +40,7 @@ public String getMemberIdByToken(String token) { private TokenInfoRes requestVerifyToken(String token) { return webClient.post( jwtProperties.getTokenServer() + tokenProperties.getVerify(), - new Token(token), + new Token(token, tokenProperties.getKey()), TokenInfoRes.class ).block(); } @@ -48,7 +48,7 @@ private TokenInfoRes requestVerifyToken(String token) { private CompletableFuture requestReissueToken(String refreshToken) { return webClient.post( jwtProperties.getTokenServer() + tokenProperties.getReissueAccess(), - new ReissueReq(refreshToken), + new ReissueReq(refreshToken, tokenProperties.getKey()), TokenRes.class ).toFuture().thenApply(res -> res.data().token()); } @@ -56,7 +56,7 @@ private CompletableFuture requestReissueToken(String refreshToken) { private CompletableFuture requestIssueToken(String userId, int role, String url) { return webClient.post( jwtProperties.getTokenServer() + url, - new TokenReq(userId, role), + new TokenReq(userId, role, tokenProperties.getKey()), TokenRes.class ).toFuture().thenApply(res -> res.data().token()); } diff --git a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/Token.java b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/Token.java index e8693b9b..9bc88e7b 100644 --- a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/Token.java +++ b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/Token.java @@ -1,3 +1,3 @@ package b1nd.dodam.token.client.data; -public record Token(String token) {} +public record Token(String token, String key) {} diff --git a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/ReissueReq.java b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/ReissueReq.java index a695dc74..7d8ab85f 100644 --- a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/ReissueReq.java +++ b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/ReissueReq.java @@ -1,3 +1,3 @@ package b1nd.dodam.token.client.data.req; -public record ReissueReq(String refreshToken) {} +public record ReissueReq(String refreshToken, String key) {} diff --git a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/TokenReq.java b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/TokenReq.java index 9373e337..ab6f0c54 100644 --- a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/TokenReq.java +++ b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/data/req/TokenReq.java @@ -1,3 +1,3 @@ package b1nd.dodam.token.client.data.req; -public record TokenReq(String memberId, int accessLevel) {} +public record TokenReq(String memberId, int accessLevel, String key) {} diff --git a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/DodamTokenProperties.java b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/DodamTokenProperties.java index b4143487..371bac04 100644 --- a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/DodamTokenProperties.java +++ b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/DodamTokenProperties.java @@ -16,5 +16,6 @@ class DodamTokenProperties { private String reissueAccess; private String generateRefresh; private String verify; + private String key; } diff --git a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/JwtProperties.java b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/JwtProperties.java index 65a5065f..88e88dcd 100644 --- a/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/JwtProperties.java +++ b/dodam-in-system-available/dodam-token-client/src/main/java/b1nd/dodam/token/client/properties/JwtProperties.java @@ -9,8 +9,7 @@ @Setter @Configuration @ConfigurationProperties("app.jwt") -public -class JwtProperties { +public class JwtProperties { private String issuer; private String tokenServer;