Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-13 08:13:56 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore: update pr based on review

Browse Source
This commit is contained in:
Ephraim Atta-Duncan
2024-02-14 14:52:18 +00:00
parent cab875f68a
commit c680cfc24f
5 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/components/forms/profile.tsx
View File

@ -124,9 +124,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
duration: 5000,
});
await signOut({ callbackUrl: '/' });
return;
return await signOut({ callbackUrl: '/' });
}
const { token } = deleteAccountTwoFactorTokenForm.getValues();

10
packages/ee/server-only/stripe/delete-customer.ts
View File

@ -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);
};

2
packages/lib/server-only/user/delete-user.ts
View File

@ -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: {

6
packages/trpc/server/auth-router/schema.ts
View File

@ -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>;

6
packages/trpc/server/profile-router/router.ts
View File

@ -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.';