testing

maestro-server · Feb 23, 2018 · 3bcb57e · 3bcb57e
1 parent d092228
commit 3bcb57e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 39 deletions.
diff --git a/app/config/config.json b/app/config/config.json
@@ -16,6 +16,9 @@
       "favicon": {
         "enabled": false
       },
+      "multipart": {
+        "enabled": true
+      },
       "filter": {
           "priority": 40,
           "module": {

diff --git a/app/core/applications/uploadApplication.js b/app/core/applications/uploadApplication.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const DUploaderService = require('core/services/UploaderService');
+const formidable = require('formidable');
 
 
 const PersistenceApp = (Entity, UploadService=DUploaderService) => {
@@ -12,6 +13,11 @@ const PersistenceApp = (Entity, UploadService=DUploaderService) => {
                 .uploadImage(req.query, req.user)
                 .then(e => res.json(e))
                 .catch(next);
+        },
+
+        receiverFile (req, res, next) {
+
+            console.log(req.files, req.body);
         }
 
     };

diff --git a/app/core/repositories/uploaderLocalRepository.js b/app/core/repositories/uploaderLocalRepository.js
@@ -1,54 +1,23 @@
 'use strict';
 
-const _ = require('lodash');
-const aws = require('aws-sdk');
 const mapsFile = require('./maps/mapFileType');
-const UploaderError = require('core/errors/factoryError')('UploaderError');
-
-const factoryValid = require('core/libs/factoryValid');
-const s3Valid = require('core/validators/s3_valid');
-
 
 const UploaderRepository = (folder) => {
 
-    factoryValid(
-        _.pick(process.env, ['AWS_S3_BUCKET_NAME', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY']),
-        s3Valid
-    );
-
     return {
-
         upload(_id, type) {
-            return new Promise((resolve) => {
+
+            const filename = `${_id}.${mapsFile(type)}`;
 
-                const s3 = new aws.S3();
-                const S3_BUCKET = process.env.AWS_S3_BUCKET_NAME;
-                const PATH = S3_BUCKET + '/' + folder;
-                const filename = `${_id}.${mapsFile(type)}`;
-
-                const s3Params = {
-                    Bucket: PATH,
-                    Key: filename,
-                    Expires: 60,
-                    ContentType: type,
-                    ACL: 'public-read'
-                };
-
-                s3.getSignedUrl('putObject', s3Params, (err, data) => {
-                    if (err) {
-                        throw new UploaderError(err);
-                    }
-
-                    const returnData = {
-                        signedRequest: data,
-                        url: `https://${S3_BUCKET}.s3.amazonaws.com/${folder}/${filename}`,
-                        filename: `${folder}/${filename}`
-                    };
+            return new Promise((resolve) => {
 
-                    resolve(returnData);
+                resolve({
+                    signedRequest: "http://localhost:8888/users/upload",
+                    url:`http://localhost:8880/uploader/${folder}/${filename}`,
+                    filename: `${folder}/${filename}`
                 });
-
             });
+
         }
     };
 };

diff --git a/app/core/services/UploaderService.js b/app/core/services/UploaderService.js
@@ -18,6 +18,7 @@ const UploaderService = (Entity) => {
                 const {_id} = owner;
 
                 validateFile({type}).check();
+                console.log(typeU)
 
                 return UploaderRepository
                     .upload(_id, type)

diff --git a/app/identity/routers/profile/users.js b/app/identity/routers/profile/users.js
@@ -4,6 +4,7 @@ const authenticate = require('identity/middlewares/authenticate');
 
 const User = require('identity/entities/Users');
 const UserAuth = require('identity/entities/Auth');
+const formidable = require('formidable');
 
 /**
  *
@@ -111,6 +112,8 @@ module.exports = function (router) {
          */
         .get('/upload', authenticate(), UploaderApp.uploader)
 
+        .put('/upload', UploaderApp.receiverFile)
+
         .get('/forgot', (req, res) => {
           res.json({});
          })