Merge branch 'main' into develop
commit
c71c978761
|
@ -108,7 +108,7 @@ class AuthKeycloakBehavior extends Behavior
|
||||||
$role = $this->_table->Roles->find()->where($roleConditions)->first();
|
$role = $this->_table->Roles->find()->where($roleConditions)->first();
|
||||||
$org = $this->_table->Organisations->find()->where([
|
$org = $this->_table->Organisations->find()->where([
|
||||||
['id' => $data['organisation_id']]
|
['id' => $data['organisation_id']]
|
||||||
]);
|
])->first();
|
||||||
$token = $this->getAdminAccessToken();
|
$token = $this->getAdminAccessToken();
|
||||||
$keyCloakUser = [
|
$keyCloakUser = [
|
||||||
'firstName' => $individual['first_name'],
|
'firstName' => $individual['first_name'],
|
||||||
|
@ -117,7 +117,7 @@ class AuthKeycloakBehavior extends Behavior
|
||||||
'email' => $individual['email'],
|
'email' => $individual['email'],
|
||||||
'attributes' => [
|
'attributes' => [
|
||||||
'role_name' => empty($role['name']) ? Configure::read('keycloak.default_role_name') : $role['name'],
|
'role_name' => empty($role['name']) ? Configure::read('keycloak.default_role_name') : $role['name'],
|
||||||
'org_uuid' => $orgs['uuid']
|
'org_uuid' => $org['uuid']
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$keycloakConfig = Configure::read('keycloak');
|
$keycloakConfig = Configure::read('keycloak');
|
||||||
|
|
Loading…
Reference in New Issue