09cf8885cf
* feat: extract tRPC verification logic to platform libraries and create v2 atoms endpoints - Extract verifyCodeUnAuthenticated, verifyCodeAuthenticated, and sendVerifyEmailCode logic from tRPC handlers into reusable platform library functions - Create VerificationAtomsService and AtomsVerificationController following atoms pattern - Add v2 endpoints: /atoms/verification/email/send-code, /atoms/verification/email/verify-code, /atoms/verification/email/verify-code-authenticated - Update useVerifyEmail and useVerifyCode hooks to use new v2 endpoints instead of verified-resources endpoints - Export verification functions from @calcom/platform-libraries following getPublicEvent pattern - Integrate platform-specific verification hooks into BookerPlatformWrapper Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * feat: update platform hooks to use v2 verification endpoints - Update useVerifyEmail hook to use correct response type for v2 endpoint - Update useVerifyCode hook to use v2 verification endpoint - All verification functions now properly exported from platform libraries - Type checking passes with no errors Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * fix: update v2 API to use workspace version of platform-libraries - Change package.json dependency from pinned version to workspace version - Add proper error handling to verification service with NestJS HTTP exceptions - Convert generic Error objects to BadRequestException and UnauthorizedException - Ensure verification endpoints return proper HTTP status codes instead of 500 errors Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * chore: update auto-generated files after package.json changes - Update OpenAPI documentation for v2 verification endpoints - Update yarn.lock after changing platform-libraries dependency Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * refactor: extract verification logic from tRPC handlers into exportable functions - Refactor sendVerifyEmailCode.handler.ts to extract core logic into sendVerifyEmailCode function - Refactor verifyCodeUnAuthenticated.handler.ts to extract core logic into verifyCodeUnAuthenticated function - Refactor organizations/verifyCode.handler.ts to extract core logic into verifyCodeAuthenticated function - Update platform/libraries/index.ts to import from refactored handler files instead of standalone verification.ts - Remove standalone verification.ts file as requested by user - Keep original tRPC handlers as wrappers that call the extracted functions - Maintain backward compatibility for existing tRPC endpoints Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * extract logic into seperate functions * Update index.ts * refactor: remove unused type imports from verification-atom service * feat: create v2 atoms input/output types for verification endpoints - Add SendVerificationEmailInput and VerifyEmailCodeInput with validation decorators - Add SendVerificationEmailOutput and VerifyEmailCodeOutput following v2 atoms patterns - Update atoms verification controller to use custom types instead of platform types - Auto-update openapi.json with new type definitions Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * fix: add missing type imports to verification service - Import ZVerifyCodeInputSchema from @calcom/prisma/zod-utils - Import VerifyCodeAuthenticatedInput from organizations handler - Import TSendVerifyEmailCodeSchema from sendVerifyEmailCode schema - Resolves CI build failure in API v2 tests Co-Authored-By: somay@cal.com <somaychauhan98@gmail.com> * feat: add email verification check endpoint and refactor verification flow * added Throttle * added chagelog * chore: update platform libraries to 0.0.317 * refactor: remove unused context and update email verification query key dependencies * chore: bump @calcom/platform-libraries from 0.0.318 to 0.0.319 * Update verifyCode.handler.ts * chore: bump @calcom/platform-libraries from 0.0.319 to 0.0.320 --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
105 lines
3.3 KiB
TypeScript
105 lines
3.3 KiB
TypeScript
import { useMutation } from "@tanstack/react-query";
|
|
import { useQuery } from "@tanstack/react-query";
|
|
import { useState } from "react";
|
|
|
|
import { useBookerStore } from "@calcom/features/bookings/Booker/store";
|
|
import { useDebounce } from "@calcom/lib/hooks/useDebounce";
|
|
import { SUCCESS_STATUS } from "@calcom/platform-constants";
|
|
import type { ApiResponse, ApiErrorResponse, ApiSuccessResponseWithoutData } from "@calcom/platform-types";
|
|
|
|
import { useMe } from "../hooks/useMe";
|
|
import http from "../lib/http";
|
|
|
|
export interface IUseVerifyEmailProps {
|
|
email: string;
|
|
onVerifyEmail?: () => void;
|
|
name?: string | { firstName: string; lastname?: string };
|
|
requiresBookerEmailVerification?: boolean;
|
|
}
|
|
|
|
export type UseVerifyEmailReturnType = ReturnType<typeof useVerifyEmail>;
|
|
|
|
interface RequestEmailVerificationInput {
|
|
email: string;
|
|
username?: string;
|
|
}
|
|
|
|
export const useVerifyEmail = ({
|
|
email,
|
|
name,
|
|
requiresBookerEmailVerification,
|
|
onVerifyEmail,
|
|
}: IUseVerifyEmailProps) => {
|
|
const [isEmailVerificationModalVisible, setEmailVerificationModalVisible] = useState(false);
|
|
const verifiedEmail = useBookerStore((state) => state.verifiedEmail);
|
|
const setVerifiedEmail = useBookerStore((state) => state.setVerifiedEmail);
|
|
const debouncedEmail = useDebounce(email, 600);
|
|
const { data: user } = useMe();
|
|
|
|
const { data: isEmailVerificationRequired } = useQuery<boolean>({
|
|
queryKey: ["isEmailVerificationRequired", debouncedEmail],
|
|
queryFn: () => {
|
|
return http
|
|
?.get<ApiResponse<boolean>>("/atoms/verification/email/check", {
|
|
params: {
|
|
email: debouncedEmail,
|
|
userSessionEmail: user?.data?.email || "",
|
|
},
|
|
})
|
|
.then((res) => {
|
|
if (res.data.status === SUCCESS_STATUS) {
|
|
return res.data.data;
|
|
}
|
|
throw new Error(res.data.error.message);
|
|
});
|
|
},
|
|
enabled: !!debouncedEmail,
|
|
});
|
|
|
|
const sendEmailVerificationMutation = useMutation<
|
|
ApiSuccessResponseWithoutData,
|
|
ApiErrorResponse,
|
|
RequestEmailVerificationInput
|
|
>({
|
|
mutationFn: (props: RequestEmailVerificationInput) => {
|
|
return http
|
|
.post<ApiResponse<{ sent: boolean }>>("/atoms/verification/email/send-code", props)
|
|
.then((res) => {
|
|
if (res.data.status === SUCCESS_STATUS) {
|
|
return res.data;
|
|
}
|
|
throw new Error(res.data.error?.message || "Failed to send verification email");
|
|
});
|
|
},
|
|
onSuccess: () => {
|
|
setEmailVerificationModalVisible(true);
|
|
},
|
|
onError: (err) => {
|
|
console.error("Failed to send verification email:", err);
|
|
},
|
|
});
|
|
|
|
const handleVerifyEmail = () => {
|
|
onVerifyEmail?.();
|
|
sendEmailVerificationMutation.mutate({
|
|
email,
|
|
username: typeof name === "string" ? name : name?.firstName,
|
|
});
|
|
};
|
|
|
|
const isVerificationCodeSending = sendEmailVerificationMutation.isPending;
|
|
|
|
const renderConfirmNotVerifyEmailButtonCond =
|
|
(!requiresBookerEmailVerification && !isEmailVerificationRequired) ||
|
|
(email && verifiedEmail && verifiedEmail === email);
|
|
|
|
return {
|
|
handleVerifyEmail,
|
|
isEmailVerificationModalVisible,
|
|
setEmailVerificationModalVisible,
|
|
setVerifiedEmail,
|
|
renderConfirmNotVerifyEmailButtonCond: Boolean(renderConfirmNotVerifyEmailButtonCond),
|
|
isVerificationCodeSending,
|
|
};
|
|
};
|