From 4f35af5590c3e8196f160eb069c8b1f922456c3e Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Thu, 29 Jun 2023 03:09:02 +0200 Subject: [PATCH] refactor to not close fastify --- .../src/server/oauth/OAuth2ProviderService.ts | 1 - packages/backend/test/e2e/oauth.ts | 48 ++++++++----------- 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts index c3a2efe87b..81b834566d 100644 --- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts +++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts @@ -123,7 +123,6 @@ async function discoverClientInformation(logger: Logger, httpRequestService: Htt name, }; } catch (err) { - console.error(err); logger.error('Failed to fetch client information', { err }); throw new AuthorizationError('Failed to fetch client information', 'server_error'); } diff --git a/packages/backend/test/e2e/oauth.ts b/packages/backend/test/e2e/oauth.ts index 3e638d387a..2e08c50bc6 100644 --- a/packages/backend/test/e2e/oauth.ts +++ b/packages/backend/test/e2e/oauth.ts @@ -148,32 +148,34 @@ describe('OAuth', () => { let alice: misskey.entities.MeSignup; let bob: misskey.entities.MeSignup; + let sender: (reply: FastifyReply) => void; + beforeAll(async () => { app = await startServer(); alice = await signup({ username: 'alice' }); bob = await signup({ username: 'bob' }); + + fastify = Fastify(); + fastify.get('/', async (request, reply) => { + sender(reply); + }); + await fastify.listen({ port: clientPort }); }, 1000 * 60 * 2); beforeEach(async () => { process.env.MISSKEY_TEST_CHECK_IP_RANGE = ''; - fastify = Fastify(); - fastify.get('/', async (request, reply) => { + sender = (reply): void => { reply.send(`
Misklient `); - }); - await fastify.listen({ port: clientPort }); + }; }); afterAll(async () => { - await app.close(); - }); - - afterEach(async () => { await fastify.close(); - fastify.server.unref(); + await app.close(); }); test('Full flow', async () => { @@ -835,11 +837,7 @@ describe('OAuth', () => { for (const [title, replyFunc] of Object.entries(tests)) { test(title, async () => { - await fastify.close(); - - fastify = Fastify(); - fastify.get('/', async (request, reply) => replyFunc(reply)); - await fastify.listen({ port: clientPort }); + sender = replyFunc; const client = new AuthorizationCode(clientConfig); @@ -855,16 +853,12 @@ describe('OAuth', () => { } test('No item', async () => { - await fastify.close(); - - fastify = Fastify(); - fastify.get('/', async (request, reply) => { + sender = (reply): void => { reply.send(` - -
Misklient - `); - }); - await fastify.listen({ port: clientPort }); + +
Misklient + `); + }; const client = new AuthorizationCode(clientConfig); @@ -896,14 +890,10 @@ describe('OAuth', () => { }); test('Missing name', async () => { - await fastify.close(); - - fastify = Fastify(); - fastify.get('/', async (request, reply) => { + sender = (reply): void => { reply.header('Link', '; rel="redirect_uri"'); reply.send(); - }); - await fastify.listen({ port: clientPort }); + }; const client = new AuthorizationCode(clientConfig);