mirror of
https://github.com/freeCodeCamp/freeCodeCamp.git
synced 2026-05-28 18:26:54 +00:00
feat(api): handle missing endpoints (#55429)
This commit is contained in:
committed by
GitHub
parent
7259e42941
commit
e8b15a255b
@@ -5,6 +5,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-sdk/client-ses": "3.521.0",
|
"@aws-sdk/client-ses": "3.521.0",
|
||||||
|
"@fastify/accepts": "4.3.0",
|
||||||
"@fastify/cookie": "9.3.1",
|
"@fastify/cookie": "9.3.1",
|
||||||
"@fastify/csrf-protection": "6.4.1",
|
"@fastify/csrf-protection": "6.4.1",
|
||||||
"@fastify/express": "^2.3.0",
|
"@fastify/express": "^2.3.0",
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import mailer from './plugins/mailer';
|
|||||||
import redirectWithMessage from './plugins/redirect-with-message';
|
import redirectWithMessage from './plugins/redirect-with-message';
|
||||||
import security from './plugins/security';
|
import security from './plugins/security';
|
||||||
import codeFlowAuth from './plugins/code-flow-auth';
|
import codeFlowAuth from './plugins/code-flow-auth';
|
||||||
|
import notFound from './plugins/not-found';
|
||||||
import { mobileAuth0Routes } from './routes/auth';
|
import { mobileAuth0Routes } from './routes/auth';
|
||||||
import { devAuthRoutes } from './routes/auth-dev';
|
import { devAuthRoutes } from './routes/auth-dev';
|
||||||
import {
|
import {
|
||||||
@@ -181,6 +182,7 @@ export const build = async (
|
|||||||
// redirectWithMessage must be registered before codeFlowAuth
|
// redirectWithMessage must be registered before codeFlowAuth
|
||||||
void fastify.register(redirectWithMessage);
|
void fastify.register(redirectWithMessage);
|
||||||
void fastify.register(codeFlowAuth);
|
void fastify.register(codeFlowAuth);
|
||||||
|
void fastify.register(notFound);
|
||||||
void fastify.register(prismaPlugin);
|
void fastify.register(prismaPlugin);
|
||||||
void fastify.register(mobileAuth0Routes);
|
void fastify.register(mobileAuth0Routes);
|
||||||
if (FCC_ENABLE_DEV_LOGIN_MODE) {
|
if (FCC_ENABLE_DEV_LOGIN_MODE) {
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import Fastify, { type FastifyInstance } from 'fastify';
|
||||||
|
|
||||||
|
import notFound from './not-found';
|
||||||
|
import redirectWithMessage, { formatMessage } from './redirect-with-message';
|
||||||
|
|
||||||
|
describe('fourOhFour', () => {
|
||||||
|
let fastify: FastifyInstance;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
fastify = Fastify();
|
||||||
|
await fastify.register(redirectWithMessage);
|
||||||
|
await fastify.register(notFound);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await fastify.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should redirect to origin/404 if the request does not Accept json', async () => {
|
||||||
|
const res = await fastify.inject({
|
||||||
|
method: 'GET',
|
||||||
|
url: '/test',
|
||||||
|
headers: {
|
||||||
|
referer: 'https://www.freecodecamp.org/anything',
|
||||||
|
accept: 'text/plain'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.headers['location']).toEqual(
|
||||||
|
'https://www.freecodecamp.org/404?' +
|
||||||
|
formatMessage({
|
||||||
|
type: 'danger',
|
||||||
|
content: "We couldn't find path /test"
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toEqual(302);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return a 404 json response if the request does Accept json', async () => {
|
||||||
|
const res = await fastify.inject({
|
||||||
|
method: 'GET',
|
||||||
|
url: '/test',
|
||||||
|
headers: {
|
||||||
|
referer: 'https://www.freecodecamp.org/anything',
|
||||||
|
accept: 'application/json,text/plain'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.json()).toEqual({ error: 'path not found' });
|
||||||
|
expect(res.statusCode).toEqual(404);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should redirect if the request prefers text/html to json', async () => {
|
||||||
|
const res = await fastify.inject({
|
||||||
|
method: 'GET',
|
||||||
|
url: '/test',
|
||||||
|
headers: {
|
||||||
|
referer: 'https://www.freecodecamp.org/anything',
|
||||||
|
// this does accept json, (via the */*), but prefers text/html
|
||||||
|
accept: 'text/html,*/*'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.headers['location']).toEqual(
|
||||||
|
'https://www.freecodecamp.org/404?' +
|
||||||
|
formatMessage({
|
||||||
|
type: 'danger',
|
||||||
|
content: "We couldn't find path /test"
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toEqual(302);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import type { FastifyPluginCallback } from 'fastify';
|
||||||
|
|
||||||
|
import fp from 'fastify-plugin';
|
||||||
|
import accepts from '@fastify/accepts';
|
||||||
|
|
||||||
|
import { getRedirectParams } from '../utils/redirection';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plugin for handling missing endpoints.
|
||||||
|
*
|
||||||
|
* @param fastify The Fastify instance.
|
||||||
|
* @param _options Options passed to the plugin via `fastify.register(plugin, options)`.
|
||||||
|
* @param done Callback to signal that the logic has completed.
|
||||||
|
*/
|
||||||
|
const fourOhFour: FastifyPluginCallback = (fastify, _options, done) => {
|
||||||
|
void fastify.register(accepts);
|
||||||
|
|
||||||
|
// If the request accepts JSON and does not specifically prefer text/html,
|
||||||
|
// this will return a 404 JSON response. Everything else will be redirected.
|
||||||
|
fastify.setNotFoundHandler((request, reply) => {
|
||||||
|
const accepted = request.accepts().type(['json', 'html']);
|
||||||
|
|
||||||
|
if (accepted == 'json') {
|
||||||
|
void reply.code(404).send({ error: 'path not found' });
|
||||||
|
} else {
|
||||||
|
const { origin } = getRedirectParams(request);
|
||||||
|
void reply.status(302);
|
||||||
|
void reply.redirectWithMessage(`${origin}/404`, {
|
||||||
|
type: 'danger',
|
||||||
|
content: `We couldn't find path ${request.url}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
done();
|
||||||
|
};
|
||||||
|
|
||||||
|
export default fp(fourOhFour, { dependencies: ['redirect-with-message'] });
|
||||||
Generated
+11
@@ -153,6 +153,9 @@ importers:
|
|||||||
'@aws-sdk/client-ses':
|
'@aws-sdk/client-ses':
|
||||||
specifier: 3.521.0
|
specifier: 3.521.0
|
||||||
version: 3.521.0
|
version: 3.521.0
|
||||||
|
'@fastify/accepts':
|
||||||
|
specifier: 4.3.0
|
||||||
|
version: 4.3.0
|
||||||
'@fastify/cookie':
|
'@fastify/cookie':
|
||||||
specifier: 9.3.1
|
specifier: 9.3.1
|
||||||
version: 9.3.1
|
version: 9.3.1
|
||||||
@@ -2962,6 +2965,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==}
|
resolution: {integrity: sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==}
|
||||||
engines: {node: '>=14'}
|
engines: {node: '>=14'}
|
||||||
|
|
||||||
|
'@fastify/accepts@4.3.0':
|
||||||
|
resolution: {integrity: sha512-QK4FoqXdwwPmaPOLL6NrxsyaXVvdviYVoS6ltHyOLdFlUyREIaMykHQIp+x0aJz9hB3B3n/Ht6QRdvBeGkptGQ==}
|
||||||
|
|
||||||
'@fastify/ajv-compiler@3.5.0':
|
'@fastify/ajv-compiler@3.5.0':
|
||||||
resolution: {integrity: sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA==}
|
resolution: {integrity: sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA==}
|
||||||
|
|
||||||
@@ -17078,6 +17084,11 @@ snapshots:
|
|||||||
|
|
||||||
'@fastify/accept-negotiator@1.1.0': {}
|
'@fastify/accept-negotiator@1.1.0': {}
|
||||||
|
|
||||||
|
'@fastify/accepts@4.3.0':
|
||||||
|
dependencies:
|
||||||
|
accepts: 1.3.8
|
||||||
|
fastify-plugin: 4.5.1
|
||||||
|
|
||||||
'@fastify/ajv-compiler@3.5.0':
|
'@fastify/ajv-compiler@3.5.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
ajv: 8.12.0
|
ajv: 8.12.0
|
||||||
|
|||||||
Reference in New Issue
Block a user