uses process.env.ES_INDEX for ES index. #129 & #64

dwyl · Apr 13, 2015 · b9e598b · b9e598b
1 parent 4dcfcea
commit b9e598b
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,9 @@ Run the following command to set up your local machine:
 ```sh
 export ES_HOST="127.0.0.1"
 export ES_PORT=9200
+export ES_INDEX=dwyl
 export JWT_SECRET="NeverShareYourSecret"
+
 ```
 See [**.travis.yml**](https://github.com/ideaq/time/blob/master/.travis.yml)
 for [Continuous integration](http://en.wikipedia.org/wiki/Continuous_integration) settings.

diff --git a/api/handlers/logout.js b/api/handlers/logout.js
@@ -2,7 +2,7 @@ var ES    = require('esta');
 
 module.exports = function logout(req, reply) {
   var session = {
-    index : "time",
+    index : process.env.ES_INDEX,
     type  : "session",
     id    : req.auth.credentials.jti,
     ended : new Date().toISOString()

diff --git a/api/handlers/register.js b/api/handlers/register.js
@@ -9,7 +9,7 @@ var transfer = require('../lib/transfer_anon_to_registered.js');
 module.exports = function handler(req, reply) {
   var personid = aguid(req.payload.email)
   var person =  {
-    index: "people",
+    index: process.env.ES_INDEX,
     type: "person",
     id: personid,
     email: req.payload.email

diff --git a/api/handlers/timer_find.js b/api/handlers/timer_find.js
@@ -4,7 +4,7 @@ var file   = dir + __filename.replace(__dirname, '') + " -> ";
 
 module.exports = function(req, reply) {
   var record =  {
-    index: "time",
+    index: process.env.ES_INDEX,
     type: "timer",
     id: req.params.id
   }

diff --git a/api/handlers/timer_find_all.js b/api/handlers/timer_find_all.js
@@ -6,7 +6,7 @@ module.exports = function timer_find_all(req, reply, statusCode) {
     statusCode = 404;
   }
   var query =  {
-    "index": "time",
+    "index": process.env.ES_INDEX,
     "type": "timer",
     "field": "person",
     "text": req.auth.credentials.person.toString() // using issuer as the person

diff --git a/api/handlers/timer_start.js b/api/handlers/timer_start.js
@@ -6,7 +6,7 @@ var Hoek  = require('hoek');
 module.exports = function(req, reply) {
   var decoded = req.auth.credentials; //JWT.verify(req.headers.authorization, process.env.JWT_SECRET);
   var timer =  {
-    index: "time",
+    index: process.env.ES_INDEX,
     type: "timer",
     person: decoded.person,
     session: decoded.jti, // session id from JWT

diff --git a/api/handlers/timer_update.js b/api/handlers/timer_update.js
@@ -6,7 +6,7 @@ var Hoek  = require('hoek');
 module.exports = function(req, reply) {
   var decoded = req.auth.credentials;
   var timer =  {
-    index:   "time",
+    index:   process.env.ES_INDEX,
     type:    "timer",
     id: req.payload.id
   }

diff --git a/api/lib/auth_basic_validate.js b/api/lib/auth_basic_validate.js
@@ -5,7 +5,7 @@ var aguid  = require('aguid'); // https://github.com/ideaq/aguid
 module.exports = function validate (email, password, callback) {
 
   var person =  {
-    index: "people",
+    index: process.env.ES_INDEX,
     type: "person",
     id: aguid(email)
   }

diff --git a/api/lib/auth_jwt_sign.js b/api/lib/auth_jwt_sign.js
@@ -18,7 +18,7 @@ module.exports = function sign(request, callback) {
   var token = JWT.sign(payload, process.env.JWT_SECRET); // http://git.io/xPBn
 
   var session = {   // set up session record for inserting into ES
-    index: "time",
+    index: process.env.ES_INDEX,
     type:  "session",
     id  :  payload.jti,
     person: payload.person,

diff --git a/api/lib/auth_jwt_validate.js b/api/lib/auth_jwt_validate.js
@@ -3,7 +3,7 @@ var ES = require('esta');
 var validateFunc = function (decoded, request, callback) {
 
   var session = {
-    index : "time",
+    index : process.env.ES_INDEX,
     type  : "session",
     id    : decoded.jti  // use SESSION ID as key for sessions
   } // jti? >> http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#jtiDef

diff --git a/api/lib/transfer_anon_to_registered.js b/api/lib/transfer_anon_to_registered.js
@@ -26,13 +26,13 @@ module.exports = function(req, reply) {
       Hoek.assert(!err, 'Missing JWT!'); // JWT fails
 
       var session = {
-        index : "time",
+        index : process.env.ES_INDEX,
         type  : "session",
         id    : decoded.jti,
         person: personid
       }
       var session_copy = {
-        index : "time",
+        index : process.env.ES_INDEX,
         type  : "session",
         id    : decoded.jti,
         person: personid
@@ -46,7 +46,7 @@ module.exports = function(req, reply) {
       ES.READ(session, function(ses) {
         // console.log("Anon SESSION :",ses);
         var session = ses._source;
-        session.index = "time";
+        session.index = process.env.ES_INDEX;
         session.type = "session";
         session.person = personid;
         session.id = decoded.jti;
@@ -57,7 +57,7 @@ module.exports = function(req, reply) {
             // lookup all the records that were created with the anon session
             // before the person decided to login...
             var query =  {
-              "index": "time",
+              "index": process.env.ES_INDEX,
               "type": "timer",
               "field": "session",
               "text": decoded.jti

diff --git a/api/test/_db.js b/api/test/_db.js
@@ -4,7 +4,7 @@ var ES = require('esta');
 var test = require('tape');
 
 var record =  {
-  index: "time",
+  index: process.env.ES_INDEX,
   type: "timer",
   id: Math.floor(Math.random() * (1000000)),
   start: new Date().toISOString()
@@ -37,7 +37,7 @@ test("CREATE & READ a record", function(t) {
 
 test("UPDATE a record", function(t) {
   var record =  {
-    index: "time",
+    index: process.env.ES_INDEX,
     type: "timer",
     id: Math.floor(Math.random() * (1000000)),
     start: new Date().getTime()
@@ -63,7 +63,7 @@ test("UPDATE a record", function(t) {
 var aguid = require('aguid');
 
 var session =  {
-  index: "time",
+  index: process.env.ES_INDEX,
   type: "session",
   id: aguid(),
   start: new Date().toISOString(),

diff --git a/api/test/debug.js b/api/test/debug.js