Merge pull request #4 from EnsembleLab/dev

Dev

Author: iolufemi

.travis.yml

@@ -4,7 +4,7 @@ services:
   - mongodb
   - redis-server
 env:
-  - MONGOLAB_URL=mongodb://127.0.0.1/snipe RATE_LIMIT=10 REDIS_URL=redis://127.0.0.1/1 SECURE_MODE=true
+  - MONGOLAB_URL=mongodb://127.0.0.1/snipe RATE_LIMIT=10 REDIS_URL=redis://127.0.0.1/1 SECURE_MODE=true NO_CACHE=no
 addons:
   apt:
     sources:

CHANGELOG.md

@@ -0,0 +1,25 @@
+<a name="0.2.0"></a>
+# [0.2.0](https://github.com/EnsembleLab/api-template/compare/0.1.1...v0.2.0) (2017-09-04)
+
+
+### Bug Fixes
+
+* **User model:** Now creates search tags properly ([88f8267](https://github.com/EnsembleLab/api-template/commit/88f8267))
+
+
+### Features
+
+* **User Router:** Completed tests for user router ([71ee3bb](https://github.com/EnsembleLab/api-template/commit/71ee3bb))
+
+
+
+<a name="0.1.1"></a>
+## [0.1.1](https://github.com/EnsembleLab/api-template/compare/0.1.0...v0.1.1) (2017-08-26)
+
+
+
+<a name="0.1.0"></a>
+# [0.1.0](https://github.com/EnsembleLab/api-template/compare/0.0.2...v0.1.0) (2017-08-17)
+
+
+

README.md

@@ -7,7 +7,4 @@
 API Development Template
 
 
-## ToDo
 
-- Implement Helmet for security
-- Implement Express Limiter for limiting requests

TODO.md

@@ -0,0 +1,5 @@
+### TODOs
+| Filename | line # | TODO
+|:------|:------:|:------
+| routes/index.js | 240 | Implement API Generator
+| services/queue/clock.js | 11 | work on a clock functionality so kue can support scheduled jobs

app.js

@@ -2,8 +2,19 @@
 var cluster = require('cluster');
 var config = require('./config');
 var log = require('./services/logger');
+var basicAuth = require('basic-auth-connect');
+var express = require('express');
 
 if (cluster.isMaster && config.env === 'production') {
+    var kue = require('./services/queue').kue;
+    var app = express();
+    app.use(basicAuth(config.queueUIUsername, config.queueUIPassword));
+    app.use(kue.app);
+    var server = app.listen(config.queueUIPort, function () {
+        var host = server.address().address;
+        var port = server.address().port;
+        log.info('Queue UI listening on host '+host+', port '+port+'!');
+    });
 	// Count the machine's CPUs
 	var cpuCount = require('os').cpus().length;
 
@@ -21,10 +32,10 @@ if (cluster.isMaster && config.env === 'production') {
     });
 
 } else {
-	var express = require('express');
 	var app = express();
 	var router = require('./routes');
     var express_enforces_ssl = require('express-enforces-ssl');
+    var workers = require('./services/queue/workers');
 
     if(config.trustProxy === 'yes'){
       app.enable('trust proxy');
@@ -44,7 +55,7 @@ if(config.env === 'production'){
 var server = app.listen(config.port, function () {
     var host = server.address().address;
     var port = server.address().port;
-    log.info('listening on host '+host+', port '+port+'!');
+    log.info('API server listening on host '+host+', port '+port+'!');
 });
 
 }

config/development.js

@@ -8,11 +8,18 @@ module.exports = {
 	secret: process.env.SECRET || 'lakikihdgdfdjjjdgd67264664vdjhjdyncmxuei8336%%^#%gdvdhj????jjhdghduue',
 	mongoURL: process.env.MONGOLAB_URL || 'mongodb://192.168.99.100/snipe',
     noFrontendCaching: process.env.NO_CACHE || 'yes',
+    frontendCacheExpiry: process.env.FRONTEND_CACHE_EXPIRY || '90',
+    backendCacheExpiry: process.env.BACKEND_CACHE_EXPIRY || '90',
     rateLimit: process.env.RATE_LIMIT || '1800',
     rateLimitExpiry: process.env.RATE_LIMIT_EXPIRY || '3600000',
     redisURL: process.env.REDIS_URL || 'redis://192.168.99.100:6379/1',
     letsencryptSSLVerificationURL: process.env.LETSENCRYPT_VERIFICATION_URL || '/.well-known/acme-challenge/xvArhQBSilF4V30dGUagNAZ96ASipB0b0ex0kXn0za8',
     letsencryptSSLVerificationBody: process.env.LETSENCRYPT_VERIFICATION_BODY || 'xvArhQBSilF4V30dGUagNAZ96ASipB0b0ex0kXn0za8._v6aFbaRYWeOmSebtlD-X4Ixf5tPsyULMsXM8HjsK-Q',
     maxContentLength: process.env.MAX_CONTENT_LENGTH || '9999',
-    enforceSSL: process.env.ENFORCE_SSL || 'no'
+    enforceSSL: process.env.ENFORCE_SSL || 'no',
+    gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '6870f32edf6a34aaca7f193f456fae50f8ad5a94',
+    queueUIUsername: process.env.QUEUE_UI_USERNAME || 'admin',
+    queueUIPassword: process.env.QUEUE_UI_PASSWORD || 'password123/',
+    queueUIPort: process.env.QUEUE_UI_PORT || 3000,
+    enforceUserIdAppIdDeveloperId: process.env.ENFORCE_USER_ID_APP_ID_DEVELOPER_ID || 'yes'
 };

config/production.js

@@ -8,11 +8,18 @@ module.exports = {
 	secret: process.env.SECRET || 'lakikihdgdfdjjjdgd67264660okjnbgtrdxswerfgytg373745ei8336%%^#%gdvdhj????jjhdghduue',
 	mongoURL: process.env.MONGOLAB_URL || 'mongodb://192.168.99.100/snipe',
     noFrontendCaching: process.env.NO_CACHE || 'no',
+    frontendCacheExpiry: process.env.FRONTEND_CACHE_EXPIRY || '90',
+    backendCacheExpiry: process.env.BACKEND_CACHE_EXPIRY || '90',
     rateLimit: process.env.RATE_LIMIT || '1800',
     rateLimitExpiry: process.env.RATE_LIMIT_EXPIRY || '3600000',
     redisURL: process.env.REDIS_URL || 'redis://192.168.99.100:6379/1',
     letsencryptSSLVerificationURL: process.env.LETSENCRYPT_VERIFICATION_URL || '/.well-known/acme-challenge/xvArhQBSilF4V30dGUagNAZ96ASipB0b0ex0kXn0za8',
     letsencryptSSLVerificationBody: process.env.LETSENCRYPT_VERIFICATION_BODY || 'xvArhQBSilF4V30dGUagNAZ96ASipB0b0ex0kXn0za8._v6aFbaRYWeOmSebtlD-X4Ixf5tPsyULMsXM8HjsK-Q',
     maxContentLength: process.env.MAX_CONTENT_LENGTH || '9999',
-    enforceSSL: process.env.ENFORCE_SSL || 'no'
+    enforceSSL: process.env.ENFORCE_SSL || 'no',
+    gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '6870f32edf6a34aaca7f193f456fae50f8ad5a94',
+    queueUIUsername: process.env.QUEUE_UI_USERNAME || 'admin',
+    queueUIPassword: process.env.QUEUE_UI_PASSWORD || 'password123/',
+    queueUIPort: process.env.QUEUE_UI_PORT || 3000,
+    enforceUserIdAppIdDeveloperId: process.env.ENFORCE_USER_ID_APP_ID_DEVELOPER_ID || 'yes'
 };