Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/entities/auth/DTO.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface TokenRefreshResponse {

export interface ResetPasswordRequest {
email: string;
code: string;
}

export interface ResetPasswordResponse {
Expand All @@ -57,3 +58,8 @@ export interface AppleCallbackRequest {
id_token: string;
fcmToken?: string;
}

export interface SendEmailCertificationRequest {
email: string;
certificationType: "EMAIL" | "TEMPORARY_PASSWORD";
}
9 changes: 7 additions & 2 deletions src/entities/auth/hooks/useEmailCertification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@ import { toast } from "@/shared/hooks/useToast";
* 이메일 인증 번호 발송 API 호출
*/
export const useSendEmailCertification = () => {
return useMutation<boolean, Error, string>({
mutationFn: (email) => sendEmailCertification(email),
return useMutation<
boolean,
Error,
{ email: string; certificationType?: "EMAIL" | "TEMPORARY_PASSWORD" }
>({
mutationFn: ({ email, certificationType }) =>
sendEmailCertification(email, certificationType),
onError: (error) => {
let errorMessage = "잠시 후 다시 시도해주세요.";

Expand Down
9 changes: 6 additions & 3 deletions src/entities/user/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { getDefaultStore } from "jotai/vanilla";

import { getAccessToken, signOut } from "@/entities/auth/api";
import { SendEmailCertificationRequest } from "@/entities/auth/DTO.d";
import { userAtom } from "@/entities/auth/model";
import { apiCall } from "@/shared/api/utils";
import { API_PATHS } from "@/shared/config/api";
Expand Down Expand Up @@ -195,16 +196,18 @@ export const updateUserRole = async (
/**
* 이메일 인증 번호 발송
* @param email 인증 번호를 받을 이메일
* @param certificationType 인증 타입 (EMAIL | TEMPORARY_PASSWORD)
* @returns 발송 성공 여부
*/
export const sendEmailCertification = async (
email: string
email: string,
certificationType: "EMAIL" | "TEMPORARY_PASSWORD" = "EMAIL"
): Promise<boolean> => {
try {
await apiCall<{ email: string }, void>({
await apiCall<SendEmailCertificationRequest, void>({
method: "POST",
path: API_PATHS.USER.FIND_PASSWORD,
data: { email },
data: { email, certificationType },
withCredentials: true,
});

Expand Down
13 changes: 8 additions & 5 deletions src/pages/auth/find-password.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useResetPassword } from "@/entities/auth/hooks";
import { URL_PATHS } from "@/shared/constants/url-path";
import useFormData from "@/shared/hooks/useFormdata";
import { useStepNavigation } from "@/shared/hooks/useStepNavigation";
Expand Down Expand Up @@ -34,8 +33,6 @@ const FIND_PASSWORD_STEP_CONFIGS = {
};

export default function FindPasswordPage() {
const { mutate: resetPassword } = useResetPassword();

const {
currentStep: step,
goToPreviousStep,
Expand All @@ -57,16 +54,22 @@ export default function FindPasswordPage() {
goToNextStep();
},
2: () => {
resetPassword({ email: formData.email! });
// 임시 비밀번호 발급 완료
},
};

const stepComponents = {
1: <EmailForm onNext={stepHandlers[1]} />,
1: (
<EmailForm
onNext={stepHandlers[1]}
certificationType="TEMPORARY_PASSWORD"
/>
),
2: (
<EmailCertificationForm
email={formData.email!}
onNext={stepHandlers[2]}
mode="findPassword"
/>
),
};
Expand Down
42 changes: 31 additions & 11 deletions src/widgets/auth/ui/EmailCertificationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
import * as z from "zod";

import { useCheckEmailCertification } from "@/entities/auth/hooks";
import { useCheckEmailCertification, useResetPassword } from "@/entities/auth/hooks";
import CertificationField from "@/features/form/ui/fields/CertificationField";
import SubmitButton from "@/features/form/ui/SubmitButton";
import { Form } from "@/shared/ui/form";
Expand All @@ -15,14 +15,21 @@ export type EmailCertificationFormValues = z.infer<typeof step2Schema>;

interface EmailCertificationFormProps {
email: string;
onNext: () => void;
onNext: (certification?: string) => void;
mode?: "signup" | "findPassword";
}

export function EmailCertificationForm({
email,
onNext,
mode = "signup",
}: EmailCertificationFormProps) {
const { mutate: checkEmail, isPending } = useCheckEmailCertification();
const { mutate: checkEmail, isPending: isCheckPending } =
useCheckEmailCertification();
const { mutate: resetPassword, isPending: isResetPending } =
useResetPassword();

const isPending = isCheckPending || isResetPending;

const form = useForm<EmailCertificationFormValues>({
resolver: zodResolver(step2Schema),
Expand All @@ -31,14 +38,27 @@ export function EmailCertificationForm({
});

const onSubmit = (data: EmailCertificationFormValues) => {
checkEmail(
{ email, certification: data.certification },
{
onSuccess: (success: boolean) => {
if (success) onNext();
},
}
);
if (mode === "findPassword") {
// 비밀번호 찾기: 임시 비밀번호 발급 API 호출
resetPassword(
{ email, code: data.certification },
{
onSuccess: () => {
onNext(data.certification);
},
}
);
} else {
// 회원가입: 인증번호 검증만
checkEmail(
{ email, certification: data.certification },
{
onSuccess: (success: boolean) => {
if (success) onNext(data.certification);
},
}
);
}
};

return (
Expand Down
23 changes: 15 additions & 8 deletions src/widgets/auth/ui/EmailForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ const step1Schema = z.object({

export type EmailFormValues = z.infer<typeof step1Schema>;

interface EmailFormProps {
onNext: (data: EmailFormValues) => void;
certificationType?: "EMAIL" | "TEMPORARY_PASSWORD";
}

export function EmailForm({
onNext,
}: {
onNext: (data: EmailFormValues) => void;
}) {
certificationType = "EMAIL",
}: EmailFormProps) {
const { mutate: sendEmail, isPending } = useSendEmailCertification();

const form = useForm<EmailFormValues>({
Expand All @@ -27,11 +31,14 @@ export function EmailForm({
});

const onSubmit = (data: EmailFormValues) => {
sendEmail(data.email, {
onSuccess: (success: boolean) => {
if (success) onNext(data);
},
});
sendEmail(
{ email: data.email, certificationType },
{
onSuccess: (success: boolean) => {
if (success) onNext(data);
},
}
);
};

return (
Expand Down