BUG: refs #952. Updating legacy password in api call with password param.

Michael Grauer · Michael Grauer · commit 9937d2f085a9 · 2013-03-14T10:41:26.000-04:00
diff --git a/modules/api/controllers/components/ApiComponent.php b/modules/api/controllers/components/ApiComponent.php
@@ -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);
       }

Original file line number	Diff line number	Diff line change
`@@ -2513,6 +2513,10 @@ function userApikeyDefault($args)`
`2513`	`2513`	`$instanceSalt = Zend_Registry::get('configGlobal')->password->prefix;`
`2514`	`2514`	`if($authModule \|\| $userModel->hashExists(hash($userDao->getHashAlg(), $instanceSalt.$userDao->getSalt().$password)))`
`2515`	`2515`	`{`
	`2516`	`+ if($userDao->getSalt() == '')`
	`2517`	`+ {`
	`2518`	`+ $passwordHash = $userModel->convertLegacyPasswordHash($userDao, $password);`
	`2519`	`+ }`
`2516`	`2520`	`$defaultApiKey = $userApiModel->getByAppAndEmail('Default', $email)->getApikey();`
`2517`	`2521`	`return array('apikey' => $defaultApiKey);`
`2518`	`2522`	`}`