Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
BUG: refs #952. Updating legacy password in api call with password pa…
Browse files Browse the repository at this point in the history
…ram.
  • Loading branch information
Michael Grauer committed Mar 14, 2013
1 parent ba276b5 commit 9937d2f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions modules/api/controllers/components/ApiComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -2513,6 +2513,10 @@ function userApikeyDefault($args)
$instanceSalt = Zend_Registry::get('configGlobal')->password->prefix;
if($authModule || $userModel->hashExists(hash($userDao->getHashAlg(), $instanceSalt.$userDao->getSalt().$password)))
{
if($userDao->getSalt() == '')
{
$passwordHash = $userModel->convertLegacyPasswordHash($userDao, $password);
}
$defaultApiKey = $userApiModel->getByAppAndEmail('Default', $email)->getApikey();
return array('apikey' => $defaultApiKey);
}
Expand Down

0 comments on commit 9937d2f

Please sign in to comment.