meadow-endpoints 2.0.18 → 2.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow-endpoints",
-  "version": "2.0.18",
+  "version": "2.0.21",
   "description": "Automatic API endpoints for Meadow data.",
   "main": "source/Meadow-Endpoints.js",
   "scripts": {
@@ -55,7 +55,7 @@
     "async": "2.6.1",
     "JSONStream": "^1.3.5",
     "meadow": "~1.0.32",
-    "meadow-filter": "^1.0.1",
+    "meadow-filter": "^1.0.5",
     "orator": "~2.0.2",
     "underscore": "1.9.1"
   }

package/source/crud/Meadow-Endpoint-Delete.js

@@ -43,7 +43,7 @@ var doAPIDeleteEndpoint = function(pRequest, pResponse, fNext)
 		tmpIDRecord = pRequest.body[pRequest.DAL.defaultIdentifier];
 	}
 	// Although the delete request does allow multiple deletes, we require an identifier.
-	if (tmpIDRecord < 1)
+	if (!parseInt(tmpIDRecord) || tmpIDRecord < 1)
 	{
 		return pRequest.CommonServices.sendError('Record delete failure - a valid record ID is required in the passed-in record.', pRequest, pResponse, fNext);
 	}

package/source/crud/Meadow-Endpoint-Update.js

@@ -41,7 +41,7 @@ var doAPIUpdateEndpoint = function(pRequest, pResponse, fNext)
 				{
 					return pRequest.CommonServices.sendError('Record update failure - a valid record is required.', pRequest, pResponse, fNext);
 				}
-				if (pRequest.body[pRequest.DAL.defaultIdentifier] < 1)
+				if (!parseInt(pRequest.body[pRequest.DAL.defaultIdentifier]) || pRequest.body[pRequest.DAL.defaultIdentifier] < 1)
 				{
 					return pRequest.CommonServices.sendError('Record update failure - a valid record ID is required in the passed-in record.', pRequest, pResponse, fNext);
 				}

package/source/crud/Meadow-Operation-Update.js

