diff --git a/src/server/app.ts b/src/server/app.ts index acb83a8..8663549 100644 --- a/src/server/app.ts +++ b/src/server/app.ts @@ -5,7 +5,6 @@ import swaggerUI from 'swagger-ui-express'; import passport from 'passport'; import morgan from 'morgan'; import { websiteRouter } from './router/website.js'; -import { workspaceRouter } from './router/workspace.js'; import { telemetryRouter } from './router/telemetry.js'; import { trpcExpressMiddleware, diff --git a/src/server/model/auth.ts b/src/server/model/auth.ts index 21c42eb..6fafaa2 100644 --- a/src/server/model/auth.ts +++ b/src/server/model/auth.ts @@ -1,4 +1,5 @@ import { Auth, AuthConfig, createActionURL } from '@auth/core'; +import { type Provider } from '@auth/core/providers'; import Nodemailer from '@auth/core/providers/nodemailer'; import Credentials from '@auth/core/providers/credentials'; import Github from '@auth/core/providers/github'; @@ -89,10 +90,11 @@ export const authConfig: Omit = { name: 'Google', ...env.auth.google, }), - env.auth.provider.includes('custom') && { - id: 'custom', - ...env.auth.custom, - }, + env.auth.provider.includes('custom') && + ({ + id: 'custom', + ...env.auth.custom, + } as Provider), ]), adapter: TianjiPrismaAdapter(prisma), secret: env.auth.secret,