Slack Webhooks Refactor

jest.config.js

@@ -9,7 +9,7 @@ module.exports = { // eslint-disable-line import/no-commonjs
     testEnvironment: 'node',
     coverageReporters: [
         'text-summary',
-        'html', 
+        'html',
         'lcov'
     ],
     collectCoverageFrom: [

package.json

@@ -29,52 +29,51 @@
     "test:coveralls": "yarn test --coverage --coverageReporters=text-lcov | coveralls"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
+    "@babel/runtime": "^7.1.5",
     "@slack/client": "^4.8.0",
     "axios": "^0.18.0",
     "blipp": "^3.0.0",
-    "boom": "^7.2.0",
-    "debug": "^3.1.0",
+    "boom": "^7.2.2",
+    "debug": "^4.1.0",
     "dotenv": "^6.0.0",
     "good": "^8.1.1",
     "good-console": "^7.1.0",
     "good-squeeze": "^5.1.0",
-    "hapi": "^17.5.4",
+    "hapi": "^17.7.0",
     "hapi-nosql-mongoose": "^1.0.0",
     "ioredis": "^4.0.0",
-    "joi": "^13.6.0",
+    "joi": "^14.0.4",
     "lodash": "^4.17.10",
-    "mongoose": "^5.2.13",
-    "sequelize": "^4.38.0",
+    "mongoose": "^5.3.10",
+    "sequelize": "^4.41.1",
+    "slack-webhooks-handler": "^1.0.1",
     "sqlite3": "^4.0.2",
     "webpack-merge": "^4.1.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
+    "@babel/cli": "^7.1.5",
+    "@babel/core": "^7.1.5",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/polyfill": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-env": "^7.1.5",
     "@babel/register": "^7.0.0",
     "@types/jest": "^23.3.2",
     "babel-core": "^7.0.0-bridge.0",
+    "babel-jest": "^23.6.0",
     "babel-plugin-module-resolver": "^3.1.1",
-    "commitizen": "^2.10.1",
+    "commitizen": "^3.0.4",
     "coveralls": "^3.0.2",
     "cz-conventional-changelog": "^2.1.0",
     "eslint": "^5.5.0",
     "eslint-import-resolver-alias": "^1.1.1",
     "eslint-import-resolver-babel-module": "^5.0.0-beta.1",
     "eslint-plugin-import": "^2.14.0",
-    "husky": "^1.0.0-rc.13",
+    "husky": "^1.1.3",
     "jest": "^23.6.0",
-    "nodemon": "^1.18.4",
+    "nodemon": "^1.18.6",
     "refs-compiler": "^1.0.0"
   },
-  "resolutions": {
-    "babel-core": "7.0.0-bridge.0"
-  },
   "config": {
     "commitizen": {
       "path": "cz-conventional-changelog"

src/plugins/api/webhooks/controller.js

@@ -2,22 +2,22 @@ import Boom from 'boom';
 
 export default class WebhooksController {
     static async get(request) {
-        const slackService = request.server['service::discovery'].get('slack');
+        const slackService = request.server.discoveryService.get('slack');
 
         return {
             data: slackService.webhookList()
         };
     }
 
-    static async github(request) {
+    static async trigger(request) {
         try {
-            const { headers, payload } = request;
-            const slackService = request.server['service::discovery'].get('slack');
+            const { headers, params, payload } = request;
+            const slackService = request.server.discoveryService.get('slack');
 
             return await slackService
-                .eventFromGithub(headers, payload)
+                .eventFrom(params.type, headers, payload)
                 .send();
-        } 
+        }
         catch (error) {
             return Boom.badRequest(error);
         }

src/plugins/api/webhooks/routes.js

@@ -14,10 +14,10 @@ export default [
 
     {
         method: 'POST',
-        path: `/${prefix}/github`,
+        path: `/${prefix}/{type}`,
         options: {
-            description: 'GitHub Webhook',
-            handler: WebhooksController.github
+            description: 'Webhooks Trigger',
+            handler: WebhooksController.trigger
         }
     }
 ];

src/plugins/services/discovery/index.js

@@ -1,14 +1,16 @@
+import Config from 'Config/';
+
 const name = 'discovery-service';
-const DISCOVERY_SERVICE_MASK = process.env.DISCOVERY_SERVICE_MASK || 'service::';
+const serviceMask = Config.get('services.mask');
 
 export default {
     name,
     register: async server => {
         const getAll = () => {
             const services = Object.keys(server)
-                .filter(key => key.includes(DISCOVERY_SERVICE_MASK))
+                .filter(key => key.includes(serviceMask))
                 .reduce((obj, key) => {
-                    const service = key.replace(DISCOVERY_SERVICE_MASK, '');
+                    const service = key.replace(serviceMask, '');
 
                     obj[service] = server[key];
                     return obj;
@@ -27,6 +29,6 @@ export default {
             return services[service];
         };
 
-        server.decorate('server', `${DISCOVERY_SERVICE_MASK}discovery`, { get, getAll });
+        server.decorate('server', 'discoveryService', { get, getAll });
     }
 };

src/plugins/services/slack/service.js

@@ -1,9 +1,8 @@
-import Webhook from 'Utils/slack/webhook';
-import github from 'Utils/slack/webhooks/github';
+import { Dispatcher, factory } from 'slack-webhooks-handler';
 
 export default class SlackService {
     constructor({ webhook }) {
-        this.webhook = new Webhook(webhook);
+        this.dispatcher = new Dispatcher(webhook);
     }
 
     webhookList() {
@@ -13,13 +12,14 @@ export default class SlackService {
     }
 
     async send() {
-        return await this.webhook.send();
+        return await this.dispatcher.send();
     }
 
-    eventFromGithub(headers, payload) {
-        const { attachments } = github(headers, payload);
+    eventFrom(type, ...params) {
+        const webhook = factory(type);
+        const { attachments } = webhook(...params);
 
-        this.webhook.withAttachments(attachments);
+        this.dispatcher.withAttachments(attachments);
 
         return this;
     }