summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/api/index.ts26
-rw-r--r--src/server/index.ts4
2 files changed, 11 insertions, 19 deletions
diff --git a/src/server/api/index.ts b/src/server/api/index.ts
index fe38c24803..d69d923345 100644
--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@@ -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;
diff --git a/src/server/index.ts b/src/server/index.ts
index 2f82e62aa6..15e1fedc98 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -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')));