add utils

Author: Alesyaa103

controllers/index.js

@@ -2,6 +2,7 @@ const passport = require('koa-passport');
 const config = require('config');
 const jwt = require('jwt-simple'); // аутентификация по JWT для hhtp
 const User = require('../models/User');
+const uploadS3 = require('../utils/uploadS3');
 
 module.exports = {
   async signIn(ctx, next) {
@@ -12,7 +13,9 @@ module.exports = {
         };
         ctx.body = {
           token: jwt.encode(payload, config.get('jwtSecret')),
-          user,
+          user: {
+            email: user.email,
+          },
         };
       } else {
         ctx.body = {
@@ -95,57 +98,48 @@ module.exports = {
       };
     }
   },
-  
   async returnWorkers(ctx) {
     try {
       const workers = await User.find();
+      //const workers = payload.sort(dynamicSortMultiple.apply(null, User.rating));
       ctx.body = {
         workers,
       };
       ctx.response.status = 200;
     } catch (err) {
-      ctx.body = {
-        err,
-      };
+        console.log(err);
     }
   },
-  async returnUser(ctx) {
+  async updateUser(ctx) {
     const data = ctx.request.body;
     try {
-      const user = await User.findOne({ _id: data._id });
+      const user = await User.findByIdAndUpdate(data._id);
+      ctx.response.status = 200;
       ctx.body = {
-        user,
+        user: {
+          firstname: user.firstname,
+          lastname: user.lastname,
+          email: user.email,
+          username: user.username,
+          title: user.title,
+          location: {
+            country: user.location.country,
+            city: user.location.city,
+          },
+          company: user.company,
+          stack: user.stack,
+          price: user.price,
+          rating: user.rating,
+          mobile: {
+            code: user.mobile.code,
+            number: user.mobile.number,
+          },
+        },
       };
     } catch (err) {
       ctx.body = {
         err,
-      };
-    }
-  },
-  async updateUser(ctx) {
-    const data = ctx.request.body;
-    try {
-      const userUpdate = await User.findById(data._id);
-      userUpdate.firstname = data.firstname;
-      userUpdate.lastname = data.lastname;
-      userUpdate.email = data.email;
-      userUpdate.username = data.username;
-      userUpdate.title = data.title;
-      userUpdate.location.country = data.location.country;
-      userUpdate.location.city = data.location.city;
-      userUpdate.company = data.company;
-      userUpdate.stack = data.stack;
-      userUpdate.price = data.price;
-      userUpdate.rating = data.rating;
-      userUpdate.mobile.code = data.mobile.code;
-      userUpdate.mobile.number = data.mobile.number;
-      await userUpdate.save();
-      ctx.response.status = 200;
-      ctx.body = {
-        userUpdate,
       }
-    } catch (err) {
-      console.log(err);
     }
   },
   async deleteUser(ctx) {
@@ -161,5 +155,47 @@ module.exports = {
       };
     }
   },
-
+  async user(ctx) {
+    const data = ctx.request.body;
+    try {
+      const user = await User.findOne({ email: data.email });
+      ctx.body = {
+        user: {
+          firstname: user.firstname,
+          photo: user.photo,
+          lastname: user.lastname,
+          email: user.email,
+          username: user.username,
+          title: user.title,
+          location: {
+            country: user.location.country,
+            city: user.location.city,
+          },
+          company: user.company,
+          stack: user.stack,
+          price: user.price,
+          rating: user.rating,
+          mobile: {
+            code: user.mobile.code,
+            number: user.mobile.number,
+          },
+        },
+      };
+      ctx.response.status = 200;
+    } catch (err) {
+      ctx.body = {
+        err,
+      };
+    }
+  },
+  async userPhoto(ctx) {
+    
+    console.log(ctx.request.files);
+    // const photo = await uploadS3(config.get('aws').userPhoto, ctx.request.files.photo)
+    // console.log(photo);
+    ctx.response.status = 200;
+    ctx.body = {
+      sraka: ctx.request.files,
+    }
+  }
 };

libs/aws.js

@@ -0,0 +1,11 @@
+const AWS = require('aws-sdk');
+const config = require('config');
+
+const options = {
+  accessKeyId: config.get('aws').accessKeyId,
+  secretAccessKey: config.get('aws').secretAccessKey,
+};
+
+AWS.config.update(options);
+
+module.exports = AWS;

models/User.js

@@ -40,7 +40,7 @@ const UserSchema = new User({
     },
     number: {
       type: Number,
-    }
+    },
   },
   location: {
     country: {

package-lock.json

@@ -13,6 +13,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "aws-sdk": "^2.524.0",
     "config": "^3.2.2",
     "crypto": "^1.0.1",
     "jwt-simple": "^0.5.6",

package.json

@@ -2,7 +2,7 @@ const KoaRouter = require('koa-router');
 const passport = require('koa-passport');
 
 const {
-  signIn, signUp, reset1, reset2, returnWorkers, deleteUser, updateUser, returnUser,
+  signIn, signUp, reset1, reset2, returnWorkers, deleteUser, updateUser, user, userPhoto
 } = require('../controllers');
 
 const router = new KoaRouter();
@@ -11,9 +11,10 @@ router.post('signIn', signIn);
 router.post('signUp', signUp);
 router.post('reset1', reset1);
 router.post('reset2', reset2);
-router.get('returnUser', returnUser)
-router.get('returnWorkers', returnWorkers);
-router.delete('deleteUser', deleteUser);
-router.put('updateUser', updateUser);
+router.post('user', passport.authenticate('jwt', { session: false }), user);
+router.get('returnWorkers', passport.authenticate('jwt', { session: false }), returnWorkers);
+router.delete('deleteUser', passport.authenticate('jwt', { session: false }), deleteUser);
+router.put('updateUser', passport.authenticate('jwt', { session: false }), updateUser);
+router.put('photo', passport.authenticate('jwt', { session: false }), userPhoto)
 
 module.exports = router;