Skip to content

The Open Source DocuSign Alternative.

chore: update pr based on review

Ephraim Atta-Duncanc680cfc24f54
diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx
index 7a4bbdb77..a44e70940 100644
--- a/apps/web/src/components/forms/profile.tsx
+++ b/apps/web/src/components/forms/profile.tsx
@@ -124,9 +124,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
duration: 5000,
});
- await signOut({ callbackUrl: '/' });
-
- return;
+ return await signOut({ callbackUrl: '/' });
}
const { token } = deleteAccountTwoFactorTokenForm.getValues();
diff --git a/packages/ee/server-only/stripe/delete-customer.ts b/packages/ee/server-only/stripe/delete-customer.ts
deleted file mode 100644
index 16120de68..000000000
--- a/packages/ee/server-only/stripe/delete-customer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { stripe } from '@documenso/lib/server-only/stripe';
-import type { User } from '@documenso/prisma/client';
-
-export const deleteStripeCustomer = async (user: User) => {
- if (!user.customerId) {
- return null;
- }
-
- return await stripe.customers.del(user.customerId);
-};
diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts
index 352f5c9e9..02d811b12 100644
--- a/packages/lib/server-only/user/delete-user.ts
+++ b/packages/lib/server-only/user/delete-user.ts
@@ -4,7 +4,7 @@ export type DeleteUserOptions = {
email: string;
};
-export const deleteUser = async ({ email }: DeleteUserOptions) => {
+export const deletedServiceAccount = async ({ email }: DeleteUserOptions) => {
const user = await prisma.user.findFirst({
where: {
email: {
diff --git a/packages/trpc/server/auth-router/schema.ts b/packages/trpc/server/auth-router/schema.ts
index 49826d7ad..dbe42a25c 100644
--- a/packages/trpc/server/auth-router/schema.ts
+++ b/packages/trpc/server/auth-router/schema.ts
@@ -26,9 +26,3 @@ export const ZSignUpMutationSchema = z.object({
export type TSignUpMutationSchema = z.infer<typeof ZSignUpMutationSchema>;
export const ZVerifyPasswordMutationSchema = ZSignUpMutationSchema.pick({ password: true });
-
-export const ZDeleteAccountMutationSchema = z.object({
- email: z.string().email(),
-});
-
-export type TDeleteAccountMutationSchema = z.infer<typeof ZDeleteAccountMutationSchema>;
diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts
index 552057bdd..56a6eea29 100644
--- a/packages/trpc/server/profile-router/router.ts
+++ b/packages/trpc/server/profile-router/router.ts
@@ -1,7 +1,6 @@
import { TRPCError } from '@trpc/server';
-import { deleteStripeCustomer } from '@documenso/ee/server-only/stripe/delete-customer';
-import { deleteUser } from '@documenso/lib/server-only/user/delete-user';
+import { deletedServiceAccount } from '@documenso/lib/server-only/user/delete-user';
import { findUserSecurityAuditLogs } from '@documenso/lib/server-only/user/find-user-security-audit-logs';
import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password';
import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id';
@@ -161,9 +160,8 @@ export const profileRouter = router({
deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => {
try {
const user = ctx.user;
- await deleteStripeCustomer(user);
- return await deleteUser(user);
+ return await deletedServiceAccount(user);
} catch (err) {
let message = 'We were unable to delete your account. Please try again.';