Skip to content

Commit

Permalink
feat : apply feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
YGwan committed Aug 12, 2023
1 parent 323baa8 commit 78bf9c6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/main/java/se/ton/t210/T210Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class T210Application {

public static void main(String[] args) {
SpringApplication app = new SpringApplication(T210Application.class);
app.setAdditionalProfiles("prod");
app.setAdditionalProfiles("dev");
app.run(args);
}
}
5 changes: 3 additions & 2 deletions src/main/java/se/ton/t210/cache/EmailAuthMailCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ public class EmailAuthMailCache {
@Id
private final String email;
private final String authCode;
private final LocalTime createdTime = LocalTime.now();
private final LocalTime createdTime;

public EmailAuthMailCache(String email, String authCode) {
public EmailAuthMailCache(String email, String authCode, LocalTime createdTime) {
this.email = email;
this.authCode = authCode;
this.createdTime = createdTime;
}
}
1 change: 1 addition & 0 deletions src/main/java/se/ton/t210/controller/MemberController.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public MemberController(MemberService memberService) {
public ResponseEntity<Void> signUp(@RequestBody @Valid SignUpRequest request,
@CookieValue String emailAuthToken,
HttpServletResponse response) {
System.out.println(emailAuthToken);
request.validateSignUpRequest();
memberService.signUp(request, emailAuthToken, response);
return ResponseEntity.ok().build();
Expand Down
Empty file.
7 changes: 5 additions & 2 deletions src/main/java/se/ton/t210/service/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
@Service
public class MemberService {

@Value("${auth.jwt.payload.key:email}")
private String tokenKey;

@Value("${auth.jwt.token.access.cookie.key:accessToken}")
private String accessTokenCookieKey;

Expand Down Expand Up @@ -62,7 +65,7 @@ public void signUp(SignUpRequest request, String emailAuthToken, HttpServletResp
if (memberRepository.existsByEmail(request.getEmail())) {
throw new AuthException(HttpStatus.CONFLICT, "Email is already exists");
}
final String emailFromToken = tokenSecret.getPayloadValue(emailAuthTokenCookieKey, emailAuthToken);
final String emailFromToken = tokenSecret.getPayloadValue(tokenKey, emailAuthToken);
if (!request.getEmail().equals(emailFromToken)) {
throw new AuthException(HttpStatus.FORBIDDEN, "It is different from the previous email information you entered.");
}
Expand Down Expand Up @@ -122,6 +125,6 @@ private void responseTokens(HttpServletResponse response, MemberTokens tokens) {
public void sendEmailAuthMail(String userEmailAddress) {
String emailAuthCode = AuthCodeUtils.generate(authCodeLength);
mailServiceInterface.sendMail(userEmailAddress, new SignUpAuthMailForm(emailAuthCode));
emailAuthMailCacheRepository.save(new EmailAuthMailCache(userEmailAddress, emailAuthCode));
emailAuthMailCacheRepository.save(new EmailAuthMailCache(userEmailAddress, emailAuthCode, LocalTime.now()));
}
}
9 changes: 2 additions & 7 deletions src/main/java/se/ton/t210/service/token/TokenService.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import se.ton.t210.exception.AuthException;
import se.ton.t210.utils.auth.AuthCodeUtils;

import java.time.LocalTime;
import java.util.Map;

@Service
Expand All @@ -31,16 +32,10 @@ public class TokenService {

private final TokenSecret tokenSecret;
private final TokenCacheRepository tokenCacheRepository;
private final EmailAuthMailCacheRepository emailAuthMailCacheRepository;

public TokenService(TokenSecret tokenSecret, TokenCacheRepository tokenCacheRepository, EmailAuthMailCacheRepository emailAuthMailCacheRepository) {
public TokenService(TokenSecret tokenSecret, TokenCacheRepository tokenCacheRepository) {
this.tokenSecret = tokenSecret;
this.tokenCacheRepository = tokenCacheRepository;
this.emailAuthMailCacheRepository = emailAuthMailCacheRepository;
}

public void saveEmailAuthInfoInCache(String email, String emailAuthCode) {
emailAuthMailCacheRepository.save(new EmailAuthMailCache(email, emailAuthCode));
}

public String issueMailToken(String email) {
Expand Down

0 comments on commit 78bf9c6

Please sign in to comment.