cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [internal] authkey adding, more elegant solution

pull/196/head
iglocska 2024-11-28 20:44:51 +01:00
parent cfceaf0fb7
commit 0ed3bef000
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Controller/AuthKeysController.php
View File

@ -72,14 +72,14 @@ class AuthKeysController extends AppController
$userConditions['id'] = $currentUser['id'];
} else {
$role_ids = $this->Users->Roles->find()->where(['perm_admin' => 0, 'perm_community_admin' => 0, 'perm_org_admin' => 0])->all()->extract('id')->toList();
if (empty($role_ids)) {
throw new MethodNotAllowedException(__('You are not authorised to do that, as there are no roles that you could assign to a user. Contact your administrator to rectify this.'));
}
$userConditions['organisation_id'] = $currentUser['organisation_id'];
$userConditions['OR'] = [
['role_id IN' => $role_ids],
['id' => $currentUser['id']],
$subConditions = [
['id' => $currentUser['id']]
];
if (!empty($role_ids)) {
$subConditions[] = ['role_id IN' => $role_ids];
}
$userConditions['OR'] = $subConditions;
}
}
$users = $this->Users->find('list');