From 6fa54e5204573d7a4392280dcff9e98d908fe5c8 Mon Sep 17 00:00:00 2001 From: David Luecke Date: Mon, 2 May 2016 21:43:46 -0700 Subject: [PATCH 01/11] Set rejectUnauthorized explicitly (#321) --- test/application.test.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/application.test.js b/test/application.test.js index 0048e867c7..d8af9d15fb 100644 --- a/test/application.test.js +++ b/test/application.test.js @@ -203,7 +203,11 @@ describe('Feathers application', () => { app.setup(httpsServer); httpsServer.on('listening', function () { - const socket = io('https://localhost:7889', { secure: true, port: 7889 }); + const socket = io('https://localhost:7889', { + secure: true, + port: 7889, + rejectUnauthorized: false + }); request({ url: 'https://localhost:7889/secureTodos/dishes', From 99a56fb62570f1d7fb89cccc6ff4df404fe10674 Mon Sep 17 00:00:00 2001 From: Greenkeeper Date: Wed, 4 May 2016 04:46:34 +0200 Subject: [PATCH 02/11] chore(package): update socket.io-client to version 1.4.6 (#322) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6934b6bc23..a02570653d 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "nsp": "^2.2.0", "q": "^1.0.1", "request": "^2.x", - "socket.io-client": "^1.0.0" + "socket.io-client": "^1.4.6" }, "browser": { "./lib/index": "./lib/client/index" From 7e3ca8b610261d1d311438ab1051ddef29832092 Mon Sep 17 00:00:00 2001 From: Greenkeeper Date: Fri, 6 May 2016 17:15:01 +0200 Subject: [PATCH 03/11] chore(package): update babel-plugin-add-module-exports to version 0.2.0 (#326) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a02570653d..4c77da18f3 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "devDependencies": { "babel-cli": "^6.3.17", "babel-core": "^6.3.26", - "babel-plugin-add-module-exports": "^0.1.2", + "babel-plugin-add-module-exports": "^0.2.0", "babel-preset-es2015": "^6.3.13", "body-parser": "^1.13.2", "feathers-rest": "^1.1.0", From 34c43d53ab85c2e6bfb956370e4d867785da787a Mon Sep 17 00:00:00 2001 From: Greenkeeper Date: Mon, 23 May 2016 17:48:25 +0200 Subject: [PATCH 04/11] chore(package): update mocha to version 2.5.0 (#338) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c77da18f3..2ebb2f2394 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "feathers-socketio": "^1.1.0", "istanbul": "^0.4.0", "jshint": "^2.6.3", - "mocha": "^2.2.0", + "mocha": "^2.5.0", "nsp": "^2.2.0", "q": "^1.0.1", "request": "^2.x", From 56eedfa156f3b66b0a587f59ad23f929606a49bd Mon Sep 17 00:00:00 2001 From: Eric Kryski Date: Mon, 23 May 2016 14:48:05 -0600 Subject: [PATCH 05/11] Adding security section --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index 0629d7a66a..05afe228a9 100644 --- a/readme.md +++ b/readme.md @@ -73,6 +73,10 @@ The [Feathers docs](http://docs.feathersjs.com) are loaded with awesome stuff an Each plugin has it's own minimal example in the repo. To see some more complex examples go to [feathersjs/feathers-demos](https://github.com/feathersjs/feathers-demos). +## Security + +We :heart: the community and take security very seriously. No one wants their app hacked. If you have come across a security concern please [report it responsibly](http://docs.feathersjs.com/SECURITY.html#where-should-i-report-security-issues). Visit the [Security section](http://docs.feathersjs.com/SECURITY.html) of the docs to learn more about how you can make sure your app is secure. + ## License [MIT](LICENSE) From 44b2731d906f5298cd6262197492d3e154fe71b3 Mon Sep 17 00:00:00 2001 From: Eric Kryski Date: Wed, 27 Jul 2016 14:59:19 -0600 Subject: [PATCH 06/11] Removing old references to IRC and gitter. --- contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing.md b/contributing.md index 1e594b134f..dc0a0f7d04 100644 --- a/contributing.md +++ b/contributing.md @@ -4,9 +4,9 @@ Thank you for contributing to Feathers! ## Report a bug -Issues can be reported in the [issue tracker](https://github.com/feathersjs/feathers/issues) or the [Gitter chat](https://gitter.im/feathersjs/feathers). +Issues can be reported in the [issue tracker](https://github.com/feathersjs/feathers/issues). -If you have any other questions, feel free to submit post them on [Stackoverflow](http://stackoverflow.com) using the `feathers` or `feathersjs` tag or join [#feathersjs](http://webchat.freenode.net/?channels=feathersjs) on Freenode IRC. +If you have any other questions, feel free to submit post them on [Stackoverflow](http://stackoverflow.com) using the `feathers` or `feathersjs` tag or join our [slack channel](http://slack.feathersks.com). ## Code style From 0b6cc2a647c75a66b83ab2d4f1ca1b50e2dd1612 Mon Sep 17 00:00:00 2001 From: Michael Ermer Date: Thu, 28 Jul 2016 17:33:26 +0200 Subject: [PATCH 07/11] Update contributing.md (#370) Working slack link. --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing.md b/contributing.md index dc0a0f7d04..379fdaa257 100644 --- a/contributing.md +++ b/contributing.md @@ -6,7 +6,7 @@ Thank you for contributing to Feathers! Issues can be reported in the [issue tracker](https://github.com/feathersjs/feathers/issues). -If you have any other questions, feel free to submit post them on [Stackoverflow](http://stackoverflow.com) using the `feathers` or `feathersjs` tag or join our [slack channel](http://slack.feathersks.com). +If you have any other questions, feel free to submit post them on [Stackoverflow](http://stackoverflow.com) using the `feathers` or `feathersjs` tag or join our [slack channel](http://slack.feathersjs.com). ## Code style From 8ab32dc7b8a77a4dfcb121701d1d8733b771019d Mon Sep 17 00:00:00 2001 From: Greenkeeper Date: Mon, 1 Aug 2016 19:03:21 +0200 Subject: [PATCH 08/11] chore(package): update mocha to version 3.0.0 (#375) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ebb2f2394..716a357863 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "feathers-socketio": "^1.1.0", "istanbul": "^0.4.0", "jshint": "^2.6.3", - "mocha": "^2.5.0", + "mocha": "^3.0.0", "nsp": "^2.2.0", "q": "^1.0.1", "request": "^2.x", From 121ed861987620e98d926b1f9ec3a8c1c4300fe1 Mon Sep 17 00:00:00 2001 From: David Luecke Date: Wed, 14 Sep 2016 19:27:57 -0700 Subject: [PATCH 09/11] Move route parameter test to feathers-rest (https://github.com/feathersjs/feathers-rest/pull/74) --- test/application.test.js | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/test/application.test.js b/test/application.test.js index d8af9d15fb..2bc5feb5e1 100644 --- a/test/application.test.js +++ b/test/application.test.js @@ -255,34 +255,6 @@ describe('Feathers application', () => { }); }); - it('Extend params with route params. (#76)', done => { - const todoService = { - get(id, params) { - return Promise.resolve({ - id, - appId: params.appId - }); - } - }; - - const app = feathers() - .configure(rest()) - .use('/:appId/todo', todoService); - - const expected = { - id: 'dishes', - appId: 'theApp' - }; - - const server = app.listen(6880).on('listening', function () { - request('http://localhost:6880/theApp/todo/' + expected.id, (error, response, body) => { - assert.ok(response.statusCode === 200, 'Got OK status code'); - assert.deepEqual(expected, JSON.parse(body)); - server.close(done); - }); - }); - }); - it('Calls _setup in order to set up custom routes with higher priority. (#86)', done => { const todoService = { get(name) { From fada2224e173199f599d92985224cef8ce3d5259 Mon Sep 17 00:00:00 2001 From: Kaique Silva Date: Wed, 14 Sep 2016 23:31:26 -0300 Subject: [PATCH 10/11] Create an app reference on hook object (#406) * Create an app reference on hook object * Test of hook.app included on the event scenario --- src/mixins/event.js | 2 ++ test/mixins/event.test.js | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/mixins/event.js b/src/mixins/event.js index 066e14a5e4..3dede8e681 100644 --- a/src/mixins/event.js +++ b/src/mixins/event.js @@ -15,6 +15,7 @@ function upperCase(name) { } export default function(service) { + const app = this; const isEmitter = typeof service.on === 'function' && typeof service.emit === 'function'; const emitter = service._rubberDuck = rubberduck.emitter(service); @@ -47,6 +48,7 @@ export default function(service) { const hook = hookObject(method, 'after', args); const data = Array.isArray(results[1]) ? results[1] : [ results[1] ]; + hook.app = app; data.forEach(current => service.emit(event, current, hook)); } else { service.emit('serviceError', results[0]); diff --git a/test/mixins/event.test.js b/test/mixins/event.test.js index be80cb76c9..d26b50b0e1 100644 --- a/test/mixins/event.test.js +++ b/test/mixins/event.test.js @@ -209,4 +209,29 @@ describe('Event mixin', () => { instance.emit('created', { custom: 'event' }); }); }); + + it('sets hook.app', done => { + const FixtureService = Proto.extend({ + update(id, data, params, cb) { + setTimeout(function () { + cb(null, { + id: id, + name: data.name + }); + }, 20); + } + }); + + const instance = create.call(FixtureService); + const dummyApp = { isApp: true }; + + mixinEvent.call(dummyApp, instance); + + instance.on('updated', function (data, hook) { + assert.deepEqual(hook.app, dummyApp); + done(); + }); + + instance.update(12, { name: 'Updated tester' }, {}, function () {}); + }); }); From b517f2ec34235e5c44bd21b715fcc90e2e7ac7ef Mon Sep 17 00:00:00 2001 From: David Luecke Date: Wed, 14 Sep 2016 19:43:44 -0700 Subject: [PATCH 11/11] 2.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 716a357863..711cef464e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "feathers", "description": "Build Better APIs, Faster than Ever.", - "version": "2.0.1", + "version": "2.0.2", "homepage": "http://feathersjs.com", "repository": { "type": "git",