From e104718a10a02dd367ec4ff61062f68e4a8dbf79 Mon Sep 17 00:00:00 2001
From: Park Byung Eun <geekdev@naver.com>
Date: Wed, 14 Sep 2022 04:39:13 +0000
Subject: [PATCH] bugfix

---
 .../member/partner/compose/regist-compose.component.ts |  7 +------
 .../auth/sign-in/components/sign-in.component.html     |  7 ++++++-
 .../auth/sign-in/components/sign-in.component.ts       | 10 ++++++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/app/modules/admin/member/partner/compose/regist-compose.component.ts b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts
index 114753b..a7158de 100644
--- a/src/app/modules/admin/member/partner/compose/regist-compose.component.ts
+++ b/src/app/modules/admin/member/partner/compose/regist-compose.component.ts
@@ -81,12 +81,7 @@ export class RegistComposeComponent implements OnInit {
       ],
       password: [
         'beteran',
-        [
-          Validators.required,
-          Validators.pattern(
-            '^(?=.*[A-Za-z])(?=.*d)(?=.*[@$!%*#?&])[A-Za-zd@$!%*#?&]{8,20}$'
-          ),
-        ],
+        [Validators.required, Validators.pattern('^[A-Za-zd@$!%*#?&]{8,20}$')],
       ],
       exchangePassword: [
         'beteran',
diff --git a/src/app/modules/auth/sign-in/components/sign-in.component.html b/src/app/modules/auth/sign-in/components/sign-in.component.html
index b794162..e2917b0 100644
--- a/src/app/modules/auth/sign-in/components/sign-in.component.html
+++ b/src/app/modules/auth/sign-in/components/sign-in.component.html
@@ -81,7 +81,12 @@
               [svgIcon]="'heroicons_solid:eye-off'"
             ></mat-icon>
           </button>
-          <mat-error> 비밀번호를 입력하세요 </mat-error>
+          <mat-error *ngIf="signInForm.get('password')?.hasError('required')">
+            비밀번호를 입력하세요
+          </mat-error>
+          <mat-error *ngIf="signInForm.get('password')?.hasError('pattern')">
+            올바른 비밀번호를 입력하세요.
+          </mat-error>
         </mat-form-field>
 
         <div style="width: 320px; height: 88px">
diff --git a/src/app/modules/auth/sign-in/components/sign-in.component.ts b/src/app/modules/auth/sign-in/components/sign-in.component.ts
index cd39624..b79287b 100644
--- a/src/app/modules/auth/sign-in/components/sign-in.component.ts
+++ b/src/app/modules/auth/sign-in/components/sign-in.component.ts
@@ -49,9 +49,15 @@ export class AuthSignInComponent implements OnInit {
     this.signInForm = this._formBuilder.group({
       email: [
         'administrator',
-        [Validators.required, Validators.pattern('^[a-zA-Z0-9]{6,12}$')],
+        [Validators.required, Validators.pattern('^[a-zA-Z0-9]{6,14}$')],
+      ],
+      password: [
+        'beteran',
+        [
+          Validators.required,
+          // Validators.pattern('^[A-Za-z\\d@$!%*#?&]{8,20}$'),
+        ],
       ],
-      password: ['beteran', Validators.required],
       captchaSecurityCode: ['', Validators.required],
     });