Merge branch 'ent-13019-ruta-api-v2' into 'develop'

api change path v1 to v2 pandora_enterprise#13019

See merge request artica/pandorafms!7015

pandora_console/api/documentation/swagger-initializer.js

@@ -23,7 +23,7 @@ window.onload = function() {
 
   // the following lines will be replaced by docker/configurator, when it runs in a docker-container
   const ui = SwaggerUIBundle({
-    url: "../v1/swagger.json",
+    url: "../v2/swagger.json",
     dom_id: "#swagger-ui",
     docExpansion: "none",
     deepLinking: true,

pandora_console/api/v2/public/swagger.json

@@ -7,7 +7,7 @@
   },
   "servers": [
     {
-      "url": "/api/v1",
+      "url": "/api/v2",
       "description": "PandoraFMS API Server"
     }
   ],

pandora_console/godmode/setup/setup_ITSM.php

@@ -123,7 +123,7 @@ $table_remote->data['ITSM_user_level_conf'] = $row;
 $row = [];
 $row['hostname'] = html_print_label_input_block(
     __('URL to Pandora ITSM setup').ui_print_help_tip(
-        __('Full URL to your Pandora ITSM setup (e.g., http://192.168.1.20/integria/api/v1).'),
+        __('Full URL to your Pandora ITSM setup (e.g., http://192.168.1.20/integria/api/v2).'),
         true
     ),
     html_print_input_text(

pandora_console/include/config_process.php

@@ -345,7 +345,7 @@ if (empty($container) === true) {
 
     // Solution to load the ContainerBuilder class.
     $containerBuilder = new ContainerBuilder();
-    $containerBuilder->addDefinitions(__DIR__.'/../api/v1/config/container.php');
+    $containerBuilder->addDefinitions(__DIR__.'/../api/v2/config/container.php');
 
     // Create DI container instance.
     $container = $containerBuilder->build();

pandora_console/include/functions.php

@@ -6904,7 +6904,9 @@ function get_defined_translation($string)
         }
     }
 
-    if ($config['ignore_cache_translate'] !== true && is_array($cache_translation) === true && count($cache_translation) === 0) {
+    if ((isset($config['ignore_cache_translate']) === false || $config['ignore_cache_translate'] !== true)
+        && is_array($cache_translation) === true && count($cache_translation) === 0
+    ) {
         $cache_translation_all = db_get_all_rows_sql(
             sprintf(
                 'SELECT translation, string

pandora_console/include/lib/Modules/Groups/Repositories/GroupRepositoryMySQL.php

@@ -164,8 +164,6 @@ class GroupRepositoryMySQL extends RepositoryMySQL implements GroupRepository
             $pagination
         );
 
-        hd($sql, true);
-
         return $sql;
     }
 }

pandora_console/include/lib/Modules/Shared/Documentation/OpenApi.php

@@ -33,7 +33,7 @@ More useful links:
  *   bearerFormat="pandoraBearer",
  * ),
  * @OA\Server(
- *   url="/api/v1",
+ *   url="/api/v2",
  *   description="PandoraFMS API Server"
  * ),
  * @OA\Tag(

pandora_console/include/lib/Modules/Shared/Middlewares/UserTokenMiddleware.php

@@ -25,15 +25,6 @@ final class UserTokenMiddleware
 
     public function check(Request $request): bool
     {
-        hd('El server UUID:', true);
-        hd($this->config->get('server_unique_identifier'), true);
-
-        hd('El api pass es:', true);
-        hd($this->config->get('api_password'), true);
-
-        hd('El token de md5 con el que se puede loguear: ', true);
-        hd(md5($this->config->get('server_unique_identifier')).'-'.md5($this->config->get('api_password')), true);
-
         $authorization = ($request->getHeader('Authorization')[0] ?? '');
         
         $token = null;

pandora_console/tools/generate_doc.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-php ../api/v1/config/generateDoc.php
+php ../api/v2/config/generateDoc.php