From 50cf1b9aac1f6ea05a877018a8964fa552b33551 Mon Sep 17 00:00:00 2001
From: ysh <ysh0208@strato.co.kr>
Date: Thu, 19 Sep 2024 15:26:48 +0900
Subject: [PATCH] Oss Management encrypt/decrypt debugging

---
 src/main/java/kr/co/mcmp/oss/dto/OssDto.java     | 16 ++++++++--------
 .../kr/co/mcmp/oss/service/OssServiceImpl.java   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/kr/co/mcmp/oss/dto/OssDto.java b/src/main/java/kr/co/mcmp/oss/dto/OssDto.java
index 2db9270..e377aba 100644
--- a/src/main/java/kr/co/mcmp/oss/dto/OssDto.java
+++ b/src/main/java/kr/co/mcmp/oss/dto/OssDto.java
@@ -61,7 +61,7 @@ public static Oss toEntity(OssDto ossDto, OssTypeDto ossTypeDto) {
     }
 
     // 패스워드 Encript set
-    public static OssDto withModifiedEncriptPassword(OssDto ossDto, String password) {
+    public static OssDto setEncryptPassword(OssDto ossDto, String password) {
         return OssDto.builder()
                 .ossIdx(ossDto.getOssIdx())
                 .ossTypeIdx(ossDto.getOssTypeIdx())
@@ -73,14 +73,14 @@ public static OssDto withModifiedEncriptPassword(OssDto ossDto, String password)
                 .build();
     }
     // 패스워드 decrypt set
-    public static OssDto withDetailDecryptPassword(Oss oss, String password) {
+    public static OssDto setDecryptPassword(OssDto ossDto, String password) {
         return OssDto.builder()
-                .ossIdx(oss.getOssIdx())
-                .ossTypeIdx(oss.getOssType().getOssTypeIdx())
-                .ossName(oss.getOssName())
-                .ossDesc(oss.getOssDesc())
-                .ossUrl(oss.getOssUrl())
-                .ossUsername(oss.getOssUsername())
+                .ossIdx(ossDto.getOssIdx())
+                .ossTypeIdx(ossDto.getOssTypeIdx())
+                .ossName(ossDto.getOssName())
+                .ossDesc(ossDto.getOssDesc())
+                .ossUrl(ossDto.getOssUrl())
+                .ossUsername(ossDto.getOssUsername())
                 .ossPassword(password)
                 .build();
     }    // Duplicate Object set
diff --git a/src/main/java/kr/co/mcmp/oss/service/OssServiceImpl.java b/src/main/java/kr/co/mcmp/oss/service/OssServiceImpl.java
index 3166ddc..6a70ac0 100644
--- a/src/main/java/kr/co/mcmp/oss/service/OssServiceImpl.java
+++ b/src/main/java/kr/co/mcmp/oss/service/OssServiceImpl.java
@@ -44,7 +44,7 @@ public List<OssDto> getAllOssList() {
 
 		if ( !CollectionUtils.isEmpty(ossList) ) {
 			ossList = ossList.stream()
-					.map(ossDto -> OssDto.withModifiedEncriptPassword(ossDto, encodingBase64String(decryptAesString(ossDto.getOssPassword()))))
+					.map(ossDto -> OssDto.setDecryptPassword(ossDto, decryptAesString(ossDto.getOssPassword())))
 					.collect(Collectors.toList());
 		}
 
@@ -77,7 +77,7 @@ public List<OssDto> getOssList(String ossTypeName) {
 		if ( !CollectionUtils.isEmpty(ossList) ) {
 			ossList = ossList
 					.stream()
-					.map(ossDto -> OssDto.withModifiedEncriptPassword(ossDto, encodingBase64String(decryptAesString(ossDto.getOssPassword()))))
+					.map(ossDto -> OssDto.setDecryptPassword(ossDto, decryptAesString(ossDto.getOssPassword())))
 					.collect(Collectors.toList());
 		}
 
@@ -93,7 +93,7 @@ public List<OssDto> getOssList(String ossTypeName) {
 	@Override
 	public Long registOss(OssDto ossDto) {
 		OssTypeDto ossTypeDto = OssTypeDto.from(ossTypeRepository.findByOssTypeIdx(ossDto.getOssTypeIdx()));
-		ossDto = ossDto.withModifiedEncriptPassword(ossDto, encryptAesString(ossDto.getOssPassword()));
+		ossDto = ossDto.setEncryptPassword(ossDto, encryptAesString(ossDto.getOssPassword()));
 		ossDto = OssDto.from(ossRepository.save(OssDto.toEntity(ossDto, ossTypeDto)));
 		return ossDto.getOssIdx();
 	}
@@ -107,7 +107,7 @@ public Long registOss(OssDto ossDto) {
 	public Long updateOss(OssDto ossDto) {
 		OssTypeDto ossTypeDto = OssTypeDto.from(ossTypeRepository.findByOssTypeIdx(ossDto.getOssTypeIdx()));
 
-		ossDto = ossDto.withModifiedEncriptPassword(ossDto, encryptAesString(ossDto.getOssPassword()));
+		ossDto = ossDto.setEncryptPassword(ossDto, encryptAesString(ossDto.getOssPassword()));
 		ossRepository.save(OssDto.toEntity(ossDto, ossTypeDto));
 		return ossDto.getOssIdx();
 	}
@@ -150,7 +150,7 @@ public Boolean checkConnection(OssDto ossDto) {
 				}
 
 				// Front에서 Base64Encoding한 데이터를 복호화하여 AES256 암호화 함.
-				ossDto.withModifiedEncriptPassword(ossDto, encryptAesString(ossDto.getOssPassword()));
+				ossDto.setEncryptPassword(ossDto, encryptAesString(ossDto.getOssPassword()));
 				return nexusService.checkNexusConnection(ossDto);
 
 				default:
@@ -173,7 +173,8 @@ public Boolean checkConnection(OssDto ossDto) {
 	 */
 	public OssDto detailOss(Long ossIdx) {
 		Oss oss = ossRepository.findByOssIdx(ossIdx);
-		return OssDto.withDetailDecryptPassword(oss, decryptAesString(oss.getOssPassword()));
+		OssDto ossDto = OssDto.from(oss);
+		return OssDto.setDecryptPassword(ossDto, decryptAesString(oss.getOssPassword()));
 	}
 
 	public OssDto detailOssByOssName(String ossName) {
@@ -234,7 +235,7 @@ public String encryptBase64String(String str) {
 	 */
 	public String encryptAesString(String str) {
 		if ( StringUtils.isNotBlank(str) ) {
-			return AES256Utils.encrypt(Base64Utils.base64Decoding(str));
+			return AES256Utils.encrypt(str);
 		}
 		else {
 			return null;