@mstuercke/api-utils 0.0.51 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/rest/server/RestApi.d.ts +2 -2
- package/dist/rest/server/RestApi.js +13 -20
- package/dist/rest/server/RestApi.js.map +1 -1
- package/dist/rest/server/buildRouteHandler.d.ts +2 -0
- package/dist/rest/server/buildRouteHandler.js +5 -0
- package/dist/rest/server/buildRouteHandler.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RestApiRouteHandler, RestPathParams, RestQueryParams, RestRequestBody, RestRequestHeaders, RestRequireAuthentication, RestResponseBody } from '../types';
|
|
2
2
|
import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
|
|
3
3
|
export declare class RestApi {
|
|
4
4
|
private routes;
|
|
5
|
-
addRouteHandler<PathParams extends RestPathParams = never, QueryParams extends RestQueryParams = never, RequestHeaders extends RestRequestHeaders = never, RequestBody extends RestRequestBody = never, ResponseBody extends RestResponseBody = never, RequireAuthentication extends RestRequireAuthentication = false>(
|
|
5
|
+
addRouteHandler<PathParams extends RestPathParams = never, QueryParams extends RestQueryParams = never, RequestHeaders extends RestRequestHeaders = never, RequestBody extends RestRequestBody = never, ResponseBody extends RestResponseBody = never, RequireAuthentication extends RestRequireAuthentication = false>(routeHandler: RestApiRouteHandler<PathParams, QueryParams, RequestHeaders, RequestBody, ResponseBody, RequireAuthentication>): this;
|
|
6
6
|
handleRequest(proxyEvent: APIGatewayProxyEvent): Promise<APIGatewayProxyResult>;
|
|
7
7
|
private getMatchingRouteHandlers;
|
|
8
8
|
private getMatchingRouteHandler;
|
|
@@ -7,13 +7,10 @@ const DEFAULT_RESPONSE_HEADERS = {
|
|
|
7
7
|
};
|
|
8
8
|
export class RestApi {
|
|
9
9
|
routes = [];
|
|
10
|
-
addRouteHandler(
|
|
10
|
+
addRouteHandler(routeHandler) {
|
|
11
11
|
this.routes = [
|
|
12
12
|
...this.routes,
|
|
13
|
-
|
|
14
|
-
route,
|
|
15
|
-
requestHandler,
|
|
16
|
-
},
|
|
13
|
+
routeHandler,
|
|
17
14
|
];
|
|
18
15
|
return this;
|
|
19
16
|
}
|
|
@@ -38,13 +35,13 @@ export class RestApi {
|
|
|
38
35
|
headers: DEFAULT_RESPONSE_HEADERS,
|
|
39
36
|
body: `Method ${proxyEvent.httpMethod} not allowed on ${proxyEvent.path}`,
|
|
40
37
|
};
|
|
41
|
-
const { routeHandler: { requestHandler, route }, pathParams
|
|
38
|
+
const { routeHandler: { requestHandler, route }, pathParams } = routeHandler;
|
|
42
39
|
const userId = proxyEvent.requestContext.authorizer?.principalId;
|
|
43
40
|
if (route.requireAuthentication && !userId)
|
|
44
41
|
return { statusCode: 401, body: '' };
|
|
45
42
|
const responseBody = await requestHandler({
|
|
46
43
|
pathParams,
|
|
47
|
-
queryParams,
|
|
44
|
+
queryParams: this.extractQueryParams(proxyEvent),
|
|
48
45
|
headers: proxyEvent.headers,
|
|
49
46
|
body: proxyEvent.body && JSON.parse(proxyEvent.body),
|
|
50
47
|
userId,
|
|
@@ -70,11 +67,9 @@ export class RestApi {
|
|
|
70
67
|
getMatchingRouteHandlers(url) {
|
|
71
68
|
return this.routes.reduce((matchingRouteHandlers, routeHandler) => {
|
|
72
69
|
const pathParams = this.extractPathParams(routeHandler, url);
|
|
73
|
-
const queryParams = this.extractQueryParams(url);
|
|
74
70
|
const matchingRouteHandler = {
|
|
75
71
|
routeHandler,
|
|
76
72
|
pathParams,
|
|
77
|
-
queryParams,
|
|
78
73
|
};
|
|
79
74
|
return pathParams
|
|
80
75
|
? [...matchingRouteHandlers, matchingRouteHandler]
|
|
@@ -89,18 +84,16 @@ export class RestApi {
|
|
|
89
84
|
const matcher = match(routeHandler.route.path, { decode: decodeURIComponent });
|
|
90
85
|
return (matcher(url.pathname) || null)?.params;
|
|
91
86
|
}
|
|
92
|
-
extractQueryParams(
|
|
87
|
+
extractQueryParams(proxyEvent) {
|
|
88
|
+
const keys = new Set([
|
|
89
|
+
...Object.keys(proxyEvent.queryStringParameters || {}),
|
|
90
|
+
...Object.keys(proxyEvent.multiValueQueryStringParameters || {}),
|
|
91
|
+
]);
|
|
93
92
|
const queryParams = {};
|
|
94
|
-
for (const
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
? [...originalValue, value]
|
|
99
|
-
: [originalValue, value];
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
queryParams[key] = value;
|
|
103
|
-
}
|
|
93
|
+
for (const key of keys.values()) {
|
|
94
|
+
const singleValue = proxyEvent.queryStringParameters?.[key];
|
|
95
|
+
const multiValues = proxyEvent.multiValueQueryStringParameters?.[key] || [];
|
|
96
|
+
queryParams[key] = multiValues.length > 1 ? multiValues : singleValue;
|
|
104
97
|
}
|
|
105
98
|
return queryParams;
|
|
106
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RestApi.js","sourceRoot":"","sources":["../../../src/rest/server/RestApi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RestApi.js","sourceRoot":"","sources":["../../../src/rest/server/RestApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import { RestApiRequestHandler, RestApiRoute, RestApiRouteHandler, RestResponseBody } from '../types';
|
|
2
|
+
export declare const buildRouteHandler: <PathParams extends object = never, QueryParams extends object = never, RequestHeaders extends Record<string, string> = never, RequestBody extends object = never, ResponseBody extends RestResponseBody = never, RequireAuthentication extends boolean = false>(route: RestApiRoute<PathParams, QueryParams, RequestHeaders, RequestBody, ResponseBody, RequireAuthentication>, requestHandler: RestApiRequestHandler<PathParams, QueryParams, RequestHeaders, RequestBody, ResponseBody, RequireAuthentication>) => RestApiRouteHandler<PathParams, QueryParams, RequestHeaders, RequestBody, ResponseBody, RequireAuthentication>;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildRouteHandler.js","sourceRoot":"","sources":["../../../src/rest/server/buildRouteHandler.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAQ7B,KAA8G,EAC9G,cAAgI,EAClB,EAAE,CAAC,CAAC;IACpH,KAAK;IACL,cAAc;CACf,CAAC,CAAC"}
|