Fix Iot Agent Oauth Client

Author: apozohue10

lib/grant-types/password-grant-type.js

@@ -62,7 +62,7 @@ PasswordGrantType.prototype.handle = function(request, client) {
 
   return Promise.bind(this)
     .then(function() {
-      return this.getUser(request);
+      return this.getUser(request, client.id);
     })
     .then(function(user) {
       return this.saveToken(user, client, scope);
@@ -73,7 +73,7 @@ PasswordGrantType.prototype.handle = function(request, client) {
  * Get user using a username/password combination.
  */
 
-PasswordGrantType.prototype.getUser = function(request) {
+PasswordGrantType.prototype.getUser = function(request, oauth_client_id) {
   debug("======PasswordGrantType: getUser======")
   if (!request.body.username) {
     throw new InvalidRequestError('Missing parameter: `username`');
@@ -90,12 +90,8 @@ PasswordGrantType.prototype.getUser = function(request) {
   if (!is.uchar(request.body.password)) {
     throw new InvalidRequestError('Invalid parameter: `password`');
   }
-  /*var model = this.model.getUser;
-  if (request.body.username.includes('iot_sensor_')) {
-    model = this.model.getIotSensor;
-  }*/
 
-  return promisify(this.model.getIdentity, 2).call(this.model, request.body.username, request.body.password)
+  return promisify(this.model.getIdentity, 3).call(this.model, request.body.username, request.body.password, oauth_client_id)
     .then(function(user) {
       if (!user) {
         throw new InvalidGrantError('Invalid grant: user credentials are invalid');