Merge branch '2301.0.x' into 'main'

Next patch release

See merge request maarch/MaarchParapheur!267

package-lock.json

 {
   "name": "parapheur",
-  "version": "2301.0.6",
+  "version": "2301.0.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "parapheur",
-      "version": "2301.0.6",
+      "version": "2301.0.7",
       "license": "GPL-3.0",
       "dependencies": {
+        "@types/ws": "^8.5.4",
         "angular-signature-pad": "^0.0.14",
         "core-js": "3.6.4",
         "tinymce": "^5.10.7",
@@ -4177,8 +4178,7 @@
     "node_modules/@types/node": {
       "version": "13.13.52",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz",
-      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==",
-      "dev": true
+      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.1",
@@ -4256,10 +4256,9 @@
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
-      "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
-      "dev": true,
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -18927,8 +18926,7 @@
     "@types/node": {
       "version": "13.13.52",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz",
-      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==",
-      "dev": true
+      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="
     },
     "@types/parse-json": {
       "version": "4.0.1",
@@ -19006,10 +19004,9 @@
       }
     },
     "@types/ws": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
-      "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
-      "dev": true,
+      "version": "8.5.4",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
       "requires": {
         "@types/node": "*"
       }

package.json

 {
   "name": "parapheur",
-  "version": "2301.0.6",
+  "version": "2301.0.7",
   "description": "Annoter ou Signer vos documents sur votre tablette",
   "homepage": "https://labs.maarch.org/maarch/MaarchParapheur",
   "engines": {
@@ -25,6 +25,7 @@
   "author": "Maarch",
   "license": "GPL-3.0",
   "dependencies": {
+    "@types/ws": "^8.5.4",
     "angular-signature-pad": "^0.0.14",
     "core-js": "3.6.4",
     "tinymce": "^5.10.7",

src/app/document/controllers/DocumentController.php

@@ -457,6 +457,9 @@ class DocumentController
         }
     }
 
+    /**
+     * @throws Exception
+     */
     public function create(Request $request, Response $response)
     {
         if (!PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'indexation'])) {
@@ -1465,11 +1468,11 @@ class DocumentController
                         SELECT (SELECT ?::int) UNION (SELECT id FROM users WHERE substitute = ?)
                     )
                     AND "order" = (
-                        SELECT min(ws2."order") FROM workflows ws2 WHERE ws2.process_date IS NULL AND ws2.main_document_id = main_document_id
+                        SELECT min(ws2."order") FROM workflows ws2 WHERE ws2.process_date IS NULL AND ws2.main_document_id = ?
                     )
                 ))'
             ],
-            'data'   => [$args['id'], $args['userId'], $args['userId'], $args['userId']]
+            'data'   => [$args['id'], $args['userId'], $args['userId'], $args['userId'], $args['id']]
         ]);
         return !empty($canReadOnly);
     }