Implements #11269. REST Post might return a customized answer.

Documentation/REST.rst

@@ -70,6 +70,8 @@ All data will imported / exported in JSON notation.
 
 Any QFQ form becomes a REST form via:  ``Form > Access > Permit REST: get / insert / update / delete``
 
+If the REST endpoint specifies an unknown form or access is forbidden, an HTTP error is reported.
+
 Endpoint
 --------
 
@@ -86,8 +88,8 @@ E.g.:
 
 1. List of all persons: ``<domain>/typo3conf/ext/qfq/Classes/Api/rest.php/person``
 2. Data of person 123: ``<domain>/typo3conf/ext/qfq/Classes/Api/rest.php/person/123``
-3. Adresses of person 123: ``<domain>/typo3conf/ext/qfq/Classes/Api/rest.php/person/123/address``
-4. Adress details of address 45 from person 123: ``<domain>/typo3conf/ext/qfq/Classes/Api/rest.php/person/123/address/45``
+3. Addresses of person 123: ``<domain>/typo3conf/ext/qfq/Classes/Api/rest.php/person/123/address``
+4. Address details of address 45 from person 123: ``<domain>/typo3conf/ext/qfq/Classes/Api/rest.php/person/123/address/45``
 
 QFQ 'Forms' are used as a 'container' (to define all details).
 
@@ -115,11 +117,11 @@ GET - Read
 A REST (GET) form has two modes:
 
 data
-    Specific content to a given id. Defined via 'form.parameter.restSqlData'. This mode is selected if there is an
+    Specific content to a given id. Defined via ``form.parameter.restSqlData``. This mode is selected if there is an
     id>0 given.
 
 list
-    A list of records will be exported.  Defined via 'form.parameter.restSqlList'. This mode is selected if there is no
+    A list of records will be exported.  Defined via ``form.parameter.restSqlList``. This mode is selected if there is no
     id or id=0.
 
 .. note::
@@ -199,12 +201,14 @@ POST - Insert
 +-------------------+----------------------------------------------------------------------------------+
 | restToken         | Optional. User defined string or dynamic token (see :ref:`restAuthorization`).   |
 +-------------------+----------------------------------------------------------------------------------+
+| restSqlPostPut    | Optional. Instead of returning the last_insert_id, a customized result might be  |
+|                   | specified. E.g. ``{{! SELECT id, token FROM Token WHERE id={{id:R0}} }}``        |
++-------------------+----------------------------------------------------------------------------------+
 
 FormElement:
 
 * For each column to save one FormElement with ``FE.name=<column>`` is necessary.
-* A regular QFQ form can be used as REST Post endpoint
-
+* A regular QFQ form can be used as REST Post endpoint.
 
 PUT - Update
 ------------

extension/Classes/Core/Constants.php

@@ -1068,6 +1068,7 @@ const F_MULTI_MSG_NO_RECORD_TEXT = 'No data';
 
 const F_REST_SQL_LIST = 'restSqlList';
 const F_REST_SQL_DATA = 'restSqlData';
+const F_REST_SQL_POST_PUT = 'restSqlPostPut';
 const F_REST_PARAM = 'restParam';
 const F_REST_TOKEN = 'restToken';
 const CLIENT_REST_ID = '_id';

extension/Classes/Core/Helper/OnString.php

