diff --git a/app.js b/app.js index e520d5b383..73b9528d9e 100644 --- a/app.js +++ b/app.js @@ -1,16 +1,17 @@ -var express = require('express'), - bodyParser = require('body-parser'), - log4js = require('log4js'), - logger = require('./lib/logger'), - routes = require('./lib/routes'), - eventApi = require('./lib/eventApi'), - featureApi = require('./lib/featureApi'), +var express = require('express'), + bodyParser = require('body-parser'), + cookieParser = require('cookie-parser'), + log4js = require('log4js'), + logger = require('./lib/logger'), + routes = require('./lib/routes'), + eventApi = require('./lib/eventApi'), + featureApi = require('./lib/featureApi'), featureArchiveApi = require('./lib/featureArchiveApi'), - strategyApi = require('./lib/strategyApi'), - validator = require('express-validator'), - app = express(), - router = express.Router(), - baseUriPath = process.env.BASE_URI_PATH || ''; + strategyApi = require('./lib/strategyApi'), + validator = require('express-validator'), + app = express(), + router = express.Router(), + baseUriPath = process.env.BASE_URI_PATH || ''; if(app.get('env') === 'development') { app.use(require('errorhandler')()); @@ -38,6 +39,8 @@ app.set('port', process.env.HTTP_PORT || process.env.PORT || 4242); app.use(baseUriPath, express.static(__dirname + '/public')); app.use(bodyParser.json({strict: false})); +app.use(cookieParser()); + eventApi(router); featureApi(router); featureArchiveApi(router); @@ -45,4 +48,4 @@ strategyApi(router); routes(router); app.use(baseUriPath, router); -module.exports = app; \ No newline at end of file +module.exports = app; diff --git a/lib/extractUser.js b/lib/extractUser.js new file mode 100644 index 0000000000..2da29b954e --- /dev/null +++ b/lib/extractUser.js @@ -0,0 +1,4 @@ +function extractUsername(req) { + return req.cookies.username || "unknown"; +} +module.exports = extractUsername; diff --git a/lib/featureApi.js b/lib/featureApi.js index 61ff4cfc1d..1593817699 100644 --- a/lib/featureApi.js +++ b/lib/featureApi.js @@ -7,6 +7,7 @@ var NameExistsError = require('./error/NameExistsError'); var NotFoundError = require('./error/NotFoundError'); var ValidationError = require('./error/ValidationError'); var validateRequest = require('./error/validateRequest'); +var extractUser = require('./extractUser'); module.exports = function (app) { @@ -33,7 +34,7 @@ module.exports = function (app) { .then(function() { return eventStore.create({ type: eventType.featureCreated, - createdBy: req.connection.remoteAddress, + createdBy: extractUser(req), data: req.body }); }) @@ -56,7 +57,7 @@ module.exports = function (app) { app.put('/features/:featureName', function (req, res) { var featureName = req.params.featureName; - var userName = req.connection.remoteAddress; + var userName = extractUser(req); var updatedFeature = req.body; updatedFeature.name = featureName; @@ -83,7 +84,7 @@ module.exports = function (app) { app.delete('/features/:featureName', function (req, res) { var featureName = req.params.featureName; - var userName = req.connection.remoteAddress; + var userName = extractUser(req); featureDb.getFeature(featureName) .then(function () { @@ -118,4 +119,3 @@ module.exports = function (app) { }); } }; - diff --git a/lib/strategyApi.js b/lib/strategyApi.js index 3b11e82ed8..a5ebb8fac0 100644 --- a/lib/strategyApi.js +++ b/lib/strategyApi.js @@ -5,7 +5,8 @@ var strategyDb = require('./strategyDb'); var logger = require('./logger'); var NameExistsError = require('./error/NameExistsError'); var ValidationError = require('./error/ValidationError'); -var validateRequest = require('./error/validateRequest'); +var validateRequest = require('./error/validateRequest'); +var extractUser = require('./extractUser'); module.exports = function (app) { @@ -24,7 +25,7 @@ module.exports = function (app) { app.delete('/strategies/:name', function (req, res) { eventStore.create({ type: eventType.strategyDeleted, - createdBy: req.connection.remoteAddress, + createdBy: extractUser(req), data: { name: req.params.name } @@ -44,7 +45,7 @@ module.exports = function (app) { .then(function() { return eventStore.create({ type: eventType.strategyCreated, - createdBy: req.connection.remoteAddress, + createdBy: extractUser(req), data: newStrategy }); }) @@ -75,4 +76,3 @@ module.exports = function (app) { } }; - diff --git a/package.json b/package.json index c24c85d044..7d4fb9c1de 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "dependencies": { "bluebird": "2.6.2", "body-parser": "1.10.1", + "cookie-parser": "^1.3.3", "db-migrate": "0.7.1", "deep-diff": "^0.3.0", "errorhandler": "1.3.2", diff --git a/public/js/app.jsx b/public/js/app.jsx index 3c9f8253da..22a8ea2ee3 100644 --- a/public/js/app.jsx +++ b/public/js/app.jsx @@ -1,11 +1,14 @@ var React = require('react'); var TabView = require('./components/TabView'); var Menu = require('./components/Menu'); +var UserStore = require('./stores/UserStore'); var LogEntriesComponent = React.createFactory(require('./components/log/LogEntriesComponent')); var FeatureTogglesComponent = React.createFactory(require('./components/feature/FeatureTogglesComponent')); var StrategiesComponent = React.createFactory(require('./components/strategy/StrategiesComponent')); var ArchiveFeatureComponent = React.createFactory(require('./components/feature/ArchiveFeatureComponent')); +UserStore.init(); + var tabPanes = [ { name: 'Feature Toggles', @@ -40,4 +43,4 @@ React.render( , document.getElementById('content') -); \ No newline at end of file +); diff --git a/public/js/components/Menu.jsx b/public/js/components/Menu.jsx index 1015009110..b42b4dbd10 100644 --- a/public/js/components/Menu.jsx +++ b/public/js/components/Menu.jsx @@ -1,10 +1,14 @@ var React = require('react'); +var User = require('./User'); var Menu = React.createClass({ render: function() { return (
+
+ +
@@ -54,4 +58,4 @@ var Menu = React.createClass({ } }); -module.exports = Menu; \ No newline at end of file +module.exports = Menu; diff --git a/public/js/components/User.jsx b/public/js/components/User.jsx new file mode 100644 index 0000000000..715bae4ed0 --- /dev/null +++ b/public/js/components/User.jsx @@ -0,0 +1,23 @@ +var React = require('react'); +var UserStore = require('../stores/UserStore'); + +var User = React.createClass({ + + onSave: function() { + var value = this.refs.username.getDOMNode().value.trim(); + UserStore.set(value); + }, + + render: function() { + return ( +
+ +
+ ); + } +}); + +module.exports = User; diff --git a/public/js/stores/UserStore.js b/public/js/stores/UserStore.js new file mode 100644 index 0000000000..93421e2660 --- /dev/null +++ b/public/js/stores/UserStore.js @@ -0,0 +1,34 @@ +var _username; + +//Ref: http://stackoverflow.com/questions/10730362/get-cookie-by-name +function readCookie(name) { + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + for(var i=0;i < ca.length;i++) { + var c = ca[i]; + while (c.charAt(0)==' ') { + c = c.substring(1,c.length); + } + if (c.indexOf(nameEQ) === 0) { + return c.substring(nameEQ.length,c.length); + } + } + return null; +} + +var UserStore = { + init: function init() { + _username = readCookie("username"); + }, + + set: function set(username) { + _username=username; + document.cookie="username="+_username+"; expires=Thu, 18 Dec 2099 12:00:00 UTC"; + }, + + get: function get() { + return _username; + } +}; + +module.exports = UserStore; diff --git a/test/featureApiSpec.js b/test/featureApiSpec.js index d93acee57c..c8fb88e0e7 100644 --- a/test/featureApiSpec.js +++ b/test/featureApiSpec.js @@ -36,6 +36,22 @@ describe('The features api', function () { .expect(201, done); }); + it('creates new feature toggle with createdBy', function (done) { + request + .post('/features') + .send({name: 'com.test.Username', enabled: false}) + .set('Cookie', ['username=ivaosthu']) + .set('Content-Type', 'application/json') + .end(function(){ + request + .get('/events') + .end(function (err, res) { + assert.equal(res.body.events[0].createdBy, 'ivaosthu'); + done(); + }); + }); + }); + it('require new feature toggle to have a name', function (done) { request .post('/features') @@ -72,4 +88,4 @@ describe('The features api', function () { .expect(404, done); }); -}); \ No newline at end of file +});