;
+
+ userId: string;
+ userEmail: string | null;
+
+ emailSettings: {
+ fromEmail: string;
+ productName: string;
+ };
+ }) {
Logger.info(
{ userId: params.userId, name: this.namespace },
'User requested deletion. Processing...',
);
+ // execute the deletion of the user
try {
- await adminClient.auth.admin.deleteUser(params.userId);
+ await params.adminClient.auth.admin.deleteUser(params.userId);
} catch (error) {
Logger.error(
{
@@ -46,6 +55,7 @@ export class PersonalAccountsService {
throw new Error('Error deleting user');
}
+ // Cancel all user subscriptions
try {
await this.cancelAllUserSubscriptions(params.userId);
} catch (error) {
@@ -55,6 +65,57 @@ export class PersonalAccountsService {
name: this.namespace,
});
}
+
+ // Send account deletion email
+ if (params.userEmail) {
+ try {
+ Logger.info(
+ {
+ userId: params.userId,
+ name: this.namespace,
+ },
+ `Sending account deletion email...`,
+ );
+
+ await this.sendAccountDeletionEmail({
+ fromEmail: params.emailSettings.fromEmail,
+ productName: params.emailSettings.productName,
+ userDisplayName: params.userEmail,
+ userEmail: params.userEmail,
+ });
+ } catch (error) {
+ Logger.error(
+ {
+ userId: params.userId,
+ name: this.namespace,
+ error,
+ },
+ `Error sending account deletion email`,
+ );
+ }
+ }
+ }
+
+ private async sendAccountDeletionEmail(params: {
+ fromEmail: string;
+ userEmail: string;
+ userDisplayName: string;
+ productName: string;
+ }) {
+ const { renderAccountDeleteEmail } = await import('@kit/email-templates');
+ const mailer = new Mailer();
+
+ const html = await renderAccountDeleteEmail({
+ userDisplayName: params.userDisplayName,
+ productName: params.productName,
+ });
+
+ await mailer.sendEmail({
+ to: params.userEmail,
+ from: params.fromEmail,
+ subject: 'Account Deletion Request',
+ html,
+ });
}
private async cancelAllUserSubscriptions(userId: string) {
@@ -93,6 +154,7 @@ export class PersonalAccountsService {
);
}
+ // execute all cancellation requests
await Promise.all(cancellationRequests);
Logger.info(
diff --git a/packages/features/auth/src/components/email-otp-container.tsx b/packages/features/auth/src/components/email-otp-container.tsx
deleted file mode 100644
index c5578ef26..000000000
--- a/packages/features/auth/src/components/email-otp-container.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { useSignInWithOtp } from '@kit/supabase/hooks/use-sign-in-with-otp';
-import { useVerifyOtp } from '@kit/supabase/hooks/use-verify-otp';
-import { Button } from '@kit/ui/button';
-import { If } from '@kit/ui/if';
-import { Input } from '@kit/ui/input';
-import { Label } from '@kit/ui/label';
-import { OtpInput } from '@kit/ui/otp-input';
-import { Trans } from '@kit/ui/trans';
-
-export function EmailOtpContainer({
- shouldCreateUser,
- onSignIn,
- inviteCode,
- redirectUrl,
-}: React.PropsWithChildren<{
- inviteCode?: string;
- redirectUrl: string;
- shouldCreateUser: boolean;
- onSignIn?: () => void;
-}>) {
- const [email, setEmail] = useState('');
-
- if (email) {
- return (
-
- );
- }
-
- return (
-
- );
-}
-
-function VerifyOtpForm({
- email,
- inviteCode,
- onSuccess,
- redirectUrl,
-}: {
- email: string;
- redirectUrl: string;
- onSuccess?: () => void;
- inviteCode?: string;
-}) {
- const verifyOtpMutation = useVerifyOtp();
- const [verifyCode, setVerifyCode] = useState('');
-
- return (
-
- );
-}
-
-function EmailOtpForm({
- shouldCreateUser,
- onSuccess,
-}: React.PropsWithChildren<{
- shouldCreateUser: boolean;
- onSuccess: (email: string) => void;
-}>) {
- const signInWithOtpMutation = useSignInWithOtp();
-
- return (
-
- );
-}
diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json
index 962a7a036..6f1fec1bd 100644
--- a/packages/features/team-accounts/package.json
+++ b/packages/features/team-accounts/package.json
@@ -13,7 +13,7 @@
},
"devDependencies": {
"@kit/accounts": "*",
- "@kit/emails": "*",
+ "@kit/email-templates": "*",
"@kit/eslint-config": "0.2.0",
"@kit/mailers": "*",
"@kit/prettier-config": "0.1.0",
@@ -22,12 +22,12 @@
"@kit/tailwind-config": "0.1.0",
"@kit/tsconfig": "0.1.0",
"@kit/ui": "*",
- "@hookform/resolvers/zod": "1.0.0",
+ "@hookform/resolvers": "^3.3.4",
"lucide-react": "^0.363.0"
},
"peerDependencies": {
"@kit/accounts": "0.1.0",
- "@kit/emails": "0.1.0",
+ "@kit/email-templates": "0.1.0",
"@kit/mailers": "0.1.0",
"@kit/shared": "0.1.0",
"@kit/supabase": "0.1.0",
diff --git a/packages/features/team-accounts/src/services/account-invitations.service.ts b/packages/features/team-accounts/src/services/account-invitations.service.ts
index cded7f533..22281c0bf 100644
--- a/packages/features/team-accounts/src/services/account-invitations.service.ts
+++ b/packages/features/team-accounts/src/services/account-invitations.service.ts
@@ -149,7 +149,9 @@ export class AccountInvitationsService {
for (const invitation of responseInvitations) {
const promise = async () => {
try {
- const { renderInviteEmail } = await import('@kit/emails');
+ const { renderInviteEmail } = await import(
+ '../../../../email-templates'
+ );
const html = renderInviteEmail({
link: this.getInvitationLink(invitation.invite_token),
diff --git a/packages/supabase/package.json b/packages/supabase/package.json
index b15a8608e..c0b6eaa54 100644
--- a/packages/supabase/package.json
+++ b/packages/supabase/package.json
@@ -29,13 +29,13 @@
"@kit/tailwind-config": "0.1.0",
"@kit/tsconfig": "0.1.0",
"@supabase/ssr": "^0.1.0",
- "@supabase/supabase-js": "^2.39.8",
+ "@supabase/supabase-js": "^2.40.0",
"@tanstack/react-query": "5.28.6"
},
"peerDependencies": {
"@epic-web/invariant": "^1.0.0",
"@supabase/ssr": "^0.1.0",
- "@supabase/supabase-js": "^2.39.8",
+ "@supabase/supabase-js": "^2.40.0",
"@tanstack/react-query": "^5.28.6"
},
"eslintConfig": {
diff --git a/packages/ui/package.json b/packages/ui/package.json
index b5510c719..3186a8e45 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -9,6 +9,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
+ "@hookform/resolvers": "^3.3.4",
"@radix-ui/react-accordion": "1.1.2",
"@radix-ui/react-alert-dialog": "^1.0.5",
"@radix-ui/react-avatar": "^1.0.4",
@@ -38,7 +39,7 @@
"class-variance-authority": "^0.7.0",
"date-fns": "^3.2.0",
"lucide-react": "^0.363.0",
- "react-hook-form": "^7.49.2",
+ "react-hook-form": "^7.51.2",
"react-i18next": "^14.1.0",
"sonner": "^1.4.41",
"zod": "^3.22.4"
@@ -58,7 +59,7 @@
"lucide-react": "^0.363.0",
"prettier": "^3.2.4",
"react-day-picker": "^8.10.0",
- "react-hook-form": "^7.51.1",
+ "react-hook-form": "^7.51.2",
"react-i18next": "^14.1.0",
"sonner": "^1.4.41",
"tailwindcss": "3.4.1",
diff --git a/packages/ui/src/makerkit/mdx/mdx-renderer.tsx b/packages/ui/src/makerkit/mdx/mdx-renderer.tsx
index fce708615..73931d83e 100644
--- a/packages/ui/src/makerkit/mdx/mdx-renderer.tsx
+++ b/packages/ui/src/makerkit/mdx/mdx-renderer.tsx
@@ -2,7 +2,7 @@ import type { MDXComponents } from 'mdx/types';
import { getMDXComponent } from 'next-contentlayer/hooks';
import Components from './mdx-components';
-// @ts-expect-error
+// @ts-ignore
import styles from './mdx-renderer.module.css';
export function Mdx({
diff --git a/packages/ui/src/shadcn/form.tsx b/packages/ui/src/shadcn/form.tsx
index ebe0f40c7..335659df3 100644
--- a/packages/ui/src/shadcn/form.tsx
+++ b/packages/ui/src/shadcn/form.tsx
@@ -5,7 +5,7 @@ import { Slot } from '@radix-ui/react-slot';
import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form';
import { Controller, FormProvider, useFormContext } from 'react-hook-form';
-import { cn } from '../utils/cn';
+import { cn } from '../utils';
import { Label } from './label';
const Form = FormProvider;
diff --git a/packages/ui/src/shadcn/input-otp.tsx b/packages/ui/src/shadcn/input-otp.tsx
index 5648462b6..a626efdc9 100644
--- a/packages/ui/src/shadcn/input-otp.tsx
+++ b/packages/ui/src/shadcn/input-otp.tsx
@@ -36,7 +36,13 @@ const InputOTPSlot = React.forwardRef<
React.ComponentPropsWithoutRef<'div'> & { index: number }
>(({ index, className, ...props }, ref) => {
const inputOTPContext = React.useContext(OTPInputContext);
- const { char, hasFakeCaret, isActive } = inputOTPContext.slots[index];
+ const slot = inputOTPContext.slots[index];
+
+ if (!slot) {
+ return null;
+ }
+
+ const { char, isActive, hasFakeCaret } = slot;
return (
=12.22.0'}
peerDependencies:
react: ^16.8.0 || ^17 || ^18
diff --git a/turbo.json b/turbo.json
index 9ac375933..1fa92bd2a 100644
--- a/turbo.json
+++ b/turbo.json
@@ -55,6 +55,17 @@
"globalEnv": [
"SKIP_ENV_VALIDATION",
"STRIPE_SECRET_KEY",
- "STRIPE_WEBHOOK_SECRET"
+ "STRIPE_WEBHOOK_SECRET",
+ "NEXT_PUBLIC_PRODUCT_NAME",
+ "EMAIL_SENDER",
+ "EMAIL_PORT",
+ "EMAIL_HOST",
+ "EMAIL_TLS",
+ "EMAIL_USER",
+ "EMAIL_PASSWORD",
+ "SIGN_IN_PATH",
+ "SIGN_UP_PATH",
+ "TEAM_ACCOUNTS_HOME_PATH",
+ "INVITATION_PAGE_PATH"
]
}
\ No newline at end of file