Adding auth, media, and messaging.

diff --git a/app.js b/app.js
index 97c3ffcf82113465ba51fe4c3c561d5045715f25..d2ee388782f4e8e04b9ed94a174c1ffbbddc4e40 100755 (executable)
--- a/app.js
+++ b/app.js
@@ -16,7 +16,7 @@ const path = require('path');
 const Docker = require('dockerode');
 const docker = new Docker({ socketPath: '/var/run/docker.sock' });
 const sshConfig = {
-  host:'192.168.1.62', port:22, username:'charles', privateKey:fs.readFileSync( '/home/node/.ssh/git-ui' ),
+  host:'192.168.1.62', port:22, username:'charles'
 };
 
 const buffer = require('buffer');

diff --git a/src/middleware/routeHelpers.js b/src/middleware/routeHelpers.js
index 9bcc4bab0db9e57c765b2dcbdd1af34bddfe8991..96d7166062a62b86cd83da40911452e69bf84aa5 100755 (executable)
--- a/src/middleware/routeHelpers.js
+++ b/src/middleware/routeHelpers.js
@@ -1,25 +1,10 @@
-const validateAuth = function ( passport, context='jwt') {
-  logger.debug('validateAuth');
+const validate_auth = function ( passport, context='jwt') {
+  logger.debug('validate_auth');
   async function checkKey( req, res, next ) {
     const { authorization, apikey:apiKey } = req.headers;
     if (authorization) return passport.authenticate( context, { session:false } )(req, res, next);
     else if (!authorization && !apiKey) return passport.authenticate( context, { session: false } )(req, res, next);
-    /*else {
-      // const key = await rvdb.query( 'select * from rt2.api_keys where api_key = $1;', [apiKey], { plain:true } );
-      const user = key ? await db.user().findOne( { id:key.user_id, is_deleted:false, is_active:true } ) : undefined;
-      const roles = user ? await rvdb.query( `
-          select r.*
-          from rt2.api_key_roles ur
-                   inner join rt2.roles r on r.id = ur.role_id
-          where ur.api_key_id = $1;`, [key.id] ) : undefined;
-      if (user && roles) {
-        user.roles = roles;
-      }
-      if (key && user) {
-        req.user = user;
-      }
-      next();
-    }*/
+    next();
   }
 
   return checkKey;
@@ -45,4 +30,4 @@ const restrictToRoles = (roles) => (req, res, next) => {
   next();
 };
 
-module.exports = { validateAuth, allowApi, restrictToRoles };
\ No newline at end of file
+module.exports = { validate_auth, allowApi, restrictToRoles };
\ No newline at end of file

diff --git a/src/routes/docker.routes.js b/src/routes/docker.routes.js
index 2456594dcebf8fc63817c8ce804ea1f0c5acce41..6ae1ae5152b21429c672cf8b167c70b9f4b9151c 100644 (file)
--- a/src/routes/docker.routes.js
+++ b/src/routes/docker.routes.js
@@ -1,6 +1,6 @@
 const express = require( 'express' );
 const router = express.Router();
-const { validateAuth } = require( '../middleware/routeHelpers' );
+const { validate_auth } = require( '../middleware/routeHelpers' );
 const dockerController = require( '../controllers/docker.controller' );
 
 module.exports = ( passport ) => {

diff --git a/src/routes/git.routes.js b/src/routes/git.routes.js
index 420a9dc0871a6535b7f6a8531de4fbbc118f3c8c..84b76620c284dc21a4ac346567f6bc7543d78e7e 100755 (executable)
--- a/src/routes/git.routes.js
+++ b/src/routes/git.routes.js
@@ -1,10 +1,10 @@
 const express = require( 'express' );
 const router = express.Router();
-const { validateAuth } = require( '../middleware/routeHelpers' );
+const { validate_auth } = require( '../middleware/routeHelpers' );
 const gitController = require( '../controllers/git.controller' );
 
 module.exports = ( passport ) => {
-  // router.use( validateAuth( passport ) );
+  // router.use( validate_auth( passport ) );
   router.post( '/create-repo', gitController.createRepo );
   router.get( '/', gitController.getRepos );
   router.delete( '/:name', gitController.deleteRepo );

diff --git a/src/routes/media.routes.js b/src/routes/media.routes.js
index 6d830e92583c662f972b884a27230cf66895e577..01a1e8d5d4e5638b2a8a4eaa9a6e3b8e8e5cf05a 100644 (file)
--- a/src/routes/media.routes.js
+++ b/src/routes/media.routes.js
@@ -4,7 +4,7 @@
 
 const express = require('express');
 const router = express.Router();
-const { validateAuth } = require('../middleware/routeHelpers');
+const { validate_auth } = require('../middleware/routeHelpers');
 const media_controller = require('../controllers/media.controller');
 
 /**
@@ -13,11 +13,11 @@ const media_controller = require('../controllers/media.controller');
  * @returns {Object} Express router with media routes
  */
 module.exports = (passport) => {
-  router.post('/create', validateAuth(passport), media_controller.create);
-  router.get('/file_path/:file_path', validateAuth(passport), media_controller.find_by_file_path);
-  router.get('/:id', validateAuth(passport), media_controller.find_one);
-  router.get('/', validateAuth(passport), media_controller.find_many);
-  router.put('/:id', validateAuth(passport), media_controller.update);
-  router.put('/:id/soft_delete', validateAuth(passport), media_controller.soft_delete);
+  router.post('/create', validate_auth(passport), media_controller.create);
+  router.get('/file_path/:file_path', validate_auth(passport), media_controller.find_by_file_path);
+  router.get('/:id', validate_auth(passport), media_controller.find_one);
+  router.get('/', validate_auth(passport), media_controller.find_many);
+  router.put('/:id', validate_auth(passport), media_controller.update);
+  router.put('/:id/soft_delete', validate_auth(passport), media_controller.soft_delete);
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/message.routes.js b/src/routes/message.routes.js
index 8d750f0f3241a7c7f6df584e80b7f5ff1f63242a..52d4fbb603a05705b9461f206d229713ac404053 100644 (file)
--- a/src/routes/message.routes.js
+++ b/src/routes/message.routes.js
@@ -4,7 +4,7 @@
 
 const express = require('express');
 const router = express.Router();
-const { validateAuth } = require('../middleware/routeHelpers');
+const { validate_auth } = require('../middleware/routeHelpers');
 const message_controller = require('../controllers/message.controller');
 
 /**
@@ -13,11 +13,11 @@ const message_controller = require('../controllers/message.controller');
  * @returns {Object} Express router with message routes
  */
 module.exports = (passport) => {
-  router.post('/create', validateAuth(passport), message_controller.create);
-  router.get('/group/:group_id', validateAuth(passport), message_controller.find_by_group_id);
-  router.get('/recipient/:recipient_id', validateAuth(passport), message_controller.find_by_recipient_id);
-  router.get('/:id', validateAuth(passport), message_controller.find_one);
-  router.get('/', validateAuth(passport), message_controller.find_many);
-  router.put('/:id/mark_as_read', validateAuth(passport), message_controller.mark_as_read);
+  router.post('/create', validate_auth(passport), message_controller.create);
+  router.get('/group/:group_id', validate_auth(passport), message_controller.find_by_group_id);
+  router.get('/recipient/:recipient_id', validate_auth(passport), message_controller.find_by_recipient_id);
+  router.get('/:id', validate_auth(passport), message_controller.find_one);
+  router.get('/', validate_auth(passport), message_controller.find_many);
+  router.put('/:id/mark_as_read', validate_auth(passport), message_controller.mark_as_read);
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/message_group.routes.js b/src/routes/message_group.routes.js
index 73135abd66fed435592d4b149ed5117a0069af32..831b830c96b828c3c99e7ca3b2a0e29b1d806393 100644 (file)
--- a/src/routes/message_group.routes.js
+++ b/src/routes/message_group.routes.js
@@ -4,7 +4,7 @@
 
 const express = require('express');
 const router = express.Router();
-const { validateAuth } = require('../middleware/routeHelpers');
+const { validate_auth } = require('../middleware/routeHelpers');
 const message_group_controller = require('../controllers/message_group.controller');
 
 /**
@@ -13,9 +13,9 @@ const message_group_controller = require('../controllers/message_group.controlle
  * @returns {Object} Express router with message group routes
  */
 module.exports = (passport) => {
-  router.post('/create', validateAuth(passport), message_group_controller.create);
-  router.get('/:id', validateAuth(passport), message_group_controller.find_one);
-  router.get('/', validateAuth(passport), message_group_controller.find_many);
-  router.put('/:id', validateAuth(passport), message_group_controller.update);
+  router.post('/create', validate_auth(passport), message_group_controller.create);
+  router.get('/:id', validate_auth(passport), message_group_controller.find_one);
+  router.get('/', validate_auth(passport), message_group_controller.find_many);
+  router.put('/:id', validate_auth(passport), message_group_controller.update);
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/message_group_members.routes.js b/src/routes/message_group_members.routes.js
index 57396654b0f6515ebc0a68bd147462d657081031..b2d6c48d48a7ccbcbf606e424be59ba54ff900e2 100644 (file)
--- a/src/routes/message_group_members.routes.js
+++ b/src/routes/message_group_members.routes.js
@@ -4,7 +4,7 @@
 
 const express = require('express');
 const router = express.Router();
-const { validateAuth } = require('../middleware/routeHelpers');
+const { validate_auth } = require('../middleware/routeHelpers');
 const message_group_members_controller = require('../controllers/message_group_members.controller');
 
 /**
@@ -13,9 +13,9 @@ const message_group_members_controller = require('../controllers/message_group_m
  * @returns {Object} Express router with message group members routes
  */
 module.exports = (passport) => {
-  router.post('/add', validateAuth(passport), message_group_members_controller.add_relation);
-  router.delete('/remove', validateAuth(passport), message_group_members_controller.remove_relation);
-  router.get('/ids/:group_id/:user_id', validateAuth(passport), message_group_members_controller.find_by_ids);
-  router.get('/group/:group_id', validateAuth(passport), message_group_members_controller.find_by_group_id);
+  router.post('/add', validate_auth(passport), message_group_members_controller.add_relation);
+  router.delete('/remove', validate_auth(passport), message_group_members_controller.remove_relation);
+  router.get('/ids/:group_id/:user_id', validate_auth(passport), message_group_members_controller.find_by_ids);
+  router.get('/group/:group_id', validate_auth(passport), message_group_members_controller.find_by_group_id);
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/post.routes.js b/src/routes/post.routes.js
index 0813c48635ddbda9c3e8e68df55b5788ba5d43ce..8c8b7cafc8558a77154011cfef69bc2fc018e28c 100644 (file)
--- a/src/routes/post.routes.js
+++ b/src/routes/post.routes.js
@@ -4,7 +4,7 @@
 
 const express = require('express');
 const router = express.Router();
-const { validateAuth } = require('../middleware/routeHelpers');
+const { validate_auth } = require('../middleware/routeHelpers');
 const post_controller = require('../controllers/post.controller');
 
 /**
@@ -13,11 +13,11 @@ const post_controller = require('../controllers/post.controller');
  * @returns {Object} Express router with post routes
  */
 module.exports = (passport) => {
-  router.post('/create', validateAuth(passport), post_controller.create);
-  router.get('/title/:title', validateAuth(passport), post_controller.find_by_title);
-  router.get('/:id', validateAuth(passport), post_controller.find_one);
-  router.get('/', validateAuth(passport), post_controller.find_many);
-  router.put('/:id', validateAuth(passport), post_controller.update);
-  router.put('/:id/soft_delete', validateAuth(passport), post_controller.soft_delete);
+  router.post('/create', validate_auth(passport), post_controller.create);
+  router.get('/title/:title', validate_auth(passport), post_controller.find_by_title);
+  router.get('/:id', validate_auth(passport), post_controller.find_one);
+  router.get('/', validate_auth(passport), post_controller.find_many);
+  router.put('/:id', validate_auth(passport), post_controller.update);
+  router.put('/:id/soft_delete', validate_auth(passport), post_controller.soft_delete);
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/role.routes.js b/src/routes/role.routes.js
index 2c6a2d1391031aeb7f39f463ee19604ef1564bc4..213e07e78f191d756842e888b013a1a079b69954 100644 (file)
--- a/src/routes/role.routes.js
+++ b/src/routes/role.routes.js
@@ -4,7 +4,7 @@
 
 const express = require( 'express' );
 const router = express.Router();
-const { validateAuth } = require( '../middleware/routeHelpers' );
+const { validate_auth } = require( '../middleware/routeHelpers' );
 const role_controller = require( '../controllers/role.controller' );
 
 /**
@@ -13,11 +13,11 @@ const role_controller = require( '../controllers/role.controller' );
  * @returns {Object} Express router with role routes
  */
 module.exports = ( passport ) => {
-  router.post( '/create', validateAuth( passport ), role_controller.create );
-  router.get( '/name/:name', validateAuth( passport ), role_controller.find_by_name );
-  router.get( '/:id', validateAuth( passport ), role_controller.find_one );
-  router.get( '/', validateAuth( passport ), role_controller.find_many );
-  router.put( '/:id', validateAuth( passport ), role_controller.update );
-  router.put( '/:id/soft_delete', validateAuth( passport ), role_controller.soft_delete );
+  router.post( '/create', validate_auth( passport ), role_controller.create );
+  router.get( '/name/:name', validate_auth( passport ), role_controller.find_by_name );
+  router.get( '/:id', validate_auth( passport ), role_controller.find_one );
+  router.get( '/', validate_auth( passport ), role_controller.find_many );
+  router.put( '/:id', validate_auth( passport ), role_controller.update );
+  router.put( '/:id/soft_delete', validate_auth( passport ), role_controller.soft_delete );
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/user.routes.js b/src/routes/user.routes.js
index 5dffd7d41cf179c17675d62b0378b803a6ec5a93..58c3c8a7a131345aacab4b61839bafce0117ffcd 100644 (file)
--- a/src/routes/user.routes.js
+++ b/src/routes/user.routes.js
@@ -6,9 +6,9 @@ const users_controller = require('../controllers/user.controller');
 module.exports = (passport) => {
   router.post('/create', validate_auth(passport), users_controller.create);
   router.get('/email/:email', validate_auth(passport), users_controller.find_by_email);
-  router.get('/active', validate_auth(passport), users_controller.find_active);
+  /*router.get('/active', validate_auth(passport), users_controller.find_active);
   router.get('/:id', validate_auth(passport), users_controller.find_one);
-  router.get('/', validate_auth(passport), users_controller.find_many);
+  router.get('/', validate_auth(passport), users_controller.find_many);*/
   router.put('/:id', validate_auth(passport), users_controller.update);
   router.put('/:id/deactivate', validate_auth(passport), users_controller.deactivate);
   router.put('/:id/reactivate', validate_auth(passport), users_controller.reactivate);

diff --git a/src/routes/user_roles.routes.js b/src/routes/user_roles.routes.js
index f5661a22ef9fc8d3e44aafb5d86d9ac44d44caf8..572476ed7ec0c95f11270524d5f8135e27710b26 100644 (file)
--- a/src/routes/user_roles.routes.js
+++ b/src/routes/user_roles.routes.js
@@ -4,7 +4,7 @@
 
 const express = require( 'express' );
 const router = express.Router();
-const { validateAuth } = require( '../middleware/routeHelpers' );
+const { validate_auth } = require( '../middleware/routeHelpers' );
 const user_roles_controller = require( '../controllers/user_roles.controller' );
 
 /**
@@ -13,9 +13,9 @@ const user_roles_controller = require( '../controllers/user_roles.controller' );
  * @returns {Object} Express router with user roles routes
  */
 module.exports = ( passport ) => {
-  router.post( '/add', validateAuth( passport ), user_roles_controller.add_relation );
-  router.delete( '/remove', validateAuth( passport ), user_roles_controller.remove_relation );
-  router.get( '/ids/:user_id/:role_id', validateAuth( passport ), user_roles_controller.find_by_ids );
-  router.get( '/user/:user_id', validateAuth( passport ), user_roles_controller.find_by_user_id );
+  router.post( '/add', validate_auth( passport ), user_roles_controller.add_relation );
+  router.delete( '/remove', validate_auth( passport ), user_roles_controller.remove_relation );
+  router.get( '/ids/:user_id/:role_id', validate_auth( passport ), user_roles_controller.find_by_ids );
+  router.get( '/user/:user_id', validate_auth( passport ), user_roles_controller.find_by_user_id );
   return router;
 };
\ No newline at end of file

diff --git a/src/routes/vpn.routes.js b/src/routes/vpn.routes.js
index 2be2e40bbcd91b8cf7597784226881941bd3ee92..eab5035c4e5116740a988379390b0e90203c21d5 100644 (file)
--- a/src/routes/vpn.routes.js
+++ b/src/routes/vpn.routes.js
@@ -1,6 +1,6 @@
 const express = require( 'express' );
 const router = express.Router();
-const { validateAuth } = require( '../middleware/routeHelpers' );
+const { validate_auth } = require( '../middleware/routeHelpers' );
 const vpnController = require( '../controllers/vpn.controller' );
 
 module.exports = ( passport ) => {