viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cs fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-03-31 20:04:27 +03:00
parent e2814141d4
commit 622b27448f
32 changed files with 359 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
application/Espo/Controllers/User.php
View File

@@ -39,6 +39,7 @@ class User extends \Espo\Core\Controllers\Record
public function actionAcl($params, $data, $request)
{
$userId = $request->get('id');
if (empty($userId)) {
throw new Error();
}
@@ -48,6 +49,7 @@ class User extends \Espo\Core\Controllers\Record
}
$user = $this->getEntityManager()->getEntity('User', $userId);
if (empty($user)) {
throw new NotFound();
}
@@ -60,7 +62,9 @@ class User extends \Espo\Core\Controllers\Record
if (!property_exists($data, 'password') || !property_exists($data, 'currentPassword')) {
throw new BadRequest();
}
return $this->getService('User')->changePassword($this->getUser()->id, $data->password, true, $data->currentPassword);
return $this->getService('User')
->changePassword($this->getUser()->id, $data->password, true, $data->currentPassword);
}
public function postActionChangePasswordByRequest($params, $data, $request)
@@ -80,7 +84,9 @@ class User extends \Espo\Core\Controllers\Record
$userName = $data->userName;
$emailAddress = $data->emailAddress;
$url = null;
if (!empty($data->url)) {
$url = $data->url;
}
@@ -90,27 +96,44 @@ class User extends \Espo\Core\Controllers\Record
public function postActionGenerateNewApiKey($params, $data, $request)
{
if (empty($data->id)) throw new BadRequest();
if (!$this->getUser()->isAdmin()) throw new Forbidden();
if (empty($data->id)) {
throw new BadRequest();
}
if (!$this->getUser()->isAdmin()) {
throw new Forbidden();
}
return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
}
public function postActionGenerateNewPassword($params, $data, $request)
{
if (empty($data->id)) throw new BadRequest();
if (!$this->getUser()->isAdmin()) throw new Forbidden();
if (empty($data->id)) {
throw new BadRequest();
}
if (!$this->getUser()->isAdmin()) {
throw new Forbidden();
}
$this->getRecordService()->generateNewPasswordForUser($data->id);
return true;
}
public function beforeCreateLink()
{
if (!$this->getUser()->isAdmin()) throw new Forbidden();
if (!$this->getUser()->isAdmin()) {
throw new Forbidden();
}
}
public function beforeRemoveLink($params, $data, $request)
{
if (!$this->getUser()->isAdmin()) throw new Forbidden();
if (!$this->getUser()->isAdmin()) {
throw new Forbidden();
}
}
protected function fetchListParamsFromRequest(&$params, $request, $data)