lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW Rest API token is no more reset at each call. We can reset it with

Browse Source 
param reset=1 on login call.
This commit is contained in:
Laurent Destailleur 2016-05-22 15:20:21 +02:00
parent ee3d25d9fa
commit 382df0d8f1
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/api/admin/explorer.php
View File

@ -156,7 +156,7 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain
// Show message // Show message
print '<br>'; print '<br>';
$message=''; $message='';
$url='<a href="'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword" target="_blank">'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword</a>'; $url='<a href="'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword" target="_blank">'.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword[&reset=1]</a>';
$message.=$langs->trans("UrlToGetKeyToUseAPIs").':<br>'; $message.=$langs->trans("UrlToGetKeyToUseAPIs").':<br>';
$message.=img_picto('','object_globe.png').' '.$url; $message.=img_picto('','object_globe.png').' '.$url;
print $message; print $message;

46
htdocs/api/class/api_generic.class.php
View File

@ -43,11 +43,12 @@ class GenericApi extends DolibarrApi
* @param string $login Username * @param string $login Username
* @param string $password User password * @param string $password User password
* @param int $entity User entity * @param int $entity User entity
* @return array Response status and user token * @param int $reset Reset token
* @return array Response status and user token
* *
* @throws RestException * @throws RestException
*/ */
public function login($login, $password, $entity = 0) { public function login($login, $password, $entity=0, $reset=0) {
global $conf, $dolibarr_main_authentication, $dolibarr_auto_user; global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
@ -67,27 +68,40 @@ class GenericApi extends DolibarrApi
throw new RestException(403, 'Access denied'); throw new RestException(403, 'Access denied');
} }
// Generate token for user $token = 'failedtogenerateorgettoken';
$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
$tmpuser=new User($this->db);
// We store API token into database $tmpuser->fetch(0, $login);
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
$sql.= " SET api_key = '".$this->db->escape($token)."'"; // Renew the hash
$sql.= " WHERE login = '".$this->db->escape($login)."'"; if (empty($tmpuser->api_key) || $reset)
dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
$result = $this->db->query($sql);
if (!$result)
{ {
throw new RestException(500, 'Error when updating user :'.$this->db->error_msg); // Generate token for user
$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1);
// We store API token into database
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
$sql.= " SET api_key = '".$this->db->escape($token)."'";
$sql.= " WHERE login = '".$this->db->escape($login)."'";
dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
$result = $this->db->query($sql);
if (!$result)
{
throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
}
} }
else
{
$token = $tmpuser->api_key;
}
//return token //return token
return array( return array(
'success' => array( 'success' => array(
'code' => 200, 'code' => 200,
'token' => $token, 'token' => $token,
'message' => 'Welcome ' . $login 'message' => 'Welcome ' . $login.($reset?' - Token is new':' - Token was generated by a previous call')
) )
); );
} }