Skip to content
Snippets Groups Projects
Commit fe7ff963 authored by Florian Azizian's avatar Florian Azizian
Browse files

FIX #10619 TIME 0:45 autocomplete maarchParapheurUsers

parent c7e5adf9
No related branches found
No related tags found
No related merge requests found
...@@ -78,6 +78,7 @@ $app->get('/res/{resIdMaster}/attachments/{resId}/thumbnail', \Attachment\contro ...@@ -78,6 +78,7 @@ $app->get('/res/{resIdMaster}/attachments/{resId}/thumbnail', \Attachment\contro
//AutoComplete //AutoComplete
$app->get('/autocomplete/contacts', \SrcCore\controllers\AutoCompleteController::class . ':getContacts'); $app->get('/autocomplete/contacts', \SrcCore\controllers\AutoCompleteController::class . ':getContacts');
$app->get('/autocomplete/users', \SrcCore\controllers\AutoCompleteController::class . ':getUsers'); $app->get('/autocomplete/users', \SrcCore\controllers\AutoCompleteController::class . ':getUsers');
$app->get('/autocomplete/maarchParapheurUsers', \SrcCore\controllers\AutoCompleteController::class . ':getMaarchParapheurUsers');
$app->get('/autocomplete/contactsUsers', \SrcCore\controllers\AutoCompleteController::class . ':getContactsAndUsers'); $app->get('/autocomplete/contactsUsers', \SrcCore\controllers\AutoCompleteController::class . ':getContactsAndUsers');
$app->get('/autocomplete/contacts/groups', \SrcCore\controllers\AutoCompleteController::class . ':getContactsForGroups'); $app->get('/autocomplete/contacts/groups', \SrcCore\controllers\AutoCompleteController::class . ':getContactsForGroups');
$app->get('/autocomplete/users/administration', \SrcCore\controllers\AutoCompleteController::class . ':getUsersForAdministration'); $app->get('/autocomplete/users/administration', \SrcCore\controllers\AutoCompleteController::class . ':getUsersForAdministration');
......
...@@ -427,16 +427,6 @@ class PreProcessActionController ...@@ -427,16 +427,6 @@ class PreProcessActionController
} elseif ($signatureBookEnabled == 'fastParapheur') { } elseif ($signatureBookEnabled == 'fastParapheur') {
// TODO // TODO
} elseif ($signatureBookEnabled == 'maarchParapheur') { } elseif ($signatureBookEnabled == 'maarchParapheur') {
$userList = MaarchParapheurController::getInitializeDatas(['config' => $config]);
if (!empty($userList['users'])) {
$additionalsInfos['users'] = $userList['users'];
} else {
$additionalsInfos['users'] = [];
}
if (!empty($userList['errors'])) {
$errors[] = $userList['errors'];
}
if (is_array($data['resources']) && count($data['resources']) == 1) { if (is_array($data['resources']) && count($data['resources']) == 1) {
$resDestination = ResModel::getById([ $resDestination = ResModel::getById([
'select' => ['entities.id'], 'select' => ['entities.id'],
......
...@@ -115,6 +115,54 @@ class AutoCompleteController ...@@ -115,6 +115,54 @@ class AutoCompleteController
return $response->withJson($data); return $response->withJson($data);
} }
public static function getMaarchParapheurUsers(Request $request, Response $response)
{
$data = $request->getQueryParams();
$check = Validator::stringType()->notEmpty()->validate($data['search']);
if (!$check) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
}
$loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'modules/visa/xml/remoteSignatoryBooks.xml']);
if ($loadedXml->signatoryBookEnabled == 'maarchParapheur') {
foreach ($loadedXml->signatoryBook as $value) {
if ($value->id == "maarchParapheur") {
$url = $value->url;
$userId = $value->userId;
$password = $value->password;
break;
}
}
$bodyData = [
"search" => $data['search']
];
$curlResponse = CurlModel::execSimple([
'url' => rtrim($url, '/') . '/rest/autocomplete/users',
'basicAuth' => ['user' => $userId, 'password' => $password],
'headers' => ['content-type:application/json'],
'method' => 'POST',
'body' => json_encode($bodyData)
]);
if ($curlResponse['code'] != '200') {
if (!empty($curlResponse['response']['errors'])) {
$errors = $curlResponse['response']['errors'];
} else {
$errors = $curlResponse['errors'];
}
if (empty($errors)) {
$errors = 'An error occured. Please check your configuration file.';
}
return $response->withStatus(400)->withJson(['errors' => $errors]);
}
return $response->withJson($curlResponse['response']);
} else {
return $response->withStatus(403)->withJson(['errors' => 'maarchParapheur is not enabled']);
}
}
public static function getContactsAndUsers(Request $request, Response $response) public static function getContactsAndUsers(Request $request, Response $response)
{ {
$data = $request->getQueryParams(); $data = $request->getQueryParams();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment