#1912

src/client/ui/templates/quests/quests.js

@@ -86,7 +86,9 @@ define([
 				data: {
 					cpn: 'quests',
 					method: 'complete',
-					data: quest.id
+					data: {
+						questId: quest.id
+					}
 				}
 			});
 		},

src/server/clientComponents/gatherer.js

@@ -61,7 +61,8 @@ define([
 				method: 'performAction',
 				data: {
 					cpn: 'gatherer',
-					method: 'gather'
+					method: 'gather',
+					data: {}
 				}
 			});
 		},

src/server/components/gatherer.js

@@ -271,9 +271,11 @@ module.exports = {
 		obj.syncer.setArray(true, 'serverActions', action, {
 			key: 'u',
 			action: {
-				targetId: obj.id,
 				cpn: 'gatherer',
-				method: 'gather'
+				method: 'gather',
+				data: {
+					targetId: obj.id
+				}
 			}
 		});
 	},

src/server/components/quests.js

@@ -35,8 +35,8 @@ module.exports = {
 		return true;
 	},
 
-	complete: function (id) {
-		let quest = this.quests.find(q => q.id === id);
+	complete: function ({ questId }) {
+		let quest = this.quests.find(q => q.id === questId);
 		if ((!quest) || (!quest.isReady))
 			return;
 

src/server/security/router.js

@@ -58,6 +58,8 @@ module.exports = {
 				return dataType !== typeof(value);
 			else if (dataType === 'numberOrString')
 				return (typeof(value) !== 'string' && !Number.isFinite(value));
+			else if (dataType === 'integerOrString')
+				return (typeof(value) !== 'string' && !Number.isInteger(value));
 			else if (dataType === 'integer')
 				return !Number.isInteger(value);
 			else if (dataType === 'integerNullOrPosition')

src/server/security/routerConfig.js

@@ -199,7 +199,8 @@ const routerConfig = {
 						},
 						{
 							key: 'type',
-							dataType: 'string'
+							dataType: 'string',
+							optional: true
 						},
 						{
 							key: 'subType',
@@ -263,7 +264,7 @@ const routerConfig = {
 					data: [
 						{
 							key: 'target',
-							dataType: 'integer'
+							dataType: 'integerOrString'
 						},
 						{
 							key: 'state',
@@ -275,13 +276,23 @@ const routerConfig = {
 			gatherer: {
 				gather: {
 					callback: false,
-					data: []
+					data: [
+						{
+							key: 'targetId',
+							dataType: 'integer'
+						}
+					]
 				}
 			},
 			quests: {
 				complete: {
 					callback: false,
-					data: []
+					data: [
+						{
+							key: 'questId',
+							dataType: 'integer'
+						}
+					]
 				}
 			},
 			player: {
@@ -568,7 +579,8 @@ const routerConfig = {
 					data: [
 						{
 							key: 'nodeId',
-							dataType: 'integer'
+							dataType: 'integer',
+							optional: true
 						}
 					]
 				}