From c16336a96a7e0c0dbf726c3436d2f5231f3ad17c Mon Sep 17 00:00:00 2001 From: hansol Date: Tue, 23 Jan 2024 14:24:50 +0900 Subject: [PATCH] FIX: build --- private-resources | 2 +- .../request/ChangePasswordRequest.java | 1 - .../dto/profile/request/PasswordRequest.java | 1 - .../service/PrivateInfoWrappingService.java | 117 ------------------ 4 files changed, 1 insertion(+), 120 deletions(-) diff --git a/private-resources b/private-resources index 55336295..ddb23b9b 160000 --- a/private-resources +++ b/private-resources @@ -1 +1 @@ -Subproject commit 55336295a3c27afd99ecc7b04e2799ecd5520a40 +Subproject commit ddb23b9b7b0c04900a852ae9a31533465156fd7e diff --git a/src/main/java/peer/backend/dto/profile/request/ChangePasswordRequest.java b/src/main/java/peer/backend/dto/profile/request/ChangePasswordRequest.java index 4f03b25b..dfc565ba 100644 --- a/src/main/java/peer/backend/dto/profile/request/ChangePasswordRequest.java +++ b/src/main/java/peer/backend/dto/profile/request/ChangePasswordRequest.java @@ -8,7 +8,6 @@ import peer.backend.exception.IllegalArgumentException; @Getter -@Builder @NoArgsConstructor public class ChangePasswordRequest { diff --git a/src/main/java/peer/backend/dto/profile/request/PasswordRequest.java b/src/main/java/peer/backend/dto/profile/request/PasswordRequest.java index 6ef475af..f7397cae 100644 --- a/src/main/java/peer/backend/dto/profile/request/PasswordRequest.java +++ b/src/main/java/peer/backend/dto/profile/request/PasswordRequest.java @@ -9,7 +9,6 @@ import javax.validation.constraints.Size; @Getter -@Builder @NoArgsConstructor public class PasswordRequest { diff --git a/src/main/java/peer/backend/service/PrivateInfoWrappingService.java b/src/main/java/peer/backend/service/PrivateInfoWrappingService.java index b456b1c7..a0c0b4a0 100644 --- a/src/main/java/peer/backend/service/PrivateInfoWrappingService.java +++ b/src/main/java/peer/backend/service/PrivateInfoWrappingService.java @@ -196,37 +196,6 @@ private ChangePasswordRequest getDataForPasswordChange(PrivateDataDTO data) thro return new ChangePasswordRequest(password, code); } - private MainSeedDTO makeTokenAndKey(PrivateActions type) { - SecureRandom randomMaker = new SecureRandom(type.getDescription().getBytes()); - - // 256바이트 난수 생성을 위한 byte배열 - byte[] values = new byte[256]; - randomMaker.nextBytes(values); - - // 16진수 문자열로 변환 - StringBuilder sb = new StringBuilder(); - for(byte b : values) { - sb.append(String.format("%02x", b)); - } - - // code 만들기 - Long result = randomMaker.nextLong() & Long.MAX_VALUE; - while(!this.checkCodeUniqueOrNotForToken(result.toString())) { - result = randomMaker.nextLong() & Long.MAX_VALUE; - } - - // code, act 기억 - this.saveCodeAndActionToRedis(result, type); - - MainSeedDTO data = MainSeedDTO.builder() - .seed(sb.toString()) - .code(result) - .build(); - this.saveMainSeedToRedis(data); - - return data; - } - public ResponseEntity processDataFromToken (User user, PrivateDataDTO data) { Integer type = Integer.parseInt(Objects.requireNonNull(this.redisTemplateForSecret.opsForValue().get("act-" + data.getCode()))); this.redisTemplateForSecret.delete("act-" + data.getCode()); @@ -309,91 +278,5 @@ private MainSeedDTO makeTokenAndKey(PrivateActions type) { return data; } - - public ResponseEntity processDataFromToken (User user, PrivateDataDTO data) { - Integer type = Integer.parseInt(Objects.requireNonNull(this.redisTemplateForSecret.opsForValue().get("act-" + data.getCode()))); - this.redisTemplateForSecret.delete("act-" + data.getCode()); - - if (type == PrivateActions.SIGNUP.getCode()){ - // 회원가입 폼 제출 로직 - System.out.println("여기로 들어왔음!!"); - UserInfo newUser = this.getDataForSignUP(data); - this.memberService.signUp(newUser); - return ResponseEntity.ok().build(); - - } else if (type == PrivateActions.PASSWORDCHECK.getCode()) { - // 비밀번호 확인 로직 - System.out.println("여기로 들어왔음!! 2"); - PasswordRequest request = this.getDataForPasswordCheck(data); - if (!this.memberService.verificationPassword(request.getPassword(), user.getPassword())){ - throw new ForbiddenException("비밀번호가 일치하지 않습니다!"); - } - String uuid = this.personalInfoService.getChangePasswordCode(user.getId()); - HashMap body = new HashMap<>(); - body.put("code", uuid); - return ResponseEntity.status(HttpStatus.CREATED).body(body); - - } else if (type == PrivateActions.PASSWORDMODIFY.getCode()) { - // 비밀번호 변경 로직 - System.out.println("여기로 들어왔음!! 3"); - ChangePasswordRequest request = this.getDataForPasswordChange(data); - - if (!this.personalInfoService.checkChangePasswordCode(user.getId(), request.getCode())) { - throw new ForbiddenException("유효하지 않은 코드입니다!"); - } - if (this.memberService.verificationPassword(request.getPassword(), user.getPassword())) { - throw new ConflictException("현재 비밀번호와 일치합니다!"); - } - this.personalInfoService.changePassword(user, request.getPassword()); - - } else { - throw new BadRequestException("비 정상적인 접근입니다."); - } - return ResponseEntity.badRequest().build(); - - } - - public ResponseEntity processDataFromToken (User user, PrivateDataDTO data) { - Integer type = Integer.parseInt(Objects.requireNonNull(this.redisTemplateForSecret.opsForValue().get("act-" + data.getCode()))); - this.redisTemplateForSecret.delete("act-" + data.getCode()); - - if (type == PrivateActions.SIGNUP.getCode()){ - // 회원가입 폼 제출 로직 - System.out.println("여기로 들어왔음!!"); -// UserInfo newUser = this.getDataForSignUP(data); -// this.memberService.signUp(newUser); -// return ResponseEntity.ok().build(); - - } else if (type == PrivateActions.PASSWORDCHECK.getCode()) { - // 비밀번호 확인 로직 - System.out.println("여기로 들어왔음!! 2"); -// PasswordRequest request = this.getDataForPasswordCheck(data); -// if (!this.memberService.verificationPassword(request.getPassword(), user.getPassword())){ -// throw new ForbiddenException("비밀번호가 일치하지 않습니다!"); -// } -// String uuid = this.personalInfoService.getChangePasswordCode(user.getId()); -// HashMap body = new HashMap<>(); -// body.put("code", uuid); -// return ResponseEntity.status(HttpStatus.CREATED).body(body); - - } else if (type == PrivateActions.PASSWORDMODIFY.getCode()) { - // 비밀번호 변경 로직 - System.out.println("여기로 들어왔음!! 3"); -// ChangePasswordRequest request = this.getDataForPasswordChange(data); -// -// if (!this.personalInfoService.checkChangePasswordCode(user.getId(), request.getCode())) { -// throw new ForbiddenException("유효하지 않은 코드입니다!"); -// } -// if (this.memberService.verificationPassword(request.getPassword(), user.getPassword())) { -// throw new ConflictException("현재 비밀번호와 일치합니다!"); -// } -// this.personalInfoService.changePassword(user, request.getPassword()); - - } else { - throw new BadRequestException("비 정상적인 접근입니다."); - } - return ResponseEntity.badRequest().build(); - } - }