meadow-endpoints 2.0.17 → 2.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow-endpoints",
-  "version": "2.0.17",
+  "version": "2.0.20",
   "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/Meadow-Endpoints.js

@@ -418,6 +418,17 @@ var MeadowEndpoints = function()
 			return fCallback();
 		};
 
+		var _InvokeSetupCallback;
+		var getInvokeSetupCallback = function()
+		{
+			return _InvokeSetupCallback;
+		};
+
+		var setInvokeSetupCallback = function(fCallback)
+		{
+			_InvokeSetupCallback = fCallback;
+		};
+
 		/**
 		* Invoke a meadow endpoint programmatically
 		*
@@ -470,6 +481,10 @@ var MeadowEndpoints = function()
 					//internal invoke mark as authenticated (because this is not called via webservice)
 					pRequest.EndpointAuthenticated = true;
 
+					if (_InvokeSetupCallback && typeof(_InvokeSetupCallback) == 'function')
+					{
+						_InvokeSetupCallback(pRequest, pResponse, typeof(pOptions) === 'object' && pOptions);
+					}
 					return fStageComplete();
 				},
 				function(fStageComplete)
@@ -514,6 +529,8 @@ var MeadowEndpoints = function()
 			// Expose the DAL
 			DAL: _Meadow,
 
+			getInvokeSetupCallback: getInvokeSetupCallback,
+			setInvokeSetupCallback: setInvokeSetupCallback,
 			invokeEndpoint: invokeEndpoint,
 
 			// Factory

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

@@ -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

@@ -1156,8 +1156,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();
 							}
 						);
@@ -1538,6 +1537,35 @@ suite
 			{
 				var tmpCreatedRecordGUID;
 
+				test
+				(
+					'invoke: setup method is called',
+					function(fDone)
+					{
+						_MockSessionValidUser.UserRoleIndex = 2;
+						let setupCallCount = 0;
+						let passedRequest, passedResponse, passedOriginalRequest;
+						_MeadowEndpoints.setInvokeSetupCallback((req, res, origReq) =>
+						{
+							++setupCallCount;
+							passedRequest = req;
+							passedResponse = res;
+							passedOriginalRequest = origReq;
+						});
+						const originalRequest = {UserSession: _MockSessionValidUser};
+						_MeadowEndpoints.invokeEndpoint('Read', {IDRecord: 2}, originalRequest,
+							function(pError, pResponse)
+							{
+								Expect(setupCallCount).to.equal(1);
+								Expect(passedOriginalRequest).to.equal(originalRequest);
+								Expect(passedRequest).to.be.an('object');
+								Expect(passedResponse).to.be.an('object');
+
+								fDone();
+							}
+						);
+					}
+				);
 				test
 				(
 					'invoke create: create a record',