fix: errors

rolling-scopes · Nov 27, 2023 · 6959612 · 6959612
1 parent 786fad5
commit 6959612
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .vscode
 .DS_Store
 node_modules/
-cdk.out/
+cdk.out/
+dist/
diff --git a/src/functions/conversation-read-messages.ts b/src/functions/conversation-read-messages.ts
@@ -1,15 +1,18 @@
-import { DynamoDBClient, ScanCommand } from "@aws-sdk/client-dynamodb";
+import {
+  DynamoDBClient,
+  ScanCommand,
+  ScanCommandInput,
+} from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
   const userEmail = event.headers["rs-email"];
   const userID = event.headers["rs-uid"];
   const userTokenRaw =
     event.headers["Authorization"] ?? event.headers["authorization"];
-  const contentType =
-    event.headers["content-type"] ?? event.headers["Content-Type"];
 
   if (!(userEmail && userID && userTokenRaw)) {
     return {
@@ -49,7 +52,7 @@ export const handler = async (event) => {
   }
   console.log("-conversation", conversationID, since);
 
-  let input = {
+  let input: ScanCommandInput = {
     TableName: `conversation-${conversationID}`,
     ProjectionExpression: "#A, #M, #C",
     ExpressionAttributeNames: {
@@ -83,7 +86,7 @@ export const handler = async (event) => {
       body: JSON.stringify(result),
     };
   } catch (err) {
-    if (err.name === "ResourceNotFoundException") {
+    if ((err as Error).name === "ResourceNotFoundException") {
       return {
         statusCode: 400,
         body: JSON.stringify({

diff --git a/src/functions/create-personal-conversation.ts b/src/functions/create-personal-conversation.ts
@@ -5,11 +5,14 @@ import {
   PutItemCommand,
   ScanCommand,
   CreateTableCommand,
+  ScanInput,
+  CreateTableCommandInput,
 } from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   const userEmail = event.headers["rs-email"];
   const userID = event.headers["rs-uid"];
   const userTokenRaw =
@@ -40,14 +43,14 @@ export const handler = async (event) => {
   }
 
   let body = event.body;
-  let data;
+  let data: Record<string, string>;
 
   if (event.isBase64Encoded) {
     body = new Buffer(body, "base64").toString("utf-8");
   }
 
   if (contentType === "application/x-www-form-urlencoded") {
-    data = querystring.parse(body);
+    data = querystring.parse(body) as Record<string, string>;
   } else if (contentType?.startsWith("multipart/form-data")) {
     const match = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/);
     const boundary = match[1] ?? match[2];
@@ -106,7 +109,7 @@ export const handler = async (event) => {
 
   const [user1, user2] = sortingData;
 
-  const queryInput = {
+  const queryInput: ScanInput = {
     TableName: "rsschool-2023-conversations",
     FilterExpression: "user1 = :user1Value AND user2 = :user2Value",
     ExpressionAttributeValues: {
@@ -138,7 +141,7 @@ export const handler = async (event) => {
   const conversationID = Math.random().toString(36).substring(2);
 
   // create dedicated conversation table
-  const newTableInput = {
+  const newTableInput: CreateTableCommandInput = {
     TableName: `conversation-${conversationID}`,
     BillingMode: "PAY_PER_REQUEST",
     TableClass: "STANDARD",

diff --git a/src/functions/delete-personal-conversation.ts b/src/functions/delete-personal-conversation.ts
@@ -3,17 +3,16 @@ import {
   DeleteItemCommand,
   DeleteTableCommand,
 } from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
   const userEmail = event.headers["rs-email"];
   const userID = event.headers["rs-uid"];
   const userTokenRaw =
     event.headers["Authorization"] ?? event.headers["authorization"];
-  const contentType =
-    event.headers["content-type"] ?? event.headers["Content-Type"];
 
   if (!(userEmail && userID && userTokenRaw)) {
     return {
@@ -74,7 +73,7 @@ export const handler = async (event) => {
 
     console.log("-delete item", result);
   } catch (err) {
-    if (err.name === "ConditionalCheckFailedException") {
+    if ((err as Error).name === "ConditionalCheckFailedException") {
       return {
         statusCode: 400,
         body: JSON.stringify({

diff --git a/src/functions/groups-add-message.ts b/src/functions/groups-add-message.ts
@@ -1,9 +1,10 @@
 import querystring from "querystring";
 import { DynamoDBClient, PutItemCommand } from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
   const userID = event.headers["rs-uid"];
   const userEmail = event.headers["rs-email"];
@@ -37,14 +38,14 @@ export const handler = async (event) => {
   }
 
   let body = event.body;
-  let data;
+  let data: Record<string, string>;
 
   if (event.isBase64Encoded) {
     body = new Buffer(body, "base64").toString("utf-8");
   }
 
   if (contentType === "application/x-www-form-urlencoded") {
-    data = querystring.parse(body);
+    data = querystring.parse(body) as Record<string, string>;
   } else if (contentType?.startsWith("multipart/form-data")) {
     const match = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/);
     const boundary = match[1] ?? match[2];
@@ -127,7 +128,7 @@ export const handler = async (event) => {
 
     console.log("-result", result);
   } catch (err) {
-    if (err.name === "ResourceNotFoundException") {
+    if ((err as Error).name === "ResourceNotFoundException") {
       return {
         statusCode: 400,
         body: JSON.stringify({

diff --git a/src/functions/groups-create.ts b/src/functions/groups-create.ts
@@ -1,14 +1,16 @@
 import querystring from "querystring";
 
 import {
+  CreateTableCommand,
+  CreateTableInput,
   DynamoDBClient,
   PutItemCommand,
-  CreateTableCommand,
 } from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   const userEmail = event.headers["rs-email"];
   const userID = event.headers["rs-uid"];
   const userTokenRaw =
@@ -41,14 +43,14 @@ export const handler = async (event) => {
   }
 
   let body = event.body;
-  let data;
+  let data: Record<string, string>;
 
   if (event.isBase64Encoded) {
     body = new Buffer(body, "base64").toString("utf-8");
   }
 
   if (contentType === "application/x-www-form-urlencoded") {
-    data = querystring.parse(body);
+    data = querystring.parse(body) as Record<string, string>;
   } else if (contentType?.startsWith("multipart/form-data")) {
     const match = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/);
     const boundary = match[1] ?? match[2];
@@ -111,7 +113,7 @@ export const handler = async (event) => {
   const groupID = Math.random().toString(36).substring(2);
 
   // create dedicated group table
-  const newTableInput = {
+  const newTableInput: CreateTableInput = {
     TableName: `group-${groupID}`,
     BillingMode: "PAY_PER_REQUEST",
     TableClass: "STANDARD",
@@ -133,7 +135,7 @@ export const handler = async (event) => {
   };
   const newTableCommand = new CreateTableCommand(newTableInput);
 
-  let result = await client.send(newTableCommand);
+  await client.send(newTableCommand);
 
   // save conversation id in list
   const input = {
@@ -157,7 +159,7 @@ export const handler = async (event) => {
 
   const command = new PutItemCommand(input);
 
-  result = await client.send(command);
+  await client.send(command);
 
   return {
     statusCode: 201,

diff --git a/src/functions/groups-delete.ts b/src/functions/groups-delete.ts
@@ -3,17 +3,16 @@ import {
   DeleteItemCommand,
   DeleteTableCommand,
 } from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
   const userEmail = event.headers["rs-email"];
   const userID = event.headers["rs-uid"];
   const userTokenRaw =
     event.headers["Authorization"] ?? event.headers["authorization"];
-  const contentType =
-    event.headers["content-type"] ?? event.headers["Content-Type"];
 
   if (!(userEmail && userID && userTokenRaw)) {
     return {
@@ -76,7 +75,7 @@ export const handler = async (event) => {
 
     console.log("-delete item", result);
   } catch (err) {
-    if (err.name === "ConditionalCheckFailedException") {
+    if ((err as Error).name === "ConditionalCheckFailedException") {
       return {
         statusCode: 400,
         body: JSON.stringify({

diff --git a/src/functions/groups-read-messages.ts b/src/functions/groups-read-messages.ts
@@ -1,15 +1,18 @@
-import { DynamoDBClient, ScanCommand } from "@aws-sdk/client-dynamodb";
+import {
+  DynamoDBClient,
+  ScanCommand,
+  ScanCommandInput,
+} from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
   const userEmail = event.headers["rs-email"];
   const userID = event.headers["rs-uid"];
   const userTokenRaw =
     event.headers["Authorization"] ?? event.headers["authorization"];
-  const contentType =
-    event.headers["content-type"] ?? event.headers["Content-Type"];
 
   if (!(userEmail && userID && userTokenRaw)) {
     return {
@@ -49,7 +52,7 @@ export const handler = async (event) => {
   }
   console.log("-conversation", groupID, since);
 
-  let input = {
+  let input: ScanCommandInput = {
     TableName: `group-${groupID}`,
     ProjectionExpression: "#A, #M, #C",
     ExpressionAttributeNames: {
@@ -83,7 +86,7 @@ export const handler = async (event) => {
       body: JSON.stringify(result),
     };
   } catch (err) {
-    if (err.name === "ResourceNotFoundException") {
+    if ((err as Error).name === "ResourceNotFoundException") {
       return {
         statusCode: 400,
         body: JSON.stringify({

diff --git a/src/functions/logout.ts b/src/functions/logout.ts
@@ -1,8 +1,9 @@
 import { DynamoDBClient, UpdateItemCommand } from "@aws-sdk/client-dynamodb";
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
 
   const userID = event.headers["rs-uid"];
@@ -69,7 +70,7 @@ export const handler = async (event) => {
   } catch (err) {
     console.log("-error", err);
 
-    if (err.name === "ConditionalCheckFailedException") {
+    if ((err as Error).name === "ConditionalCheckFailedException") {
       return {
         statusCode: 400,
         body: JSON.stringify({

diff --git a/src/functions/profile-update.ts b/src/functions/profile-update.ts
@@ -1,15 +1,11 @@
+import { APIGatewayProxyEventV2 } from "aws-lambda";
 import querystring from "querystring";
-import crypto from "crypto";
 
-import {
-  DynamoDBClient,
-  UpdateItemCommand,
-  GetItemCommand,
-} from "@aws-sdk/client-dynamodb";
+import { DynamoDBClient, UpdateItemCommand } from "@aws-sdk/client-dynamodb";
 
 const client = new DynamoDBClient({ region: "eu-central-1" });
 
-export const handler = async (event) => {
+export const handler = async (event: APIGatewayProxyEventV2) => {
   console.log("-event", event);
 
   const userID = event.headers["rs-uid"];
@@ -44,14 +40,14 @@ export const handler = async (event) => {
   }
 
   let body = event.body;
-  let data;
+  let data: Record<string, string>;
 
   if (event.isBase64Encoded) {
     body = new Buffer(body, "base64").toString("utf-8");
   }
 
   if (contentType === "application/x-www-form-urlencoded") {
-    data = querystring.parse(body);
+    data = querystring.parse(body) as Record<string, string>;
   } else if (contentType?.startsWith("multipart/form-data")) {
     const match = contentType.match(/boundary=(?:"([^"]+)"|([^;]+))/);
     const boundary = match[1] ?? match[2];
@@ -140,7 +136,7 @@ export const handler = async (event) => {
   try {
     await client.send(updateCommand);
   } catch (err) {
-    if (err.name === "ConditionalCheckFailedException") {
+    if ((err as Error).name === "ConditionalCheckFailedException") {
       return {
         statusCode: 400,
         body: JSON.stringify({