@@ -209,7 +209,7 @@ class OnString {
 
     /**
      * Split a $_SERVER['PATH_INFO'] of the form '/form1/id1/form2/id2/form3/id3/.../formN[/idN])' to
-     *   $rcArrrIds=[ id1, id2, ..., idN]
+     *   $rcArrIds=[ id1, id2, ..., idN]
      *   return: 'formN'
      *
      * @param $pathInfo

extension/Classes/Core/QuickFormQuery.php

@@ -564,7 +564,7 @@ class QuickFormQuery {
                 $this->pasteClipboard($this->formSpec[F_ID], $formAction);
 
                 if ($formMode == FORM_REST) {
-                    $data = ['id' => $rc];
+                    $data = $this->doRestPostPut($rc);
                     $flagApiStructureReGroup = false;
                     break;
                 }
@@ -641,7 +641,24 @@ class QuickFormQuery {
         }
 
         return $this->evaluate->parse($this->formSpec[$key]);
+    }
+
+    /**
+     * @return bool|array
+     * @throws \CodeException
+     * @throws \DbException
+     * @throws \UserFormException
+     * @throws \UserReportException
+     */
+    private function doRestPostPut($id) {
+
+        if (!isset($this->formSpec[F_REST_SQL_POST_PUT])) {
+            return ['id' => $id];
+        }
+
+        $this->nameGenericRestParam();
 
+        return $this->evaluate->parse($this->formSpec[F_REST_SQL_POST_PUT]);
     }
 
     /**
@@ -720,7 +737,7 @@ class QuickFormQuery {
         $feFilter = OnArray::filter($this->feSpecNative, FE_TYPE, FE_TYPE_PILL);
 
         if (!empty($feFilter)) {
-            foreach ($feFilter AS $feParent) {
+            foreach ($feFilter as $feParent) {
 
                 if ($feParent[FE_MODE_SQL]) {
                     $mode = $this->evaluate->parse($feParent[FE_MODE_SQL]);
@@ -731,7 +748,7 @@ class QuickFormQuery {
 
                 if ($feParent[FE_MODE] == FE_MODE_HIDDEN) {
                     $feChild = OnArray::filter($this->feSpecNative, FE_ID_CONTAINER, $feParent[FE_ID]);
-                    foreach ($feChild AS $fe) {
+                    foreach ($feChild as $fe) {
 
                         # Search for origin
                         foreach ($this->feSpecNative as $key => $value) {
@@ -863,7 +880,7 @@ class QuickFormQuery {
         $arrClipboard = $this->dbArray[$this->dbIndexQfq]->sql($sql);
 
         // Process clipboard records.
-        foreach ($arrClipboard AS $srcIdRecord) {
+        foreach ($arrClipboard as $srcIdRecord) {
             $formAction->doAllFormElementPaste($this->feSpecAction, $this->formSpec[F_TABLE_NAME], $this->formSpec[F_TABLE_NAME], "", $srcIdRecord);
         }
 
@@ -1009,7 +1026,7 @@ class QuickFormQuery {
         unset($form[F_PARAMETER]);
 
         // Save specific elements to be expanded later.
-        $parseLater = OnArray::getArrayItems($form, [F_FORWARD_PAGE, FE_FILL_STORE_VAR, F_REST_SQL_LIST, F_REST_SQL_DATA, F_MULTI_SQL]);
+        $parseLater = OnArray::getArrayItems($form, [F_FORWARD_PAGE, FE_FILL_STORE_VAR, F_REST_SQL_LIST, F_REST_SQL_DATA, F_REST_SQL_POST_PUT, F_MULTI_SQL]);
         $form[FE_FILL_STORE_VAR] = '';
         $form[F_FORWARD_PAGE] = '';
         $form[F_REST_SQL_LIST] = '';
@@ -1513,7 +1530,7 @@ class QuickFormQuery {
             $method = $this->store::getVar(CLIENT_REQUEST_METHOD, STORE_CLIENT);
             if (false === Support::findInSet(strtolower($method), $this->formSpec[F_REST_METHOD])) {
 
-                throw new \UserFormException(json_encode([ERROR_MESSAGE_TO_USER => 'Invalid HTTP method',
+                throw new \UserFormException(json_encode([ERROR_MESSAGE_TO_USER => 'Invalid HTTP method: endpoint (form) not found or access not allowed',
                     ERROR_MESSAGE_TO_DEVELOPER => "Endpoint '" . $this->formSpec[F_NAME] . "' is not allowed with HTTP method '$method'",
                     ERROR_MESSAGE_HTTP_STATUS => HTTP_401_UNAUTHORIZED
                 ]), ERROR_FORM_REST);
@@ -1582,7 +1599,7 @@ class QuickFormQuery {
         $requiredParameterArr = explode('#', $requiredParameter, 2);
 
         $param = explode(',', $requiredParameterArr[0]);
-        foreach ($param AS $name) {
+        foreach ($param as $name) {
 
             $name = trim($name);