blsmedia/sign
2
0
Fork 0
Code Issues Packages Releases Activity

chore: re-arrange stuff

Browse Source
This commit is contained in:
Catalin Pit
2024-03-21 15:46:53 +02:00
parent fdbac9fc03
commit 6b73899ecc
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/lib/next-auth/auth-options.ts
View File

@@ -1,7 +1,6 @@
/// <reference types="../types/next-auth.d.ts" /> /// <reference types="../types/next-auth.d.ts" />
import { KyselyAdapter } from '@auth/kysely-adapter'; import { KyselyAdapter } from '@auth/kysely-adapter';
import { compare } from '@node-rs/bcrypt'; import { compare } from '@node-rs/bcrypt';
import { Kysely, PostgresDialect } from 'kysely';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import type { AuthOptions, Session, User } from 'next-auth'; import type { AuthOptions, Session, User } from 'next-auth';
import type { JWT } from 'next-auth/jwt'; import type { JWT } from 'next-auth/jwt';
@@ -9,11 +8,9 @@ import CredentialsProvider from 'next-auth/providers/credentials';
import type { GoogleProfile } from 'next-auth/providers/google'; import type { GoogleProfile } from 'next-auth/providers/google';
import GoogleProvider from 'next-auth/providers/google'; import GoogleProvider from 'next-auth/providers/google';
import { env } from 'next-runtime-env'; import { env } from 'next-runtime-env';
import { Pool } from 'pg';
import { prisma } from '@documenso/prisma'; import { prisma } from '@documenso/prisma';
import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client'; import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client';
import type { DB } from '@documenso/prisma/generated/types.js';
import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble'; import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble';
import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa'; import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa';
@@ -22,15 +19,7 @@ import { getUserByEmail } from '../server-only/user/get-user-by-email';
import { sendConfirmationToken } from '../server-only/user/send-confirmation-token'; import { sendConfirmationToken } from '../server-only/user/send-confirmation-token';
import { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata'; import { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata';
import { ErrorCode } from './error-codes'; import { ErrorCode } from './error-codes';
import { db } from './kysely-db/db';
// move this from here
const db = new Kysely<DB>({
dialect: new PostgresDialect({
pool: new Pool({
connectionString: process.env.DATABASE_URL,
}),
}),
});
export const NEXT_AUTH_OPTIONS: AuthOptions = { export const NEXT_AUTH_OPTIONS: AuthOptions = {
//@ts-expect-error - https://github.com/nextauthjs/next-auth/issues/8660 //@ts-expect-error - https://github.com/nextauthjs/next-auth/issues/8660

14
packages/lib/next-auth/kysely-db/db.ts Normal file
View File

@@ -0,0 +1,14 @@
import { KyselyAuth } from '@auth/kysely-adapter';
import type { Codegen } from '@auth/kysely-adapter';
import { PostgresDialect } from 'kysely';
import { Pool } from 'pg';
import type { DB } from '@documenso/prisma/generated/types';
export const db = new KyselyAuth<DB, Codegen>({
dialect: new PostgresDialect({
pool: new Pool({
connectionString: process.env.DATABASE_URL,
}),
}),
});