diff --git a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php index 4bc70ca6d242787c5f1020958d806840131fb624..152715fef5ca3089ed43969656eb0871294ed89c 100755 --- a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php +++ b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php @@ -37,7 +37,7 @@ class MaarchParapheurController public static function getUsers(array $aArgs) { $response = CurlModel::exec([ - 'url' => $aArgs['config']['data']['url'] . '/rest/users', + 'url' => rtrim($aArgs['config']['data']['url'], '/') . '/rest/users', 'user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password'], 'method' => 'GET' @@ -126,8 +126,8 @@ class MaarchParapheurController if ($mainResource[0]['category_id'] != 'outgoing') { $attachmentsData = [[ 'encodedDocument' => $encodedMainZipFile, - 'title' => $mainResource[0]['subject'], - 'reference' => $mainResource[0]['alt_identifier'] + 'title' => $mainResource[0]['subject'], + 'reference' => $mainResource[0]['alt_identifier'] ]]; } else { $attachmentsData = []; @@ -158,7 +158,7 @@ class MaarchParapheurController ]; $response = CurlModel::exec([ - 'url' => $aArgs['config']['data']['url'] . '/rest/documents', + 'url' => rtrim($aArgs['config']['data']['url'], '/') . '/rest/documents', 'user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password'], 'method' => 'POST', @@ -193,7 +193,7 @@ class MaarchParapheurController ]; $response = CurlModel::exec([ - 'url' => $aArgs['config']['data']['url'] . '/rest/documents', + 'url' => rtrim($aArgs['config']['data']['url'], '/') . '/rest/documents', 'user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password'], 'method' => 'POST', @@ -230,7 +230,7 @@ class MaarchParapheurController public static function getUserById(array $aArgs) { $response = CurlModel::exec([ - 'url' => $aArgs['config']['data']['url'] . '/rest/users/'.$aArgs['id'], + 'url' => rtrim($aArgs['config']['data']['url'], '/') . '/rest/users/'.$aArgs['id'], 'user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password'], 'method' => 'GET' @@ -274,7 +274,7 @@ class MaarchParapheurController public static function getDocumentStatus(array $aArgs) { $response = CurlModel::exec([ - 'url' => $aArgs['config']['data']['url'] . '/rest/documents/'.$aArgs['documentId'].'/status', + 'url' => rtrim($aArgs['config']['data']['url'], '/') . '/rest/documents/'.$aArgs['documentId'].'/status', 'user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password'], 'method' => 'GET' @@ -286,7 +286,7 @@ class MaarchParapheurController public static function getProcessedDocument(array $aArgs) { $response = CurlModel::exec([ - 'url' => $aArgs['config']['data']['url'] . '/rest/documents/'.$aArgs['documentId'].'/processedDocument', + 'url' => rtrim($aArgs['config']['data']['url'], '/') . '/rest/documents/'.$aArgs['documentId'].'/processedDocument', 'user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password'], 'method' => 'GET' diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php index 6d02404e0f20d36d177c1999a5e16bfa28de5707..8828751137e8e76d1560d0d83d980b4b029f8bd3 100755 --- a/src/app/user/controllers/UserController.php +++ b/src/app/user/controllers/UserController.php @@ -121,7 +121,7 @@ class UserController $user['canModifyPassword'] = true; } $loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'modules/visa/xml/remoteSignatoryBooks.xml']); - if ((string)$loadedXml->signatoryBookEnabled == 'maarchParapheur' && $user['loginmode'] != 'restMode' && empty($user['external_id']['maarchParapheur'])) { + if ((string)$loadedXml->signatoryBookEnabled == 'maarchParapheur' && $user['loginmode'] != 'restMode' && empty($user['external_id']->maarchParapheur)) { $user['canCreateMaarchParapheurUser'] = true; } @@ -1360,7 +1360,7 @@ class UserController } $responseExec = CurlModel::exec([ - 'url' => $url . '/rest/users', + 'url' => rtrim($url, '/') . '/rest/users', 'user' => $userId, 'password' => $password, 'method' => 'POST', @@ -1370,6 +1370,9 @@ class UserController if (!empty($responseExec['errors'])) { return $response->withStatus(400)->withJson(['errors' => $responseExec['errors']]); } + if (!empty($responseExec['message'])) { + return $response->withStatus(400)->withJson(['errors' => $responseExec['message']]); + } } else { return $response->withStatus(403)->withJson(['errors' => 'maarchParapheur is not enabled']); }