Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@ 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();
}

private CompletableFuture<String> 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());
}

private CompletableFuture<String> 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());
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package b1nd.dodam.token.client.data;

public record Token(String token) {}
public record Token(String token, String key) {}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package b1nd.dodam.token.client.data.req;

public record ReissueReq(String refreshToken) {}
public record ReissueReq(String refreshToken, String key) {}
Original file line number Diff line number Diff line change
@@ -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) {}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ class DodamTokenProperties {
private String reissueAccess;
private String generateRefresh;
private String verify;
private String key;

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
@Setter
@Configuration
@ConfigurationProperties("app.jwt")
public
class JwtProperties {
public class JwtProperties {

private String issuer;
private String tokenServer;
Expand Down