Merge pull request #1 from bharatari/dev

v2.0.0

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newshub-client",
-  "version": "1.0.0-beta.2",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "engines": {

client/src/routes/Reservations/routes/Reservation/components/ActionItem/Component.js

@@ -0,0 +1,33 @@
+import _ from 'lodash';
+import { FormatDate } from 'components/';
+import React from 'react';
+
+const ActionItem = ({ action })  => {
+  const name = _.get(action, 'user.fullName');
+  const date = _.get(action, 'createdAt');
+  const actionPerformed = _.get(action, 'action');
+
+  const getDescription = () => {
+    if (actionPerformed === 'approved') {
+      return 'approved this on';
+    } else if (actionPerformed === 'checkedOut') {
+      return 'checked this out on';
+    } else if (actionPerformed === 'checkedIn') {
+      return 'checked this in on';
+    } else if (actionPerformed === 'disabled') {
+      return 'disabled this on';
+    } else if (actionPerformed === 'rejected') {
+      return 'rejected this on';
+    } else {
+      return 'modified this on';
+    }
+  };
+
+  return (
+    <li>
+      <strong>{name}</strong> {getDescription()} <FormatDate datetime={date} />
+    </li>
+  );
+};
+
+export default ActionItem;

client/src/routes/Reservations/routes/Reservation/components/Content/Component.js

@@ -2,7 +2,7 @@ import React, { PropTypes } from 'react';
 import classes from './Styles.scss';
 import classNames from 'classnames';
 import { FormatDate, Deleter } from 'components/';
-import { Actions, Devices, AdminNotes } from '../';
+import { Actions, Devices, AdminNotes, ActionItem } from '../';
 import reservation from 'modules/reservation/utils';
 import user from 'modules/user/utils';
 import access from 'utils/access';
@@ -20,38 +20,17 @@ export default class Content extends React.Component {
 
   render() {
     const { reservation: { notes, adminNotes }, roles, deleteReservation } = this.props;
-    const reviewedBy = () => {
-      const reviewedByName = _.get(this.props.reservation, 'approvedBy.fullName') || _.get(this.props.reservation, 'rejectedBy.fullName');
-
-      if (reviewedByName) {
-        return (
-          <li>
-            <strong>{reviewedByName}</strong> reviewed this reservation
-          </li>
-        );
-      }
-    };
-    const checkedOutBy = () => {
-      const checkedOutByName = _.get(this.props.reservation, 'checkedOutBy.fullName');
-
-      if (checkedOutByName) {
-        return (
-          <li>
-            <strong>{checkedOutByName}</strong> checked out this reservation
-          </li>
-        );
-      }
-    };
-    const checkedInBy = () => {
-      const checkedInByName = _.get(this.props.reservation, 'checkedInBy.fullName');
-
-      if (checkedInByName) {
-        return (
-          <li>
-            <strong>{checkedInByName}</strong> checked in this reservation
-          </li>
-        );
+
+    const reservationActions = _.get(this.props.reservation, 'actions');
+
+    const getReservationActions = () => {
+      const array = [];
+
+      for (let i = 0; i < reservationActions.length; i++) {
+        array.push(<ActionItem key={reservationActions[i].id} action={reservationActions[i]} />);
       }
+
+      return array;
     };
 
     const color = reservation.getReservationColor(this.props.reservation);
@@ -116,9 +95,7 @@ export default class Content extends React.Component {
                 <li>
                   <strong>{this.props.reservation.user.fullName}</strong> created this on <FormatDate datetime={this.props.reservation.createdAt} />
                 </li>
-                { reviewedBy() }
-                { checkedOutBy() }
-                { checkedInBy() }
+                { reservationActions ? getReservationActions() : null }
               </ul>
             </div>
           </div>

client/src/routes/Reservations/routes/Reservation/components/index.js

@@ -2,10 +2,12 @@ import Actions from './Actions/Component';
 import AdminNotes from './AdminNotes/Component';
 import Content from './Content/Component';
 import Devices from './Devices/Component';
+import ActionItem from './ActionItem/Component';
 
 export {
   Actions,
   AdminNotes,
   Content,
   Devices,
+  ActionItem,
 };

gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newshub-gateway",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {

gateway/src/services/proxy/index.js

@@ -18,6 +18,8 @@ module.exports = async (ctx, next) => {
           'content-type': 'application/json; charset=utf-8',
           'authorization': headers['authorization'],
         });
+
+        // headers['newshub-user'] = JSON.stringify(await data.getUser(userId, headers));
       }
 
       // Don't dynamically resolve method names

gateway/src/services/roomReservation/index.js

@@ -3,6 +3,38 @@ const access = require('../../utils/access');
 const proxy = require('../proxy/index');
 
 module.exports = (router) => {
+  router.get('/api/room-reservation', async (ctx, next) => {
+    const path = ctx.request.path;
+    const query = ctx.request.search;
+    const headers = ctx.request.headers;
+    const userId = ctx.state.user ? ctx.state.user.userId : '';
+
+    try {
+      headers['newshub-user-id'] = userId;
+
+      headers['newshub-user'] = JSON.stringify(await data.getUser(userId, headers));
+
+      if (userId) {
+        headers['newshub-organization-id'] = await data.getOrganizationId(userId, {
+          'content-type': 'application/json; charset=utf-8',
+          'authorization': headers['authorization'],
+        });
+
+        headers['newshub-user'] = JSON.stringify(await data.getUser(userId, headers));
+      }
+
+      const response = await data.get(path, query, headers);
+
+      data.respond(ctx, response, next);
+    } catch (e) {
+      data.handleError(ctx, e, next);
+    }
+    // Pass user JSON in header
+    // Or pass JWT with claims as user JSON
+    // Have a docker shared secret file so all docker services
+    // can have access to the jwt secret
+  });
+
   router.post('/api/room-reservation', async (ctx, next) => {
     const path = ctx.request.path;
     const body = ctx.request.body;

gateway/src/utils/data.js

@@ -162,5 +162,18 @@ module.exports = {
     } else {
       return '';
     }
+  },
+  async getUser(userId, headers) {
+    try {
+      let user = JSON.parse(await data.get(`/api/user/${userId}`, '', headers));
+
+      if (user) {
+        user.roles = JSON.parse(await data.get(`/api/role`, '?roles=all', headers));
+      }
+
+      return user;
+    } catch (e) {
+      return null;
+    }
   }
 };

services/authentication/.env.sample

@@ -1,8 +1,6 @@
 DATABASE_URL=postgres://postgres:postgres@postgres/authentication
 DATABASE_SSL=false
 REDIS_URL=redis://redis:6379
-S3_API_KEY=key
-S3_API_SECRET=secret
 TEST_DB=postgres://postgres:postgres@postgres/authentication_test
 TEST_REDIS_URL=redis://redis:6379
 AZURE_STORAGE_CONNECTION_STRING=string

services/authentication/config/default.json

@@ -8,9 +8,6 @@
     "secret": "p9g6Jt5SqfJ9HoM5hIO0UG9r1JjlhRN4fGXheh5kcG2BxMjtpCw4u1uTJTOO5iztQZVTPZ1SBueCdzSfOnAwEw=="
   },
   "keys": {
-    "S3_API_KEY": "S3_API_KEY",
-    "S3_API_SECRET": "S3_API_SECRET",
-    "SENDGRID_KEY": "SENDGRID_KEY",
     "REDIS_URL": "REDIS_URL"
   }
 }

services/authentication/config/production.json

@@ -8,9 +8,6 @@
     "secret": "FEATHERS_AUTH_SECRET"
   },
   "keys": {
-    "S3_API_KEY": "S3_API_KEY",
-    "S3_API_SECRET": "S3_API_SECRET",
-    "SENDGRID_KEY": "SENDGRID_KEY",
     "REDIS_URL": "REDIS_URL"
   }
 }

services/authentication/config/test.json

@@ -8,9 +8,6 @@
     "secret": "p9g6Jt5SqfJ9HoM5hIO0UG9r1JjlhRN4fGXheh5kcG2BxMjtpCw4u1uTJTOO5iztQZVTPZ1SBueCdzSfOnAwEw=="
   },
   "keys": {
-    "S3_API_KEY": "S3_API_KEY",
-    "S3_API_SECRET": "S3_API_SECRET",
-    "SENDGRID_KEY": "SENDGRID_KEY",
     "REDIS_URL": "TEST_REDIS_URL"
   }
 }

services/authentication/package.json

@@ -1,7 +1,7 @@
 {
   "name": "newshub-authentication",
   "description": "",
-  "version": "1.0.0-beta.2",
+  "version": "2.0.0",
   "homepage": "",
   "main": "src/",
   "keywords": [
@@ -53,8 +53,6 @@
     "sequelize-cli": "^2.5.1",
     "sequelize-fixtures": "^0.7.0",
     "serve-favicon": "^2.3.0",
-    "skipper": "^0.6.4",
-    "skipper-s3": "^0.5.6",
     "winston": "^2.2.0"
   },
   "devDependencies": {