Add services api type filter to get method

CHANGELOG.md

@@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [unreleased]
 ### Added
 - Send entity operations events to all registered plugins
+- Add type filter to get services api
 ### Changed
+- Allow plugin users to create and get operator users
 ### Fixed
+- Fix role-based permissions in get user api
 ### Removed
 
 ## [1.0.0-alpha.8] - 2018-11-13

lib/api/services.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { omitBy, isUndefined } = require('lodash')
+
 const definition = require('./services.json')
 const { roles } = require('../security/utils')
 const events = require('../events')
@@ -8,7 +10,12 @@ const EVENT_ENTITY = 'service'
 
 const Operations = (service, commands) => ({
   getServices: {
-    handler: (params, body, res) => commands.service.getFiltered()
+    handler: (params, body, res) => {
+      const filter = omitBy({
+        type: params.query.type
+      }, isUndefined)
+      return commands.service.getFiltered(filter)
+    }
   },
   getService: {
     handler: (params, body, res) => commands.service.getById(params.path.id)

lib/api/services.json

@@ -176,6 +176,17 @@
   "paths": {
     "/services": {
       "get": {
+        "parameters": [
+          {
+            "in": "query",
+            "name": "type",
+            "schema": {
+              "type": "string",
+              "enum": ["module", "plugin"]
+            },
+            "description": "Service type"
+          }
+        ],
         "tags": ["service"],
         "summary": "Get services",
         "description": "List services",

test/functional/specs/services-api.specs.js

@@ -242,6 +242,46 @@ test.describe('services api', function () {
     })
   })
 
+  test.describe('get services', () => {
+    test.it('should return all services', () => {
+      return getServices()
+        .then(getResponse => {
+          return Promise.all([
+            test.expect(getResponse.statusCode).to.equal(200),
+            test.expect(getResponse.body.length).to.equal(2)
+          ])
+        })
+    })
+
+    test.it('should return plugin services when filtering by plugin type', () => {
+      return getServices({
+        type: 'plugin'
+      })
+        .then(getResponse => {
+          const service = getResponse.body.find(service => service.type !== 'plugin')
+          return Promise.all([
+            test.expect(getResponse.statusCode).to.equal(200),
+            test.expect(service).to.be.undefined(),
+            test.expect(getResponse.body.length).to.equal(1)
+          ])
+        })
+    })
+
+    test.it('should return module services when filtering by module type', () => {
+      return getServices({
+        type: 'module'
+      })
+        .then(getResponse => {
+          const service = getResponse.body.find(service => service.type !== 'module')
+          return Promise.all([
+            test.expect(getResponse.statusCode).to.equal(200),
+            test.expect(service).to.be.undefined(),
+            test.expect(getResponse.body.length).to.equal(1)
+          ])
+        })
+    })
+  })
+
   test.describe('update service', () => {
     let moduleUserService
 

test/functional/specs/users-api.specs.js

@@ -258,6 +258,35 @@ test.describe('users api', function () {
             })
         })
       })
+
+      test.it('should return users filtering by name', () => {
+        return getUsers({
+          name: newUser.name
+        })
+          .then(getResponse => {
+            const user1 = getResponse.body.find(user => user.name === operatorUser.name)
+            const user2 = getResponse.body.find(user => user.name === newUser.name)
+            return Promise.all([
+              test.expect(user1).to.be.undefined(),
+              test.expect(user2.role).to.equal(newUser.role),
+              test.expect(user2.email).to.equal(newUser.email),
+              test.expect(user2.name).to.equal(newUser.name)
+            ])
+          })
+      })
+
+      test.it('should return users filtering by role', () => {
+        return getUsers({
+          role: 'admin'
+        })
+          .then(getResponse => {
+            const noAdminUser = getResponse.body.find(user => user.role !== 'admin')
+            return Promise.all([
+              test.expect(getResponse.statusCode).to.equal(200),
+              test.expect(noAdminUser).to.be.undefined()
+            ])
+          })
+      })
     })
 
     test.describe('get user', () => {

test/unit/lib/api/services.specs.js

@@ -31,14 +31,30 @@ test.describe('services api', () => {
         const fooResult = 'foo result'
         commandsMocks.stubs.service.getFiltered.resolves(fooResult)
 
-        return operations.getServices.handler()
+        return operations.getServices.handler({query: {}})
           .then((result) => {
             return Promise.all([
               test.expect(result).to.equal(fooResult),
               test.expect(commandsMocks.stubs.service.getFiltered).to.have.been.calledWith()
             ])
           })
       })
+
+      test.it('should pass received query data to get services command', () => {
+        const fooResult = 'foo result'
+        const fooQuery = {
+          type: 'foo-type'
+        }
+        commandsMocks.stubs.service.getFiltered.resolves(fooResult)
+
+        return operations.getServices.handler({query: fooQuery})
+          .then((result) => {
+            return Promise.all([
+              test.expect(result).to.equal(fooResult),
+              test.expect(commandsMocks.stubs.service.getFiltered).to.have.been.calledWith(fooQuery)
+            ])
+          })
+      })
     })
 
     test.describe('getService handler', () => {