converted Mongo DB into Dynamo DB, bug in userController.updateUserProfile and userController.updateUserPassword

Author: madelinedoctor1

Diff for: package.json

@@ -30,6 +30,7 @@
     "@headlessui/react": "^1.7.7",
     "@heroicons/react": "^2.0.13",
     "@types/jsonwebtoken": "^8.5.9",
+    "aws-sdk": "^2.1339.0",
     "bcrypt": "^5.1.0",
     "chart.js": "^4.1.2",
     "chartjs-adapter-moment": "^1.0.1",

Diff for: server/controllers/aws/credentialsController.ts

@@ -1,15 +1,17 @@
 import { STSClient, AssumeRoleCommand } from "@aws-sdk/client-sts";
 import { AwsCredentialIdentity } from "@aws-sdk/types";
 import { Request, Response, NextFunction } from "express";
-import User from '../../models/userModel';
 import dotenv from 'dotenv';
 dotenv.config();
 
+const AWS = require('aws-sdk');
+AWS.config.update({region: process.env.AWS_REGION});
+const dynamodb = new AWS.DynamoDB.DocumentClient();
 
 const credentials: AwsCredentialIdentity = {
     accessKeyId: process.env.AWS_ACCESS_KEY_ID,
     secretAccessKey: process.env.AWS_SECRET_KEY,
-  };
+};
 
 const region = process.env.AWS_REGION;
 
