improve fetching of endpoint arguments

including support for route parameters (e.g. '/v2/note/:noteId' giving us a 'noteId' value)

packages/backend/src/server/api/api-handler.ts

@@ -5,12 +5,23 @@ import authenticate, { AuthenticationError } from './authenticate.js';
 import call from './call.js';
 import { ApiError } from './error.js';
 
+function getRequestArguments(ctx: Koa.Context): any {
+	const args = {
+		...(ctx.params || {}),
+		...ctx.query,
+		...(ctx.request.body || {}),
+	};
+
+	// For security reasons, we drop the i parameter if it's a GET request
+	if (ctx.method === 'GET') {
+		delete args['i'];
+	}
+
+	return args;
+}
+
 export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise<void>((res) => {
-	const body = ctx.is('multipart/form-data')
+	const body = getRequestArguments(ctx);
-		? (ctx.request as any).body
-		: ctx.method === 'GET'
-			? ctx.query
-			: ctx.request.body;
 
 	const reply = (x?: any, y?: ApiError) => {
 		if (x == null) {

packages/backend/src/server/api/endpoints.ts

@@ -703,6 +703,24 @@ export interface IEndpointMeta {
 	 * 正常応答をキャッシュ (Cache-Control: public) する秒数
 	 */
 	readonly cacheSec?: number;
+
+	/**
+	 * API v2 options
+	 */
+	readonly v2?: {
+
+		/**
+		 * HTTP verb this endpoint supports
+		 */
+		readonly method: string;
+
+		/**
+		 * Path alias for v2 endpoint
+		 * 
+		 * @example (v0) /api/notes/create -> /api/v2/notes
+		 */
+		readonly alias?: string;
+	};
 }
 
 export interface IEndpoint {

packages/backend/src/server/api/endpoints/meta.ts

@@ -10,6 +10,10 @@ export const meta = {
 
 	requireCredential: false,
 
+	v2: {
+		method: 'get'
+	},
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,

packages/backend/src/server/api/index.ts

@@ -74,6 +74,11 @@ for (const endpoint of endpoints) {
 		} else {
 			router.get(`/${endpoint.name}`, async ctx => { ctx.status = 405; });
 		}
+
+		if (endpoint.meta.v2) {
+			const path = endpoint.meta.v2.alias ?? endpoint.name.replace(/-/g, '_');
+			router[endpoint.meta.v2.method](`/v2/${path}`, handler.bind(null, endpoint));
+		}
 	}
 }
 

packages/backend/src/server/api/openapi/gen-spec.ts

@@ -203,6 +203,18 @@ export function genOpenapiSpec() {
 		}
 
 		spec.paths['/' + endpoint.name] = path;
+
+		if (endpoint.meta.v2) {
+			// we need a clone of the API endpoint info because otherwise we change it by reference
+			const infoClone = JSON.parse(JSON.stringify(info));
+			const route = `/v2/${endpoint.meta.v2.alias ?? endpoint.name.replace(/-/g, '_')}`;
+
+			infoClone['operationId'] = infoClone['summary'] = route;
+
+			spec.paths[route] = {
+				[endpoint.meta.v2.method]: infoClone,
+			};
+		}
 	}
 
 	return spec;