schiwagoa/tianji
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix ci problem

Browse Source
This commit is contained in:
moonrailgun 2024-09-20 00:01:30 +08:00
parent d0afdf5c91
commit 63484d0db5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/app.ts
View File

@ -5,7 +5,6 @@ import swaggerUI from 'swagger-ui-express';
import passport from 'passport'; import passport from 'passport';
import morgan from 'morgan'; import morgan from 'morgan';
import { websiteRouter } from './router/website.js'; import { websiteRouter } from './router/website.js';
import { workspaceRouter } from './router/workspace.js';
import { telemetryRouter } from './router/telemetry.js'; import { telemetryRouter } from './router/telemetry.js';
import { import {
trpcExpressMiddleware, trpcExpressMiddleware,

10
src/server/model/auth.ts
View File

@ -1,4 +1,5 @@
import { Auth, AuthConfig, createActionURL } from '@auth/core'; import { Auth, AuthConfig, createActionURL } from '@auth/core';
import { type Provider } from '@auth/core/providers';
import Nodemailer from '@auth/core/providers/nodemailer'; import Nodemailer from '@auth/core/providers/nodemailer';
import Credentials from '@auth/core/providers/credentials'; import Credentials from '@auth/core/providers/credentials';
import Github from '@auth/core/providers/github'; import Github from '@auth/core/providers/github';
@ -89,10 +90,11 @@ export const authConfig: Omit<AuthConfig, 'raw'> = {
name: 'Google', name: 'Google',
...env.auth.google, ...env.auth.google,
}), }),
env.auth.provider.includes('custom') && { env.auth.provider.includes('custom') &&
id: 'custom', ({
...env.auth.custom, id: 'custom',
}, ...env.auth.custom,
} as Provider),
]), ]),
adapter: TianjiPrismaAdapter(prisma), adapter: TianjiPrismaAdapter(prisma),
secret: env.auth.secret, secret: env.auth.secret,