@@ -48,10 +50,19 @@ const credentialsController = {
   // This function is used when grabbing information from Lambda, Gateway, etc
   async getCredentialsFromDB(req: Request, res: Response, next: NextFunction) {
     const { email } = res.locals;
-    const user: any = await User.findOne({ email })
+
+    const params = {
+      TableName: process.env.TABLE_NAME,
+      Key: {
+        'email' : email,
+      },
+    };
+
+    const user: any = await dynamodb.get(params).promise();
+
     if (user) {
-      res.locals.arn = user.arn;
-      res.locals.region = user.region;
+      res.locals.arn = user.Item.arn;
+      res.locals.region = user.Item.region;
     }
 
     const roleDetails = {

Diff for: server/controllers/userController.ts

@@ -1,21 +1,31 @@
 import { Request, Response, NextFunction } from "express";
 import { userController , KeyType, KeyTypeSettings, KeyTypePassword } from '../types';
-// import { nextTick } from "process";
-import User from '../models/userModel';
-const bcrypt = require('bcrypt')
+require('dotenv').config();
+
+const AWS = require('aws-sdk');
+AWS.config.update({region: process.env.AWS_REGION});
+const dynamodb = new AWS.DynamoDB.DocumentClient(); 
+
+const bcrypt = require('bcrypt');
 const SALT_WORK_FACTOR = 10;
 const ACCESS_TOKEN_SECRET = process.env.ACCESS_TOKEN_SECRET;
-const jwt = require('jsonwebtoken')
-import * as dotenv from "dotenv";
-require('dotenv').config();
+const jwt = require('jsonwebtoken');
 
 const userController: userController = {
 
   // Middleware for user login
   async verifyUser(req, res, next) {
     const { email, password } = req.body;
+
+    const params = {
+      TableName: process.env.TABLE_NAME,
+      Key: {
+        'email' : email,
+      },
+    };
+
     try {
-      const user: any = await User.findOne({email});
+      const user: any = await dynamodb.get(params).promise();
 
       // If the user does not exist in the database, invoke global error handler
       if (!user) {
@@ -24,18 +34,19 @@ const userController: userController = {
             status: 500,
             message: {err: 'User not in database'}
           });
-      }
+      };
 
       // If user exists with cooresponding email, compare password from client with password in database
-      const isValid: boolean = await bcrypt.compare(password, user.password);
+      const isValid: boolean = await bcrypt.compare(password, user.Item.password);
 
       if (!isValid) {
         return next({
           log: "Error caught in userController.verifyUser middleware function",
           status: 500,
           message: {err: 'Wrong password'}
         });
-      } 
+      };
+
       res.locals.email = email;
       return next(); 
       // All other errors, invoke global error handler
@@ -80,19 +91,26 @@ const userController: userController = {
         status: 500,
         message: {errMessage: `Error found in user input`, errors: errors}
       })
-    }
+    };
 
     // If the registration form was successfully filled out, create a new user in the database
     try {
       const hashedPass = await bcrypt.hash(password, SALT_WORK_FACTOR);
-      const user = await User.create({
-          firstName,
-          lastName,
-          email,
-          password: hashedPass,
-          arn,
-          region
-      })
+
+      const params = {
+        TableName: process.env.TABLE_NAME,
+        Item: {
+          'email' : email , 
+          'firstName' : firstName , 
+          'lastName' : lastName , 
+          'password' : hashedPass , 
+          'arn' : arn , 
+          'region' : region , 
+        },
+      };
+
+      const user = await dynamodb.put(params).promise();
+
       res.locals.user = user;
       return next();
       // Invoke global error handler if a DB error occurs
@@ -108,13 +126,22 @@ const userController: userController = {
   // Middleware for grabbing user info on Settings tab
   async getUser(req, res, next) {
     const { email } = res.locals;
-    const user: any = await User.findOne({email});
+
+    const params = {
+      TableName: process.env.TABLE_NAME,
+      Key: {
+        'email' : email
+      },
+    };
+
+    const user: any = await dynamodb.get(params).promise();
+
     res.locals.user = {
-      email: user.email,
-      firstName: user.firstName,
-      lastName: user.lastName,
-      arn: user.arn,
-      region: user.region
+      email: user.Item.email,
+      firstName: user.Item.firstName,
+      lastName: user.Item.lastName,
+      arn: user.Item.arn,
+      region: user.Item.region
     }
     return next();
   },
@@ -138,26 +165,33 @@ const userController: userController = {
     // Send errors array to the front end
     if (errors.length > 0) {
       return next({
-        log: "Error caught in userController.createUser middleware function",
+        log: "Error caught in userController.updateUserProfile middleware function",
         status: 500,
         message: {errMessage: `Error found in user input`, errors: errors}
       })
-    }
+    };
+
+    const params = {
+      TableName: process.env.TABLE_NAME,
+      Key: {
+        'email': originalEmail
+      },
+      UpdateExpression: 'set firstName = :value1, lastName = :value2, arn = :value3, region = :value4',
+      ExpressionAttributeValues: {
+        ':value1': firstName,
+        ':value2': lastName,
+        ':value3': arn,
+        ':value4': region
+      }
+    };
+
     try {
       // Update user in database with hashedPass as password
-      const updatedUser = await User.findOneAndUpdate({
-          email: originalEmail
-      },
-      {
-        firstName,
-        lastName,
-        arn,
-        region
-      }, 
-      {
-        new: true
-      })
+      const updatedUser = await dynamodb.update(params).promise();
+      console.log(updatedUser);
+      // HI MADELINE
       res.locals.user = updatedUser;
+
       return next();
     } catch (err) {
       return next({
@@ -185,23 +219,30 @@ const userController: userController = {
     // Send errors array back to front end
     if (errors.length > 0) {
       return next({
-        log: "Error caught in userController.createUser middleware function",
+        log: "Error caught in userController.updateUserPassword middleware function",
         status: 500,
         message: {errMessage: `Error found in user input`, errors: errors}
       })
-    }
+    };
+
     try {
       const hashedPass = await bcrypt.hash(password, SALT_WORK_FACTOR);
+
+      const params = {
+        TableName: 'TABLE_NAME',
+        Key: {
+          'email' : {S: originalEmail}
+        },
+        UpdateExpression: `SET password = :value1`,
+        ExpressionAttributeValues: {
+          ':value1' : { S: hashedPass}
+        }
+      };
+
       // create a new user in database with hashedPass as password
-      const updatedUser = await User.findOneAndUpdate({
-          email: originalEmail
-      },
-      {
-        password: hashedPass,
-      }, 
-      {
-        new: true
-      })
+      const updatedUser = await dynamodb.updateItem(params);
+
+      console.log(updatedUser) // HI MADELINE
       res.locals.success = {successMessage: 'Password updated!'};
       return next();
     } catch (err) {