Merge branch 'develop'

_index.js

@@ -192,6 +192,8 @@ function run(serviceStartCb) {
 			});
 
 			service.post("/token", (req, res, next) => {
+				req.body = req.body || {};
+				req.body.grant_type = req.soajs.inputmaskData.grant_type;
 				let allowed = true;
 				if (req.soajs.servicesConfig.oauth && req.soajs.servicesConfig.oauth.local) {
 					let local = req.soajs.servicesConfig.oauth.local;
@@ -241,6 +243,7 @@ function run(serviceStartCb) {
 				// we should add authorization to be able to generate a new access token
 				//      or set req.body.client_id, req.body.client_secret instead
 				req.body = req.body || {};
+				req.body.grant_type = req.soajs.inputmaskData.grant_type;
 				req.body.username = "NA";
 				req.body.password = "NA";
 				if (req.query.access_token) {

config.js

@@ -307,7 +307,8 @@ module.exports = {
 				},
 				"grant_type": {
 					"source": ['body.grant_type'],
-					"required": true,
+					"required": false,
+					"default": "password",
 					"validation": {
 						"type": "string",
 						"enum": ["refresh_token", "password"]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.oauth",
   "description": "soajs oauth service",
-  "version": "3.0.37",
+  "version": "3.0.38",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"

test/integration/index/post/createAccessTokenPin.test.js

@@ -159,7 +159,7 @@ describe("Testing create access token with pin API", () => {
 		requester('/pin', 'post', params, (error, body) => {
 			assert.ok(body);
 			assert.ok(body.errors);
-			assert.deepEqual(body.errors.details, [{code: 172, message: 'Missing required field: grant_type'}]);
+			// assert.deepEqual(body.errors.details, [{code: 172, message: 'Missing required field: grant_type'}]);
 			done();
 		});
 	});