Merge pull request #243 from phoenix303/final-fixes

Merging final fixes to the `feature/org-config-final-fixes` branch, not to `dev` for now.

Author: maxceem

migrations/20190129_organization_config.sql

@@ -4,9 +4,9 @@
 --
 CREATE TABLE org_config (
     id bigint NOT NULL,
-    orgId character varying(45) NOT NULL,
-    configName character varying(45) NOT NULL,
-    configValue character varying(512),
+    "orgId" character varying(45) NOT NULL,
+    "configName" character varying(45) NOT NULL,
+    "configValue" character varying(512),
     "deletedAt" timestamp with time zone,
     "createdAt" timestamp with time zone,
     "updatedAt" timestamp with time zone,

package-lock.json

@@ -1,17 +1,30 @@
 /**
  * API to list organization config
  */
+import validate from 'express-validation';
+import Joi from 'joi';
 import { middleware as tcMiddleware } from 'tc-core-library-js';
 import models from '../../models';
 import util from '../../util';
 
 const permissions = tcMiddleware.permissions;
 
+const schema = {
+  query: {
+    filter: Joi.string().required(),
+  },
+};
+
 module.exports = [
+  validate(schema),
   permissions('orgConfig.view'),
   (req, res, next) => {
     // handle filters
     const filters = util.parseQueryFilter(req.query.filter);
+    // Throw error if orgId is not present in filter
+    if (!filters.orgId) {
+      return next(util.buildApiError('Missing filter orgId', 422));
+    }
     if (!util.isValidFilter(filters, ['orgId', 'configName'])) {
       return util.handleError('Invalid filters', null, req, next);
     }