fix: wip

packages/lib/constants/teams.ts

@@ -2,7 +2,7 @@ import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/macro';
 import { TeamMemberRole } from '@prisma/client';
 
-export const TEAM_URL_ROOT_REGEX = new RegExp('^/t/[^/]+$');
+export const TEAM_URL_ROOT_REGEX = new RegExp('^/t/[^/]+/?$');
 export const TEAM_URL_REGEX = new RegExp('^/t/[^/]+');
 
 export const TEAM_MEMBER_ROLE_MAP: Record<keyof typeof TeamMemberRole, MessageDescriptor> = {

packages/lib/next-auth/error-codes.ts

@@ -1,28 +0,0 @@
-// export const isErrorCode = (code: unknown): code is ErrorCode => {
-//   return typeof code === 'string' && code in ErrorCode;
-// };
-
-// export type ErrorCode = (typeof ErrorCode)[keyof typeof ErrorCode];
-
-// Todo: Delete file
-// Todo: Delete file
-// Todo: Delete file
-// Todo: Delete file
-// export const ErrorCode = {
-//   INCORRECT_EMAIL_PASSWORD: 'INCORRECT_EMAIL_PASSWORD',
-//   USER_MISSING_PASSWORD: 'USER_MISSING_PASSWORD',
-//   CREDENTIALS_NOT_FOUND: 'CREDENTIALS_NOT_FOUND',
-//   INTERNAL_SEVER_ERROR: 'INTERNAL_SEVER_ERROR',
-//   TWO_FACTOR_ALREADY_ENABLED: 'TWO_FACTOR_ALREADY_ENABLED',
-//   TWO_FACTOR_SETUP_REQUIRED: 'TWO_FACTOR_SETUP_REQUIRED',
-//   TWO_FACTOR_MISSING_SECRET: 'TWO_FACTOR_MISSING_SECRET',
-//   TWO_FACTOR_MISSING_CREDENTIALS: 'TWO_FACTOR_MISSING_CREDENTIALS',
-//   INCORRECT_TWO_FACTOR_CODE: 'INCORRECT_TWO_FACTOR_CODE',
-//   INCORRECT_TWO_FACTOR_BACKUP_CODE: 'INCORRECT_TWO_FACTOR_BACKUP_CODE',
-//   INCORRECT_IDENTITY_PROVIDER: 'INCORRECT_IDENTITY_PROVIDER',
-//   INCORRECT_PASSWORD: 'INCORRECT_PASSWORD',
-//   MISSING_ENCRYPTION_KEY: 'MISSING_ENCRYPTION_KEY',
-//   MISSING_BACKUP_CODE: 'MISSING_BACKUP_CODE',
-//   UNVERIFIED_EMAIL: 'UNVERIFIED_EMAIL',
-//   ACCOUNT_DISABLED: 'ACCOUNT_DISABLED',
-// } as const;

packages/lib/next-auth/get-server-component-session.ts

@@ -1,39 +0,0 @@
-'use server';
-
-import { cache } from 'react';
-
-import { getServerSession as getNextAuthServerSession } from 'next-auth';
-
-import { prisma } from '@documenso/prisma';
-
-import { NEXT_AUTH_OPTIONS } from './auth-options';
-
-export const getServerComponentSession = cache(async () => {
-  const session = await getNextAuthServerSession(NEXT_AUTH_OPTIONS);
-
-  if (!session || !session.user?.email) {
-    return { user: null, session: null };
-  }
-
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      email: session.user.email,
-    },
-  });
-
-  if (user.disabled) {
-    return { user: null, session: null };
-  }
-
-  return { user, session };
-});
-
-export const getRequiredServerComponentSession = cache(async () => {
-  const { user, session } = await getServerComponentSession();
-
-  if (!user || !session) {
-    throw new Error('No session found');
-  }
-
-  return { user, session };
-});

packages/lib/next-auth/get-server-session.ts

@@ -1,30 +0,0 @@
-'use server';
-
-import type { GetServerSidePropsContext, NextApiRequest, NextApiResponse } from 'next';
-
-import { getServerSession as getNextAuthServerSession } from 'next-auth';
-
-import { prisma } from '@documenso/prisma';
-
-import { NEXT_AUTH_OPTIONS } from './auth-options';
-
-export interface GetServerSessionOptions {
-  req: NextApiRequest | GetServerSidePropsContext['req'];
-  res: NextApiResponse | GetServerSidePropsContext['res'];
-}
-
-export const getServerSession = async ({ req, res }: GetServerSessionOptions) => {
-  const session = await getNextAuthServerSession(req, res, NEXT_AUTH_OPTIONS);
-
-  if (!session || !session.user?.email) {
-    return { user: null, session: null };
-  }
-
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      email: session.user.email,
-    },
-  });
-
-  return { user, session };
-};

packages/lib/package.json

@@ -7,8 +7,7 @@
   "files": [
     "client-only/",
     "server-only/",
-    "universal/",
-    "next-auth/"
+    "universal/"
   ],
   "scripts": {
     "lint": "eslint .",
@@ -29,14 +28,12 @@
     "@lingui/core": "^4.11.3",
     "@lingui/macro": "^4.11.3",
     "@lingui/react": "^4.11.3",
-    "@next-auth/prisma-adapter": "1.0.7",
     "@noble/ciphers": "0.4.0",
     "@noble/hashes": "1.3.2",
     "@node-rs/bcrypt": "^1.10.0",
     "@pdf-lib/fontkit": "^1.1.1",
     "@scure/base": "^1.1.3",
     "@sindresorhus/slugify": "^2.2.1",
-    "@trigger.dev/nextjs": "^2.3.18",
     "@trigger.dev/sdk": "^2.3.18",
     "@upstash/redis": "^1.20.6",
     "@vvo/tzdb": "^6.117.0",
@@ -45,8 +42,6 @@
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
     "nanoid": "^4.0.2",
-    "next": "14.2.6",
-    "next-auth": "4.24.5",
     "oslo": "^0.17.0",
     "pdf-lib": "^1.17.1",
     "pg": "^8.11.3",
@@ -63,4 +58,4 @@
     "@types/luxon": "^3.3.1",
     "@types/pg": "^8.11.4"
   }
-}
+}

packages/lib/utils/debugger.ts

@@ -0,0 +1,19 @@
+import { env } from '@documenso/lib/utils/env';
+
+export const appLog = (context: string, ...args: Parameters<typeof console.log>) => {
+  if (env('NEXT_DEBUG') === 'true') {
+    console.log(`[${context}]: ${args[0]}`, ...args.slice(1));
+  }
+};
+
+export class AppLogger {
+  public context: string;
+
+  constructor(context: string) {
+    this.context = context;
+  }
+
+  public log(...args: Parameters<typeof console.log>) {
+    appLog(this.context, ...args);
+  }
+}