FIX #10825 TIME 0:10 connection with maarchParapheur

apps/maarch_entreprise/actions/sendToExternalNoteBook.php

@@ -129,7 +129,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
             $sendedInfo         = \ExternalSignatoryBook\controllers\MaarchParapheurController::sendDatas([
                 'config'             => $config,
                 'resIdMaster'        => $res_id,
-                'processingUser'     => $processingUserInfo['login'],
+                'processingUser'     => $processingUser,
                 'objectSent'         => 'mail',
                 'userId'             => $_SESSION['user']['UserId']
             ]);

apps/maarch_entreprise/actions/sendToExternalSignatureBook.php

@@ -249,7 +249,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
                     if (empty($externalId['maarchParapheur'])) {
                         return ['error' => 'Some users do not exist in Maarch Parapheur'];
                     }
-                    $workflow[] = ['userId' => $externalId['maarchParapheur'], 'mode' => ($user['requested_signature'] ? 'sign' : 'visa')];
+                    $workflow[] = ['externalId' => $externalId['maarchParapheur'], 'action' => ($user['requested_signature'] ? 'sign' : 'visa')];
                 }
 
                 $sendedInfo = \ExternalSignatoryBook\controllers\MaarchParapheurController::sendDatas([

src/app/action/controllers/ActionMethodController.php

@@ -112,7 +112,6 @@ class ActionMethodController
 
             if (!empty($externalId['localeoId'])) {
                 if (!empty($config['inObject'])) {
-
                     foreach ($config['objects'] as $object) {
                         $select = [];
                         $tmpBodyData = [];
@@ -289,7 +288,7 @@ class ActionMethodController
             $sendedInfo = MaarchParapheurController::sendDatas([
                 'config'           => $config,
                 'resIdMaster'      => $args['resId'],
-                'processingUser'   => $processingUserInfo['login'],
+                'processingUser'   => $args['data']['processingUser'],
                 'objectSent'       => 'mail',
                 'userId'           => $GLOBALS['userId']
             ]);

src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php

@@ -293,7 +293,7 @@ class MaarchParapheurController
                 $metadata[_RECIPIENTS] = $contact;
             }
 
-            $workflow = [['processingUser' => $processingUser, 'mode' => 'note']];
+            $workflow = [['userId' => $processingUser, 'mode' => 'note']];
             $bodyData = [
                 'title'            => $mainResource[0]['subject'],
                 'reference'        => $mainResource[0]['alt_identifier'],
@@ -322,6 +322,16 @@ class MaarchParapheurController
                 'externalId'        => $value['userId'],
                 'externalName'      => 'maarchParapheur'
             ]);
+            if (empty($userInfos)) {
+                $curlResponse = CurlModel::execSimple([
+                    'url'           => rtrim($aArgs['config']['data']['url'], '/') . '/rest/users/'.$value['userId'],
+                    'basicAuth'     => ['user' => $aArgs['config']['data']['userId'], 'password' => $aArgs['config']['data']['password']],
+                    'headers'       => ['content-type:application/json'],
+                    'method'        => 'GET'
+                ]);
+                $userInfos['firstname'] = $curlResponse['response']['user']['firstname'];
+                $userInfos['lastname'] = $curlResponse['response']['user']['lastname'];
+            }
             if ($value['mode'] == 'note') {
                 $mode = _NOTE_USER;
             } elseif ($value['mode'] == 'visa') {