Skip to content

Commit

Permalink
Merge pull request #27 from gsainfoteam/siwonpada/issue26
Browse files Browse the repository at this point in the history
[Bug] 비밀번호 변경 cert code 받는 곳에서 conflict exception이 발생
  • Loading branch information
siwonpada authored Oct 5, 2024
2 parents 80c97cc + 0d41612 commit 0a6a3c6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
11 changes: 9 additions & 2 deletions src/api/register.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import api from ".";

export const requestEmailVerification = async (email: string) =>
api.post("/user/register/code", { email });
export enum EmailVerificationType {
Register = "register",
FindPassword = "password",
}

export const requestEmailVerification = async (
email: string,
type: EmailVerificationType,
) => api.post("/user/register/code", { email, type });

export const verifyEmail = async (email: string, code: string) =>
api
Expand Down
8 changes: 6 additions & 2 deletions src/pages/FindPassword/useFindPassword.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate, useSearchParams } from "react-router-dom";
import { requestEmailVerification, verifyEmail } from "src/api/register";
import {
EmailVerificationType,
requestEmailVerification,
verifyEmail,
} from "src/api/register";
import { changePassword } from "src/api/user";
import Swal from "sweetalert2";

Expand Down Expand Up @@ -52,7 +56,7 @@ const useFindPassword = () => {

try {
setLoading(true);
await requestEmailVerification(email);
await requestEmailVerification(email, EmailVerificationType.FindPassword);
Swal.fire({
icon: "success",
title: "Success!",
Expand Down
3 changes: 2 additions & 1 deletion src/pages/Register/useRegister.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useNavigate, useSearchParams } from "react-router-dom";
import {
EmailVerificationType,
register,
requestEmailVerification,
verifyEmail,
Expand Down Expand Up @@ -56,7 +57,7 @@ const useRegister = () => {

try {
setLoading(true);
await requestEmailVerification(email);
await requestEmailVerification(email, EmailVerificationType.Register);
Swal.fire({
icon: "success",
title: "Success!",
Expand Down

0 comments on commit 0a6a3c6

Please sign in to comment.