Merge pull request #94 from yeukfei02/dev

Dev

Author: yeukfei02

package.json

@@ -28,7 +28,7 @@
     "@types/lodash": "^4.14.161",
     "@types/moment-timezone": "^0.5.30",
     "@types/node": "^17.0.13",
-    "@types/serverless": "^1.78.44",
+    "@types/serverless": "^3.0.1",
     "@types/uuid": "^8.3.0",
     "@typescript-eslint/eslint-plugin": "^4.4.0",
     "@typescript-eslint/parser": "^4.4.0",
@@ -42,9 +42,9 @@
     "jest": "^26.5.2",
     "lambda-tester": "^4.0.1",
     "prettier": "^2.1.2",
-    "serverless": "2.72.2",
+    "serverless": "^3.7.4",
     "serverless-layers": "^2.5.1",
-    "serverless-offline": "^8.4.0",
+    "serverless-offline": "^8.5.0",
     "serverless-plugin-typescript": "^2.1.1",
     "standard-version": "^9.0.0",
     "ts-jest": "^26.4.1",

serverless.yml

@@ -2,7 +2,7 @@ org: yeukfei05
 app: random-user-api-serverless
 service: random-user-api-serverless
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 useDotenv: true
 
 provider:

src/authorize/handler.ts

@@ -1,10 +1,10 @@
 // import env from 'dotenv';
 // env.config();
 
-import { Context, Callback, Handler } from 'aws-lambda';
+import { Context, Handler } from 'aws-lambda';
 import jwt from 'jsonwebtoken';
 
-export const authorize: Handler = async (event: any, context: Context, callback: Callback) => {
+export const authorize: Handler = async (event: any, context: Context) => {
   const token = event.authorizationToken.replace('Bearer ', '');
 
   let principalId = 'user';

src/createRandomUser/handler.ts

@@ -1,4 +1,4 @@
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
@@ -9,7 +9,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import RandomUser from '../../model/randomUser';
 
-export const createRandomUser: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const createRandomUser: Handler = async (event: APIGatewayEvent, context: Context) => {
   let response = {};
 
   const body = event.body ? JSON.parse(event.body) : null;

src/deleteRandomUserById/handler.ts

@@ -1,4 +1,4 @@
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
@@ -7,7 +7,7 @@ if (process.env._X_AMZN_TRACE_ID) {
 
 import RandomUser from '../../model/randomUser';
 
-export const deleteRandomUserById: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const deleteRandomUserById: Handler = async (event: APIGatewayEvent, context: Context) => {
   let response = {};
 
   const id = event.pathParameters ? event.pathParameters.id : '';

src/getRandomUser/handler.ts

@@ -1,4 +1,4 @@
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
@@ -10,7 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import RandomUser from '../../model/randomUser';
 
-export const getRandomUser: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const getRandomUser: Handler = async (event: APIGatewayEvent, context: Context) => {
   let response = {};
 
   if (event.queryStringParameters) {

src/getRandomUserById/handler.ts

@@ -1,4 +1,4 @@
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
@@ -7,7 +7,7 @@ if (process.env._X_AMZN_TRACE_ID) {
 
 import RandomUser from '../../model/randomUser';
 
-export const getRandomUserById: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const getRandomUserById: Handler = async (event: APIGatewayEvent, context: Context) => {
   let response = {};
 
   const id = event.pathParameters ? event.pathParameters.id : '';

src/login/handler.ts

@@ -1,7 +1,7 @@
 // import env from 'dotenv';
 // env.config();
 
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
@@ -14,7 +14,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import User from '../../model/user';
 
-export const login: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const login: Handler = async (event: APIGatewayEvent, context: Context) => {
   let response = {};
 
   const body = event.body ? JSON.parse(event.body) : null;

src/main/handler.ts

@@ -1,11 +1,11 @@
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
   awsXRay.captureAWS(awsSdk);
 }
 
-export const getMain: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const getMain: Handler = async (event: APIGatewayEvent, context: Context) => {
   const response = {
     statusCode: 200,
     body: JSON.stringify({

src/signup/handler.ts

@@ -1,4 +1,4 @@
-import { APIGatewayEvent, Context, Callback, Handler } from 'aws-lambda';
+import { APIGatewayEvent, Context, Handler } from 'aws-lambda';
 import awsXRay from 'aws-xray-sdk';
 import awsSdk from 'aws-sdk';
 if (process.env._X_AMZN_TRACE_ID) {
@@ -10,7 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import User from '../../model/user';
 
-export const signup: Handler = async (event: APIGatewayEvent, context: Context, callback: Callback) => {
+export const signup: Handler = async (event: APIGatewayEvent, context: Context) => {
   let response = {};
 
   const body = event.body ? JSON.parse(event.body) : null;