@@ -18,7 +18,7 @@ var doUpdate = function(pRecordToModify, pRequest, pResponse, fCallback, pOption
 	pRequest.MeadowOperation = (typeof(pRequest.MeadowOperation) === 'string') ? pRequest.MeadowOperation : 'Update';
 
 	// If there is not a default identifier or cached record, fail
-	if ((pRecordToModify[pRequest.DAL.defaultIdentifier] < 1) && (typeof(pOptionalCachedUpdatingRecord) === 'undefined'))
+	if ((!parseInt(pRecordToModify[pRequest.DAL.defaultIdentifier]) || pRecordToModify[pRequest.DAL.defaultIdentifier] < 1) && (typeof(pOptionalCachedUpdatingRecord) === 'undefined'))
 	{
 		return fCallback('Record update failure - a valid record ID is required in the passed-in record.');
 	}
@@ -60,6 +60,7 @@ var doUpdate = function(pRecordToModify, pRequest, pResponse, fCallback, pOption
 				//send the original record to the Authorizer so it can verify ownership/etc
 				// TODO: Because the authorizer looks in the request for the record, we need to fix this somehow to work asynchronously.
 				pRequest.UpdatingRecord = pRecordToModify;
+				pRequest.OriginalRecord = pOriginalRecord;
 				pRequest.Record = pOriginalRecord;
 
 				pRequest.Authorizers.authorizeRequest('Update', pRequest, function(err)

package/source/crud/Meadow-Operation-Upsert.js

@@ -14,6 +14,7 @@ var libAsync = require('async');
 
 var doCreate = require('./Meadow-Operation-Create.js');
 var doUpdate = require('./Meadow-Operation-Update.js');
+const util = require("util");
 
 var doUpsert = function(pRecordToUpsert, pRequest, pResponse, fCallback)
 {
@@ -92,11 +93,29 @@ var doUpsert = function(pRecordToUpsert, pRequest, pResponse, fCallback)
 		{
 			if (pError)
 			{
-				pRecordToUpsert.Error = 'Error upserting record:'+pError;
+				let errorMessage;
+				// attempt to unwrap the error
+				if (pError instanceof Error) {
+					errorMessage = pError.message;
+				} else if (pError && pError.Message) {
+					errorMessage = pError.Message;
+				} else {
+					errorMessage = pError;
+				}
+
+				pRecordToUpsert.Error = 'Error upserting record: '+errorMessage;
 				pRequest.RecordUpsertError = true;
 				pRequest.RecordUpsertErrorMessage = pError;
 				pRequest.UpsertedRecords.push(pRecordToUpsert);
-				pRequest.CommonServices.log.error('Error upserting record:'+pError, {SessionID:pRequest.UserSession.SessionID, RequestID:pRequest.RequestUUID, RequestURL:pRequest.url, Action:pRequest.DAL.scope+'-'+pRequest.MeadowOperation, Stack: pError.stack }, pRequest);
+				// use nodejs util to pretty print our error message
+				const prettyPrintedError = util.inspect(pError, {
+					maxArrayLength: 10,
+					compact: true,
+					showHidden: true,
+					depth: 3,
+					maxStringLength: 200,
+				});
+				pRequest.CommonServices.log.error('Error upserting record: '+prettyPrintedError, {SessionID:pRequest.UserSession.SessionID, RequestID:pRequest.RequestUUID, RequestURL:pRequest.url, Action:pRequest.DAL.scope+'-'+pRequest.MeadowOperation, Stack: pError.stack }, pRequest);
 			}
 
 			return fCallback();

package/test/MeadowEndpoints_basic_tests.js

@@ -961,6 +961,48 @@ suite
 					}
 				);
 				test
+				(
+					'update: update a record with a missing ID',
+					function(fDone)
+					{
+						// Update animal but don't provide ID
+						var tmpRecord = { Type:'Corgi' };
+						libSuperTest('http://localhost:9080/')
+						.del('1.0/FableTest')
+						.send(tmpRecord)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the count of deleted records.
+								var tmpResult = JSON.parse(pResponse.text);
+								Expect(tmpResult.Error).to.contain('a valid record ID is required');
+								fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'update: update a record with a malformed ID',
+					function(fDone)
+					{
+						// Update animal but don't provide ID
+						var tmpRecord = { IDAnimal: { ID: 3 }, Type:'Corgi' };
+						libSuperTest('http://localhost:9080/')
+						.del('1.0/FableTest')
+						.send(tmpRecord)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the count of deleted records.
+								var tmpResult = JSON.parse(pResponse.text);
+								Expect(tmpResult.Error).to.contain('a valid record ID is required');
+								fDone();
+							}
+						);
+					}
+				);
+				test
 				(
 					'update: update a record',
 					function(fDone)
@@ -1006,7 +1048,28 @@ suite
 				);
 				test
 				(
-					'delete: delete a record with a bad parameter',
+					'delete: delete a record with a missing ID',
+					function(fDone)
+					{
+						// Delete animal but don't provide ID
+						var tmpRecord = { Type: 'Corgi' };
+						libSuperTest('http://localhost:9080/')
+						.del('1.0/FableTest')
+						.send(tmpRecord)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the count of deleted records.
+								var tmpResult = JSON.parse(pResponse.text);
+								Expect(tmpResult.Error).to.contain('a valid record ID is required');
+								fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'delete: delete a record with a bad ID',
 					function(fDone)
 					{
 						// Delete animal 3 ("Red")
@@ -1156,8 +1219,7 @@ suite
 							{
 								// Expect response to be the record we just created.
 								var tmpResult = JSON.parse(pResponse.text);
-								//console.log(JSON.stringify(tmpResult, null, 4))
-								Expect(tmpResult.Valid).to.be.false;
+								Expect(tmpResult.Error).to.equal('Record validate failure - a valid JSON object is required.');
 								fDone();
 							}
 						);