From d8686230e8c319877751a140a5d02bfb91184586 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 19 Dec 2023 13:43:27 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/base/UserController.java    | 13 ++++
 .../xit/fims/base/service/bean/UserBean.java  | 15 ++++
 .../WEB-INF/jsp/fims/user/password-info.jsp   | 72 ++++++++++++++++++-
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/cokr/xit/fims/base/service/bean/UserBean.java

diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java
index 8fd2feb0..95e74b7e 100644
--- a/src/main/java/cokr/xit/fims/base/UserController.java
+++ b/src/main/java/cokr/xit/fims/base/UserController.java
@@ -36,6 +36,9 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 	@Resource(name="userService")
 	private UserService userService;
 
+	@Resource(name="user2Bean")
+	private cokr.xit.fims.base.service.bean.UserBean userBean;
+
 	@Resource(name="factionBean")
 	FactionBean factionBean;
 
@@ -104,6 +107,16 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 		return mav;
 	}
 
+	@RequestMapping(name="비밀번호 확인",value="/confirmPassword.do")
+	public ModelAndView confirmPassword(String password) {
+		ModelAndView mav = new ModelAndView("jsonView");
+
+		boolean result = false;
+		result = userBean.confirmPassword(password);
+		mav.addObject("result", result);
+		return mav;
+	}
+
 	@RequestMapping(name="설정정보 조회",value="/stngInfo.do")
 	public ModelAndView getStngInfo(String type) {
 		ModelAndView mav = new ModelAndView("jsonView");
diff --git a/src/main/java/cokr/xit/fims/base/service/bean/UserBean.java b/src/main/java/cokr/xit/fims/base/service/bean/UserBean.java
new file mode 100644
index 00000000..4feeb01d
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/base/service/bean/UserBean.java
@@ -0,0 +1,15 @@
+package cokr.xit.fims.base.service.bean;
+
+import org.springframework.stereotype.Component;
+
+import cokr.xit.foundation.User;
+
+@Component("user2Bean")
+public class UserBean extends cokr.xit.base.user.service.bean.UserBean {
+
+	public boolean confirmPassword(String password) {
+		User user = this.getUser(currentUser().getAccount(), currentUser().getInstitute());
+		return user.getPassword().equals(passwordEncoder.encode(password));
+	}
+
+}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp
index 17221477..60126945 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp
@@ -34,4 +34,74 @@
 			</div>
 		</div>
 	</div>
-</form>
\ No newline at end of file
+	<div class="row mt-4 justify-content-end">
+		<div class="col-md-6">
+			<div class="row justify-content-end">
+				<div class="col-sm-3">
+					<button type="button" onclick="validPassword();" class="btn btn-primary">저장</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+<script>
+	function validPassword(){
+		if($("#password-form input[name='currentPassword']").val() == ""){
+			dialog.alert("현재 비밀번호를 입력하세요.");
+			return;
+		}
+		if($("#password-form input[name='password']").val() == ""){
+			dialog.alert("새 비밀번호를 입력하세요.");
+			return;
+		}
+		if($("#password-form input[name='confirmPassword']").val() == ""){
+			dialog.alert("새 비밀번호 확인을 입력하세요.");
+			return;
+		}
+		
+		let match = Array.from(document.querySelectorAll("input[name='password'],input[name='confirmPassword']"))
+			.map(input => input.value)
+			.reduce((total, current) => total == current);
+		if (!match) {
+			dialog.alert({
+				content:"새 비밀번호와 새 비밀번호 확인이 다릅니다.",
+				onClose:function(){
+					document.querySelector("input[name='confirmPassword']").focus();
+				}
+			});
+			return;
+		}
+		
+		ajax.get({
+			url : wctx.url("/user/confirmPassword.do"),
+			data : { password : $("#password-form input[name='currentPassword']").val() },
+			success : (resp) => {
+				if(resp.result){
+					savePassword();
+				} else {
+					dialog.alert("현재 비밀번호가 일치하지 않습니다.");
+				}
+			}
+		});
+	
+	}
+	
+	function savePassword(){
+		ajax.post({
+			url : wctx.url("/user/changePassword.do"),
+			data : { 
+				userID : MY_INFO.id,
+				password : $("#password-form input[name='password']").val() 
+			},
+			success : (resp) => {
+				if(resp.saved){
+					dialog.alert("비밀번호 변경에 성공하였습니다.");
+					dialog.close("changePasswordDialog");
+				} else {
+					dialog.alert("비밀번호 변경에 실패하였습니다.");
+				}
+			}
+		});
+		
+	}
+</script>
\ No newline at end of file