NewsHub v2.0.0 Alpha

bharatari · Aug 16, 2018 · 5dafb07 · 5dafb07
1 parent 9765654
commit 5dafb07
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 5 deletions.
diff --git a/gateway/src/services/proxy/index.js b/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

diff --git a/gateway/src/services/roomReservation/index.js b/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;

diff --git a/gateway/src/utils/data.js b/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;
+    }
   }
 };
diff --git a/services/authentication/package.json b/services/authentication/package.json
@@ -1,7 +1,7 @@
 {
   "name": "newshub-authentication",
   "description": "",
-  "version": "1.0.0-beta.2",
+  "version": "2.0.0-alpha",
   "homepage": "",
   "main": "src/",
   "keywords": [

diff --git a/services/events/package.json b/services/events/package.json
@@ -1,7 +1,7 @@
 {
   "name": "newshub-events",
   "description": "",
-  "version": "1.0.0-beta",
+  "version": "2.0.0-alpha",
   "homepage": "",
   "main": "src",
   "keywords": [

diff --git a/services/files/package.json b/services/files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "newshub-files",
-  "version": "1.0.0",
+  "version": "2.0.0-alpha",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/services/reservations/package.json b/services/reservations/package.json
@@ -1,7 +1,7 @@
 {
   "name": "newshub-reservations",
   "description": "",
-  "version": "0.0.0",
+  "version": "2.0.0-alpha",
   "homepage": "",
   "main": "src",
   "keywords": [

diff --git a/services/room-reservations/package.json b/services/room-reservations/package.json
@@ -1,7 +1,7 @@
 {
   "name": "newshub-room-reservations",
   "description": "",
-  "version": "0.0.0",
+  "version": "2.0.0-alpha",
   "homepage": "",
   "main": "src",
   "keywords": [