Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2ab41cb

Browse files
committed
Remove callbacks from async funcs
1 parent eddcd3f commit 2ab41cb

File tree

1 file changed

+20
-36
lines changed

1 file changed

+20
-36
lines changed

‎src/index.ts

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@ import * as jwt from 'jsonwebtoken';
33
import { createItem, deleteItem, getItems, getItemById, updateItem } from './database';
44
import Response from './Response';
55

6-
export async function pingHandler(event: APIGatewayEvent, context: Context,callback: Callback) {
6+
export async function pingHandler(event: APIGatewayEvent, context: Context) {
77
console.log('pingHandler');
88
console.log('event', JSON.stringify(event));
99
console.log('context', JSON.stringify(context));
1010

1111
try {
12-
return callback(undefined,new Response({ statusCode: 200, body: { message: 'Chur' } }));
12+
return new Response({ statusCode: 200, body: { message: 'Chur' } });
1313
} catch (err) {
1414
console.log(err);
1515

16-
return callback(
17-
undefined,
18-
new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } }),
19-
);
16+
throw new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } });
2017
}
2118
}
2219

@@ -58,27 +55,24 @@ export const authorizer = (event: CustomAuthorizerEvent, context: Context, callb
5855
};
5956

6057
// GET /items
61-
export async function getAllItemsHandler(event: APIGatewayEvent, context: Context,callback: Callback) {
58+
export async function getAllItemsHandler(event: APIGatewayEvent, context: Context) {
6259
console.log('getAllItemsHandler');
6360
console.log('event', JSON.stringify(event));
6461
console.log('context', JSON.stringify(context));
6562

6663
try {
6764
const items = await getItems((event.requestContext.authorizer as AuthResponseContext).principalId);
6865

69-
return callback(undefined,new Response({ statusCode: 200, body: { items } }));
66+
return new Response({ statusCode: 200, body: { items } });
7067
} catch (err) {
7168
console.log(err);
7269

73-
return callback(
74-
undefined,
75-
new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } }),
76-
);
70+
throw new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } });
7771
}
7872
}
7973

8074
// GET /items/{id}
81-
export async function getItemHandler(event: APIGatewayEvent, context: Context,callback: Callback) {
75+
export async function getItemHandler(event: APIGatewayEvent, context: Context) {
8276
console.log('getItemHandler');
8377
console.log('event', JSON.stringify(event));
8478
console.log('context', JSON.stringify(context));
@@ -89,37 +83,33 @@ export async function getItemHandler(event: APIGatewayEvent, context: Context, c
8983
event.pathParameters !== null ? event.pathParameters.id : '',
9084
);
9185

92-
return callback(undefined,new Response({ statusCode: 200, body: item }));
86+
return new Response({ statusCode: 200, body: item });
9387
} catch (err) {
94-
return callback(
95-
undefined,
96-
new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } }),
97-
);
88+
console.log(err);
89+
90+
throw new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } });
9891
}
9992
}
10093

10194
// POST /items
102-
export async function createItemHandler(event: APIGatewayEvent, context: Context,callback: Callback) {
95+
export async function createItemHandler(event: APIGatewayEvent, context: Context) {
10396
console.log('createItemHandler');
10497
console.log('event', JSON.stringify(event));
10598
console.log('context', JSON.stringify(context));
10699

107100
try {
108101
const item = await createItem((event.requestContext.authorizer as AuthResponseContext).principalId, JSON.parse(event.body as string).name);
109102

110-
return callback(undefined,new Response({ statusCode: 201, body: item }));
103+
return new Response({ statusCode: 201, body: item });
111104
} catch (err) {
112105
console.log(err);
113106

114-
return callback(
115-
undefined,
116-
new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } }),
117-
);
107+
throw new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } });
118108
}
119109
}
120110

121111
// PATCH /items/{id}
122-
export async function updateItemHandler(event: APIGatewayEvent, context: Context,callback: Callback) {
112+
export async function updateItemHandler(event: APIGatewayEvent, context: Context) {
123113
console.log('updateItemHandler');
124114
console.log('event', JSON.stringify(event));
125115
console.log('context', JSON.stringify(context));
@@ -131,33 +121,27 @@ export async function updateItemHandler(event: APIGatewayEvent, context: Context
131121
JSON.parse(event.body as string).name,
132122
);
133123

134-
return callback(undefined,new Response({ statusCode: 200 }));
124+
return new Response({ statusCode: 200 });
135125
} catch (err) {
136126
console.log(err);
137127

138-
return callback(
139-
undefined,
140-
new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } }),
141-
);
128+
throw new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } });
142129
}
143130
}
144131

145132
// DELETE /items/{id}
146-
export async function deleteItemHandler(event: APIGatewayEvent, context: Context,callback: Callback) {
133+
export async function deleteItemHandler(event: APIGatewayEvent, context: Context) {
147134
console.log('deleteItemHandler');
148135
console.log('event', JSON.stringify(event));
149136
console.log('context', JSON.stringify(context));
150137

151138
try {
152139
await deleteItem((event.requestContext.authorizer as AuthResponseContext).principalId, event.pathParameters !== null ? event.pathParameters.id : '');
153140

154-
return callback(undefined,new Response({ statusCode: 200 }));
141+
return new Response({ statusCode: 200 });
155142
} catch (err) {
156143
console.log(err);
157144

158-
return callback(
159-
undefined,
160-
new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } }),
161-
);
145+
throw new Response({ statusCode: err.responseStatusCode || 500, body: { message: err.message || 'Internal server error' } });
162146
}
163147
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /