Merge branch 'main' of https://github.com/dropbucket/dropbucket-backend into kty

# Conflicts:
#	package-lock.json
#	package.json

Author: juicyorange

package-lock.json

@@ -13,7 +13,6 @@
     "debug": "~2.6.9",
     "dotenv": "^9.0.2",
     "express": "~4.16.1",
-    "express-jwt": "^6.0.0",
     "jwt-decode": "^3.1.2",
     "morgan": "~1.9.1",
     "multer": "^1.4.2",

package.json

@@ -5,7 +5,7 @@ import {
 
 export const showFavorites = async (req, res, next) => {
   try {
-    let rows = await showFavorites2(req.body);
+    let rows = await showFavorites2(req);
     return res.json(rows);
   } catch (err) {
     return res.status(500).json(err);
@@ -14,7 +14,7 @@ export const showFavorites = async (req, res, next) => {
 
 export const switchFavorites = async (req, res, next) => {
   try {
-    let rows = await switchFavorites2(req.body);
+    let rows = await switchFavorites2(req);
     return res.json(rows);
   } catch (err) {
     return res.status(500).json(err);

src/controllers/favoritesController.js

@@ -1,9 +1,27 @@
 import AWS from 'aws-sdk';
 import dotenv from 'dotenv';
+import jwt_decode from 'jwt-decode';
 dotenv.config();
 
+const me = async function (req) {
+  if (req.headers && req.headers.authorization) {
+    let authorization = req.headers.authorization.split(' ')[1],
+      decoded;
+    try {
+      decoded = jwt_decode(authorization);
+    } catch (e) {
+      return { statusCode: 401, msg: 'unauthorized' };
+    }
+    let userId = decoded.user_id;
+    // Fetch the user by id
+    return { statusCode: 200, userId: userId };
+  }
+  return { statusCode: 500, msg: 'Header error' };
+};
+
 export const showFavorites2 = async (req) => {
   console.log('connect');
+
   try {
     AWS.config.update({
       region: process.env.AWS_REGION,
@@ -13,13 +31,19 @@ export const showFavorites2 = async (req) => {
       //sessionToken: process.env.DYNAMODB_SESSION_TOKEN,
     });
 
+    const im = await me(req);
+    if (im.statusCode === 401 || im.statusCode === 500) {
+      return im;
+    }
+    const file_owner = im.userId;
+
     let docClient = new AWS.DynamoDB.DocumentClient();
     let params = {
       TableName: 'FileDirTable',
       FilterExpression: 'is_starred = :tr and file_owner = :fo',
       ExpressionAttributeValues: {
         ':tr': true,
-        ':fo': req.file_owner,
+        ':fo': file_owner,
       },
     };
 
@@ -51,12 +75,18 @@ export const switchFavorites2 = async (req) => {
       //sessionToken: process.env.DYNAMODB_SESSION_TOKEN,
     });
 
+    const im = await me(req);
+    if (im.statusCode === 401 || im.statusCode === 500) {
+      return im;
+    }
+    const file_owner = im.userId;
+
     let docClient = new AWS.DynamoDB.DocumentClient();
     let params = {
       TableName: 'FileDirTable',
       Key: {
-        parent_id: req.parent_id,
-        id: req.id,
+        file_owner: file_owner,
+        id: req.body.id,
       },
     };
 
@@ -67,8 +97,8 @@ export const switchFavorites2 = async (req) => {
     params = {
       TableName: 'FileDirTable',
       Key: {
-        parent_id: req.parent_id,
-        id: req.id,
+        file_owner: file_owner,
+        id: req.body.id,
       },
       UpdateExpression: 'set is_starred = :n',
       ExpressionAttributeValues: {

src/services/favoritesService.js

@@ -15,37 +15,46 @@ export const shareItem2 = async (req) => {
     let docClient = new AWS.DynamoDB.DocumentClient();
     let params = {
       TableName: 'FileDirTable',
-      Key: {
-        parent_id: req.parent_id,
-        id: req.id,
-      },
-      UpdateExpression: 'set is_shared = :n',
+      FilterExpression: 'id = :id',
       ExpressionAttributeValues: {
-        ':n': true,
+        ':id': req.id,
       },
-      ReturnValues: 'UPDATED_NEW',
     };
 
-    let status = await docClient.update(params).promise();
-    console.log(JSON.stringify(status, null, 2));
+    let fileArr = await docClient.scan(params).promise();
 
+    if (fileArr.Count === 0) {
+      return {
+        statusCode: 500,
+        success: false,
+        msg: '해당하는 id의 파일이 존재하지않습니다.',
+      };
+    }
+    let file = fileArr.Items[0];
     params = {
       TableName: 'FileDirTable',
       Key: {
-        parent_id: req.parent_id,
+        file_owner: file.file_owner,
         id: req.id,
       },
+      UpdateExpression: 'set is_shared = :n',
+      ExpressionAttributeValues: {
+        ':n': true,
+      },
+      ReturnValues: 'UPDATED_NEW',
     };
 
-    let data = await docClient.get(params).promise();
+    let status = await docClient.update(params).promise();
+    console.log(file);
+
     let s3 = new AWS.S3();
-    //console.log(data.Item.filename);
 
     // key값 수정 필요 ! s3에 파일이 어떻게 저장 돼있는지에 따라 수정
     const BUCKET_NAME = 'dropbucket123';
     params = {
       Bucket: BUCKET_NAME,
-      Key: data.Item.filename + '.' + data.Item.content_type,
+      Key: file.id,
+      //Key: file.id + '.' + file.content_type,
     };
 
     let url = await s3.getSignedUrlPromise('getObject', params);