Merged in paulis/processmaker/PM-2795 (pull request #2238)

PM-2795: al autentificarse con REST no verifica contra el LdapAdvanced
2015-05-22 11:47:11 -04:00
parent 8fdcabed56 b55eb92644
commit 31cf89ca70
1 changed files with 8 additions and 2 deletions
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -190,8 +190,14 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
    /* OAuth2_Storage_UserCredentialsInterface */
    public function checkUserCredentials($username, $password)
    {
-        if ($user = $this->getUser($username)) {
-            return $this->checkPassword($user, $password);
+        $RBAC = \RBAC::getSingleton();
+        $RBAC->initRBAC();
+        $uid = $RBAC->VerifyLogin($username , $password);
+        if($uid < 0){
+           return false;
+        }
+        if($uid != ''){
+           return true;
        }
        return false;
    }