wip

packages/lib/server-only/user/create-user.ts

@@ -1,9 +1,9 @@
 import { hash } from '@node-rs/bcrypt';
+import { IdentityProvider, TeamMemberInviteStatus } from '@prisma/client';
 
 import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
 import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { prisma } from '@documenso/prisma';
-import { IdentityProvider, TeamMemberInviteStatus } from '@documenso/prisma/client';
 
 import { IS_BILLING_ENABLED } from '../../constants/app';
 import { SALT_ROUNDS } from '../../constants/auth';

packages/lib/server-only/user/delete-user.ts

@@ -1,5 +1,6 @@
+import { DocumentStatus } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import { DocumentStatus } from '@documenso/prisma/client';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { deletedAccountServiceAccount } from './service-accounts/deleted-account';

packages/lib/server-only/user/find-user-security-audit-logs.ts

@@ -1,5 +1,6 @@
+import type { UserSecurityAuditLog, UserSecurityAuditLogType } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import type { UserSecurityAuditLog, UserSecurityAuditLogType } from '@documenso/prisma/client';
 
 import type { FindResultResponse } from '../../types/search-params';
 

packages/lib/server-only/user/forgot-password.ts

@@ -1,9 +1,9 @@
 import crypto from 'crypto';
 
 import { prisma } from '@documenso/prisma';
-import { TForgotPasswordFormSchema } from '@documenso/trpc/server/profile-router/schema';
+import type { TForgotPasswordFormSchema } from '@documenso/trpc/server/profile-router/schema';
 
-import { ONE_DAY, ONE_HOUR } from '../../constants/time';
+import { ONE_DAY } from '../../constants/time';
 import { sendForgotPassword } from '../auth/send-forgot-password';
 
 export const forgotPassword = async ({ email }: TForgotPasswordFormSchema) => {
@@ -21,21 +21,21 @@ export const forgotPassword = async ({ email }: TForgotPasswordFormSchema) => {
   }
 
   // Find a token that was created in the last hour and hasn't expired
-  const existingToken = await prisma.passwordResetToken.findFirst({
-    where: {
-      userId: user.id,
-      expiry: {
-        gt: new Date(),
-      },
-      createdAt: {
-        gt: new Date(Date.now() - ONE_HOUR),
-      },
-    },
-  });
+  // const existingToken = await prisma.passwordResetToken.findFirst({
+  //   where: {
+  //     userId: user.id,
+  //     expiry: {
+  //       gt: new Date(),
+  //     },
+  //     createdAt: {
+  //       gt: new Date(Date.now() - ONE_HOUR),
+  //     },
+  //   },
+  // });
 
-  if (existingToken) {
-    return;
-  }
+  // if (existingToken) {
+  //   return;
+  // }
 
   const token = crypto.randomBytes(18).toString('hex');
 

packages/lib/server-only/user/get-all-users.ts

@@ -1,5 +1,6 @@
+import { Prisma } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import { Prisma } from '@documenso/prisma/client';
 
 type GetAllUsersProps = {
   username: string;

packages/lib/server-only/user/get-monthly-completed-document.ts

@@ -1,7 +1,7 @@
+import { DocumentStatus } from '@prisma/client';
 import { DateTime } from 'luxon';
 
 import { kyselyPrisma, sql } from '@documenso/prisma';
-import { DocumentStatus } from '@documenso/prisma/client';
 
 export const getCompletedDocumentsMonthly = async () => {
   const qb = kyselyPrisma.$kysely

packages/lib/server-only/user/get-user-public-profile.ts

@@ -1,5 +1,6 @@
+import type { UserProfile } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import type { UserProfile } from '@documenso/prisma/client';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { updatePublicProfile } from './update-public-profile';

packages/lib/server-only/user/reset-password.ts

@@ -1,12 +1,12 @@
 import { compare, hash } from '@node-rs/bcrypt';
+import { UserSecurityAuditLogType } from '@prisma/client';
 
 import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';
 
 import { SALT_ROUNDS } from '../../constants/auth';
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { jobsClient } from '../../jobs/client';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
-import { sendResetPassword } from '../auth/send-reset-password';
 
 export type ResetPasswordOptions = {
   token: string;
@@ -46,29 +46,36 @@ export const resetPassword = async ({ token, password, requestMetadata }: ResetP
 
   const hashedPassword = await hash(password, SALT_ROUNDS);
 
-  await prisma.$transaction([
-    prisma.user.update({
+  await prisma.$transaction(async (tx) => {
+    await tx.user.update({
       where: {
         id: foundToken.userId,
       },
       data: {
         password: hashedPassword,
       },
-    }),
-    prisma.passwordResetToken.deleteMany({
+    });
+
+    await tx.passwordResetToken.deleteMany({
       where: {
         userId: foundToken.userId,
       },
-    }),
-    prisma.userSecurityAuditLog.create({
+    });
+
+    await tx.userSecurityAuditLog.create({
       data: {
         userId: foundToken.userId,
         type: UserSecurityAuditLogType.PASSWORD_RESET,
         userAgent: requestMetadata?.userAgent,
         ipAddress: requestMetadata?.ipAddress,
       },
-    }),
-  ]);
+    });
 
-  await sendResetPassword({ userId: foundToken.userId });
+    await jobsClient.triggerJob({
+      name: 'send.password.reset.success.email',
+      payload: {
+        userId: foundToken.userId,
+      },
+    });
+  });
 };

packages/lib/server-only/user/update-password.ts

@@ -1,9 +1,9 @@
 import { compare, hash } from '@node-rs/bcrypt';
+import { UserSecurityAuditLogType } from '@prisma/client';
 
 import { SALT_ROUNDS } from '@documenso/lib/constants/auth';
 import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';
 
 import { AppError } from '../../errors/app-error';
 

packages/lib/server-only/user/update-profile.ts

@@ -1,5 +1,6 @@
+import { UserSecurityAuditLogType } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';
 
 import type { RequestMetadata } from '../../universal/extract-request-metadata';