Expanded the hasId function to include the ability to not check for o…

…ptional Ids
MKHenson · May 17, 2016 · 7804994 · 7804994
1 parent 4c8022c
commit 7804994
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/server/dist/src/permission-controllers.js b/server/dist/src/permission-controllers.js
@@ -37,18 +37,19 @@ exports.getUser = getUser;
 * Checks for an id parameter and that its a valid mongodb ID. Returns an error of type IResponse if no ID is detected, or its invalid
 * @param {string} idName The name of the ID to check for
 * @param {string} rejectName The textual name of the ID when its rejected
+* @param {boolean} optional If true, then an error wont be thrown if it doesnt exist
 */
-function hasId(idName, rejectName) {
+function hasId(idName, rejectName, optional = false) {
     return function (req, res, next) {
         // Make sure the id
-        if (!req.params[idName]) {
+        if (!req.params[idName] && !optional) {
             res.setHeader('Content-Type', 'application/json');
             return res.end(JSON.stringify({
                 error: true,
                 message: "Please specify an " + idName
             }));
         }
-        else if (!mongodb.ObjectID.isValid(req.params[idName])) {
+        else if (req.params[idName] && !mongodb.ObjectID.isValid(req.params[idName])) {
             res.setHeader('Content-Type', 'application/json');
             return res.end(JSON.stringify({
                 error: true,

diff --git a/server/src/permission-controllers.ts b/server/src/permission-controllers.ts
@@ -50,13 +50,14 @@ export function getUser(req: express.Request, res: express.Response, next: Funct
 * Checks for an id parameter and that its a valid mongodb ID. Returns an error of type IResponse if no ID is detected, or its invalid
 * @param {string} idName The name of the ID to check for
 * @param {string} rejectName The textual name of the ID when its rejected
+* @param {boolean} optional If true, then an error wont be thrown if it doesnt exist
 */
-export function hasId( idName : string, rejectName : string )
+export function hasId( idName : string, rejectName : string, optional: boolean = false )
 {
     return function( req: express.Request, res: express.Response, next: Function )
     {
         // Make sure the id
-        if (!req.params[idName])
+        if (!req.params[idName] && !optional)
         {
             res.setHeader( 'Content-Type', 'application/json');
             return res.end(JSON.stringify(<IResponse>{
@@ -65,7 +66,7 @@ export function hasId( idName : string, rejectName : string )
             }));
         }
         // Make sure the id format is correct
-        else if ( !mongodb.ObjectID.isValid(req.params[idName]))
+        else if ( req.params[idName] && !mongodb.ObjectID.isValid(req.params[idName]))
         {
             res.setHeader( 'Content-Type', 'application/json');
             return res.end(JSON.stringify(<IResponse>{