From 2f24bfe3555d921b9a525cca682635688ece1fc5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 06 1월 2022 14:30:33 +0900
Subject: [PATCH] 비밀번호 8자리 이상 특수문자 포함으로 수정
---
src/main/webapp/views/user/superUserAdd.html | 12 +++++++-----
src/main/webapp/views/user/userAdd.html | 12 +++++++-----
src/main/webapp/i18n/ko/global.json | 2 ++
src/main/webapp/scripts/app/user/userAdd.controller.js | 34 +++++++++++++++++++++++++++++++++-
4 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 860aabd..d904946 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -522,7 +522,9 @@
"invalidEmailFormat": "�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
"enterYourEmailAddress": "�엯�젰�븳 �씠硫붿씪濡� �븣由쇱씠 諛쒖넚�맗�땲�떎. 瑗� �궗�슜�븯�떆�뒗 �씠硫붿씪濡� �엯�젰�븯�꽭�슂.",
"least4CharactersPassword": "鍮꾨�踰덊샇�뒗 理쒖냼 4�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.",
+ "least8CharactersPassword": "鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 理쒖냼 8�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.",
"enter4CharactersPassword": "鍮꾨�踰덊샇�뒗 4�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.",
+ "enter8CharactersPassword": "鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 8�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.",
"differentPassword": "鍮꾨�踰덊샇媛� �떎由낅땲�떎.",
"contactedEnterPhone": "�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.",
"enterTheNameInWorkspace": "�궗�슜�븯怨� �떢�� �뾽臾닿났媛꾩쓽 �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
diff --git a/src/main/webapp/scripts/app/user/userAdd.controller.js b/src/main/webapp/scripts/app/user/userAdd.controller.js
index 05e4f94..851e786 100644
--- a/src/main/webapp/scripts/app/user/userAdd.controller.js
+++ b/src/main/webapp/scripts/app/user/userAdd.controller.js
@@ -14,7 +14,8 @@
$scope.fn = {
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- onFileSelect : onFileSelect // �봽濡쒗븘 �뾽濡쒕뱶
+ onFileSelect : onFileSelect, // �봽濡쒗븘 �뾽濡쒕뱶
+ autoHypenPhone : autoHypenPhone // �뿰�씫泥� �엯�젰�떆 - �옄�룞 �엯�젰
};
$scope.vm = {
@@ -42,6 +43,36 @@
else {
$scope.vm.form.profileImageName = "";
}
+ }
+
+ // �뿰�씫泥� �엯�젰�떆 - �옄�룞 �엯�젰
+ function autoHypenPhone() {
+ var str = $scope.vm.form.phone
+ str.replace(/^[0-9]/g, '');
+ var tmp = '';
+ if (str.length < 4) {
+ return str;
+ } else if (str.length < 7) {
+ tmp += str.substr(0, 3);
+ tmp += '-';
+ tmp += str.substr(3);
+ $scope.vm.form.phone = tmp;
+ } else if (str.length < 11) {
+ tmp += str.substr(0, 3);
+ tmp += '-';
+ tmp += str.substr(3, 3);
+ tmp += '-';
+ tmp += str.substr(6);
+ $scope.vm.form.phone = tmp;
+ } else {
+ tmp += str.substr(0, 3);
+ tmp += '-';
+ tmp += str.substr(3, 4);
+ tmp += '-';
+ tmp += str.substr(7);
+ $scope.vm.form.phone = tmp;
+ }
+ return str
}
function formCheck(formInvalid) {
@@ -76,6 +107,7 @@
content.workspaceName = $rootScope.preventXss(content.workspaceName);
content.password = CryptoJS.SHA512(content.password).toString();
content.language = $rootScope.language; // 湲곕낯 �뼵�뼱
+ content.phone = content.phone.replace(/\-/g,'');
User.add({
method : "POST",
diff --git a/src/main/webapp/views/user/superUserAdd.html b/src/main/webapp/views/user/superUserAdd.html
index b076b0f..33483a7 100644
--- a/src/main/webapp/views/user/superUserAdd.html
+++ b/src/main/webapp/views/user/superUserAdd.html
@@ -59,13 +59,14 @@
kr-input
autocomplete="off"
ng-model="vm.form.password"
- minlength="4"
+ ng-pattern="/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
+ minlength="8"
maxLength="20"
required>
- <div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
- translate="users.least4CharactersPassword">鍮꾨�踰덊샇�뒗 理쒖냼 4�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.
+ <div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
+ translate="users.least8CharactersPassword">鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 理쒖냼 8�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.
</div>
- <small class="fc-grey" translate="users.enter4CharactersPassword">鍮꾨�踰덊샇�뒗 4�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.</small>
+ <small class="fc-grey" translate="users.enter8CharactersPassword">鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 8�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.</small>
</div>
</div>
<div class="col-sm-6">
@@ -127,11 +128,12 @@
<label for="userAddForm6"><span translate="users.phoneNumber">�뿰�씫泥�</span> </label>
<input id="userAddForm6"
type="text"
- maxLength="20"
+ maxlength="30"
class="form-control"
input-regex="[^0-9]"
kr-input
autocomplete="off"
+ ng-keyup="fn.autoHypenPhone()"
ng-model="vm.form.phone">
<small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
</small>
diff --git a/src/main/webapp/views/user/userAdd.html b/src/main/webapp/views/user/userAdd.html
index 9cda2f1..7ea99e2 100644
--- a/src/main/webapp/views/user/userAdd.html
+++ b/src/main/webapp/views/user/userAdd.html
@@ -62,13 +62,14 @@
kr-input
autocomplete="off"
ng-model="vm.form.password"
- minlength="4"
+ ng-pattern="/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$/"
+ minlength="8"
maxLength="20"
required>
- <div ng-show="userAddForm.password.$error.minlength" class="help-block form-text text-danger"
- translate="users.least4CharactersPassword">鍮꾨�踰덊샇�뒗 理쒖냼 4�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.
+ <div ng-show="userAddForm.password.$error.pattern" class="help-block form-text text-danger"
+ translate="users.least8CharactersPassword">鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 理쒖냼 8�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.
</div>
- <small class="fc-grey" translate="users.enter4CharactersPassword">鍮꾨�踰덊샇�뒗 4�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.</small>
+ <small class="fc-grey" translate="users.enter8CharactersPassword">鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 8�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.</small>
</div>
</div>
<div class="col-sm-6">
@@ -133,11 +134,12 @@
<label for="userAddForm6"><span translate="users.phoneNumber">�뿰�씫泥�</span> </label>
<input id="userAddForm6"
type="text"
- maxLength="20"
+ maxlength="30"
class="form-control"
input-regex="[^0-9]"
kr-input
autocomplete="off"
+ ng-keyup="fn.autoHypenPhone()"
ng-model="vm.form.phone">
<small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
</small>
--
Gitblit v1.8.0