1
1
import { useJoinState } from '../../stores/joinStore' ;
2
- import { isValidName , isValidFormatPhone , isValidEmail , isValidPassword , isValidPwCheck } from '@/utils/authUtils.ts' ;
2
+ import { LooseValidation , ValidateProcessor } from '../../utils/authUtils.ts' ;
3
+ import { FormatPhone } from './FormatPhone.tsx' ;
3
4
import { useRef , useState } from 'react' ;
4
5
import useSignUp from '@/react-queries/useSignUp' ;
5
6
import { isAuthError } from '@supabase/supabase-js' ;
@@ -23,31 +24,32 @@ const messages = {
23
24
24
25
const JoinButton = ( ) => {
25
26
const { nickName, name, phone, email, password, pwCheck, useTermsCheck, privacyTermsCheck } = useJoinState ( ) ;
27
+ const validator = new ValidateProcessor ( new LooseValidation ( ) ) ;
26
28
const { mutate, isPending } = useSignUp ( ) ;
27
29
const navigate = useNavigate ( ) ;
28
30
const dialogRef = useRef < DialogElement | null > ( null ) ;
29
31
const [ dialogMessage , setDialogMessage ] = useState ( '' ) ;
30
32
31
33
const onClick = ( ) => {
32
- if ( ! isValidEmail ( email ) || ! isValidPassword ( password ) ) {
34
+ if ( ! validator . isValidEmail ( email ) || ! validator . isValidPassword ( password ) ) {
33
35
setDialogMessage ( messages . EMAIL_PASSWORD_ISVAILD_ERROR ) ;
34
36
dialogRef . current ?. openModal ( ) ;
35
37
return ;
36
38
}
37
39
38
- if ( ! isValidName ( name ) ) {
40
+ if ( ! validator . isValidName ( name ) ) {
39
41
setDialogMessage ( messages . NAME_ISVAILD_ERROR ) ;
40
42
dialogRef . current ?. openModal ( ) ;
41
43
return ;
42
44
}
43
45
44
- if ( ! isValidFormatPhone ( phone ) ) {
46
+ if ( ! FormatPhone ( phone ) ) {
45
47
setDialogMessage ( messages . PHONE_ISVAILD_ERROR ) ;
46
48
dialogRef . current ?. openModal ( ) ;
47
49
return ;
48
50
}
49
51
50
- if ( ! isValidPwCheck ( password , pwCheck ) ) {
52
+ if ( ! validator . isValidPwCheck ( password , pwCheck ) ) {
51
53
setDialogMessage ( messages . PWCHECK_ISVAILD_ERROR ) ;
52
54
dialogRef . current ?. openModal ( ) ;
53
55
return ;
0 commit comments