Merge pull request #68 from agco/feature/multi-sse-route-must-be-regi…

…stered-manually Multi SSE route must be registered manually so that user can customiz…
agco · Apr 8, 2016 · 81cd5d9 · 81cd5d9
2 parents 3b56cac + 9375cd5
commit 81cd5d9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -33,17 +33,7 @@ exports.register = function (server, opts, next) {
 
     Promise.all(_.map(adapters, (adapter)=>adapter.connect()))
         .then(()=> {
-
-            if (adapterSSE) {
-                server.route({
-                    method: 'get',
-                    path: '/changes/streaming',
-                    handler: sse({
-                        context: server
-                    })
-                })
-            }
-
+
             const schemas = {};
 
             const appendLinkedResources = includes(server, adapter, schemas).appendLinkedResources;
@@ -98,8 +88,15 @@ exports.register = function (server, opts, next) {
             }
 
             const getChangesStreaming = function (schema) {
-                onRouteRegister(schema)
                 Hoek.assert(adapterSSE, 'getChangesStreaming can not be invoked, adapterSSE is not set')
+                if (schema == null) {
+                    return _.merge(routes.getChangesStreaming(schema), {
+                        handler: sse({
+                            context: server
+                        })
+                    })
+                }
+                onRouteRegister(schema)
                 return _.merge(routes.getChangesStreaming(schema), {
                     handler: sse({
                         context: server,

diff --git a/lib/routes.js b/lib/routes.js
@@ -98,6 +98,18 @@ module.exports = function () {
     }
 
     const getChangesStreaming = function (schema) {
+        if (schema == null) {
+            return {
+                method: 'get',
+                path: '/changes/streaming',
+                config: {
+                    tags: ['api'],
+                    validate: {
+                        query: schemaUtils.toJoiGetMultiSSEQueryValidation()
+                    }
+                }
+            }
+        }
         return {
             method: 'GET',
             path: `/${schema.type}/changes/streaming`,

diff --git a/lib/utils/schema.js b/lib/utils/schema.js
@@ -98,11 +98,17 @@ module.exports = function () {
         return {id}
     }
 
+    const toJoiGetMultiSSEQueryValidation = function () {
+        const resources = Joi.string().required()
+        return {resources}
+    }
+
     return {
         toJoiPostValidatation,
         toJoiPostRelationshipsValidatation,
         toJoiGetQueryValidation,
         toJoiGetByIdPathValidation,
-        toJoiPatchRelationshipsValidatation
+        toJoiPatchRelationshipsValidatation,
+        toJoiGetMultiSSEQueryValidation
     }
 }
diff --git a/test/sse.spec.js b/test/sse.spec.js
@@ -429,7 +429,7 @@ describe('SSE', function () {
                     url: '/changes/streaming'
                 }).then(function (res) {
                     expect(res).to.have.property('statusCode', 400)
-                    const expectedMessage = 'You have not specified any resources, please do so by providing "resource?foo,bar" as query'
+                    const expectedMessage = 'child "resources" fails because ["resources" is required]'
                     expect(res.result.errors[0]).to.have.property('message', expectedMessage)
                 })
             })

diff --git a/test/utils.js b/test/utils.js
@@ -41,6 +41,7 @@ var utils = {
                         const routes = harvester.routes.all(schema)
                         _.forEach(routes, (route) => server.route(route))
                     });
+                    server.route(harvester.routes.getChangesStreaming())
                     resolve({server, harvester})
                 })
             })