SWREI/switched
0
0
Fork 0
Code

Revert "fix(api): Fix #6418 (#6442)"

Browse Source 
This reverts commit 83ec906ee7.
This commit is contained in:
syuilo 2020-06-05 08:37:27 +09:00
parent 071c7e6a58
commit 3c2d94ace3
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/api/index.ts
View File

@ -41,9 +41,7 @@ const upload = multer({
});
// Init router
const router = new Router({
prefix: '/api'
});
const router = new Router();
/**
* Register endpoint handlers
@ -75,18 +73,7 @@ router.get('/v1/instance/peers', async ctx => {
ctx.body = instances.map(instance => instance.host);
});
// Return 404 for unknown API
router.all('*', async ctx => {
ctx.status = 404;
});
// Register router
app.use(router.routes());
//#region miauth
const miauthRouter = new Router();
miauthRouter.post('/miauth/:session/check', async ctx => {
router.post('/miauth/:session/check', async ctx => {
const token = await AccessTokens.findOne({
session: ctx.params.session
});
@ -108,7 +95,12 @@ miauthRouter.post('/miauth/:session/check', async ctx => {
}
});
app.use(miauthRouter.routes());
//#endregion
// Return 404 for unknown API
router.all('*', async ctx => {
ctx.status = 404;
});
// Register router
app.use(router.routes());
export default app;

4
src/server/index.ts
View File

@ -17,7 +17,7 @@ import activityPub from './activitypub';
import nodeinfo from './nodeinfo';
import wellKnown from './well-known';
import config from '../config';
import api from './api';
import apiServer from './api';
import { sum } from '../prelude/array';
import Logger from '../services/logger';
import { program } from '../argv';
@ -55,7 +55,7 @@ if (config.url.startsWith('https') && !config.disableHsts) {
});
}
app.use(mount(api));
app.use(mount('/api', apiServer));
app.use(mount('/files', require('./file')));
app.use(mount('/proxy', require('./proxy')));