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

chore: code refactor to avoid repetitions

Browse Source
This commit is contained in:
Ephraim Atta-Duncan
2024-02-15 11:33:43 +00:00
parent c680cfc24f
commit fddd860d15
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,9 +113,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
} }
}; };
const onDeleteAccount = async (hasTwoFactorAuthentication: boolean) => { const deleteAccoutAndSignOut = async () => {
try {
if (!hasTwoFactorAuthentication) {
await deleteAccount(); await deleteAccount();
toast({ toast({
@ -125,6 +123,12 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
}); });
return await signOut({ callbackUrl: '/' }); return await signOut({ callbackUrl: '/' });
};
const onDeleteAccount = async (hasTwoFactorAuthentication: boolean) => {
try {
if (!hasTwoFactorAuthentication) {
return await deleteAccoutAndSignOut();
} }
const { token } = deleteAccountTwoFactorTokenForm.getValues(); const { token } = deleteAccountTwoFactorTokenForm.getValues();
@ -140,15 +144,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
throw new Error('We were unable to validate your Two Factor Authentication token.'); throw new Error('We were unable to validate your Two Factor Authentication token.');
}); });
await deleteAccount(); await deleteAccoutAndSignOut();
toast({
title: 'Account deleted',
description: 'Your account has been deleted successfully.',
duration: 5000,
});
await signOut({ callbackUrl: '/' });
} catch (err) { } catch (err) {
if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') { if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
toast({ toast({

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

@ -1,4 +1,5 @@
import { prisma } from '@documenso/prisma'; import { prisma } from '@documenso/prisma';
import { DocumentStatus } from '@documenso/prisma/client';
export type DeleteUserOptions = { export type DeleteUserOptions = {
email: string; email: string;
@ -31,7 +32,7 @@ export const deletedServiceAccount = async ({ email }: DeleteUserOptions) => {
where: { where: {
userId: user.id, userId: user.id,
status: { status: {
in: ['PENDING', 'COMPLETED'], in: [DocumentStatus.PENDING, DocumentStatus.COMPLETED],
}, },
}, },
data: { data: {