Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • sistemas/tupa
1 result
Show changes
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 78 deletions
.gitignore
View file @ e32412f7
......@@ -8,3 +8,4 @@
/backend/docker/config.env
/backend/metadatos_compilados
/backend/instalacion
/backend/docker/env.sh
api-backend/arai.json
View file @ e32412f7
......@@ -2,7 +2,7 @@
"name": "unam/tupa-api-backend",
"description": "Tupá (API Backend)",
"scripts": {
"hooks": "UNAM\\Tupa\\API\\AraiRegistryHooks"
"hooks": "UNAM\\Tupa\\Backend\\API\\AraiRegistryHooks"
},
"provide": [
......
api-backend/bin/instalador
View file @ e32412f7
......@@ -8,17 +8,17 @@ if (!file_exists(__DIR__.'/../vendor/autoload.php')) {
}
$proyectoDir = realpath(__DIR__.'/..');
$configuracion = new \UNAM\Tupa\API\Instalador\Configuracion($proyectoDir);
$configuracion = new \UNAM\Tupa\Backend\API\Instalador\Configuracion($proyectoDir);
$factory = new \SIU\Instalador\Factory($configuracion);
// el archivo de configuración del proyecto
$archivoParametros = \UNAM\Tupa\API\Factory::getContainer()['env-instalacion'];
$archivoParametrosTemplate = \UNAM\Tupa\API\Factory::getContainer()['env-instalacion-template'];
$archivoParametros = \UNAM\Tupa\Backend\API\Factory::getContainer()['env-instalacion'];
$archivoParametrosTemplate = \UNAM\Tupa\Backend\API\Factory::getContainer()['env-instalacion-template'];
$factory->getContainer()['parametros-file'] = $proyectoDir.'/'.$archivoParametros;
$factory->getContainer()['parametros-file-template'] = $proyectoDir.'/'.$archivoParametrosTemplate;
$worflowPermisos = new \UNAM\Tupa\API\Instalador\Workflow\Permisos($factory);
$worflowPermisos = new \UNAM\Tupa\Backend\API\Instalador\Workflow\Permisos($factory);
$cmdPermisos = new \SIU\Instalador\Consola\ComandoPermisosSimple();
$cmdPermisos->setWorkflow($worflowPermisos);
......
api-backend/config/api.conf
View file @ e32412f7
Alias /api "/usr/local/app/modulo/www"
<Directory "/usr/local/app/modulo/www">
Alias /api "/usr/local/app/api-backend/www"
<Directory "/usr/local/app/api-backend/www">
Options FollowSymLinks
DirectoryIndex api.php
<IfModule !mod_authz_core.c>
......
api-backend/src/UNAM/Tupa/API/AraiRegistryHooks.php → api-backend/src/UNAM/Tupa/Backend/API/AraiRegistryHooks.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API;
namespace UNAM\Tupa\Backend\API;
use SIU\AraiCli\Services\Registry\HooksInterface;
use SIU\AraiJsonParser\Feature\Provision;
use SIU\AraiJsonParser\Feature\Consumption;
use SIU\AraiJsonParser\Feature\{Provision,Consumption};
use Dotenv\Dotenv;
use SIU\AraiJsonParser\Version\VersionParser;
......@@ -20,7 +19,7 @@ class AraiRegistryHooks implements HooksInterface
public function __construct()
{
$this->pathBase = realpath(__DIR__.'/../../../../');
$this->pathBase = realpath(__DIR__.'/../../../../../');
$this->configuracion = Factory::getConfiguration();
}
......
api-frontend/src/UNAM/Tupa/API/Authentication/ProviderApi.php → api-backend/src/UNAM/Tupa/Backend/API/Authentication/ProviderApi.php
View file @ e32412f7
<?php
/**
* Created by PhpStorm.
* User: dalonso
* Date: 04/04/18
* Time: 16:08
*/
namespace UNAM\Tupa\API\Authentication;
namespace UNAM\Tupa\Backend\API\Authentication;
use UNAM\Tupa\API\Factory;
use UNAM\Tupa\Backend\API\Factory;
use SIUToba\rest\seguridad\autenticacion\usuarios_usuario_password;
class ProviderApi implements usuarios_usuario_password
......
api-backend/src/UNAM/Tupa/API/Config/APIConfiguracion.php → api-backend/src/UNAM/Tupa/Backend/API/Config/APIConfiguracion.php
View file @ e32412f7
<?php
/**
* Created by IntelliJ IDEA.
* User: fbohn
* Date: 13/11/15
* Time: 14:45.
*/
namespace UNAM\Tupa\API\Config;
namespace UNAM\Tupa\Backend\API\Config;
use UNAM\Tupa\Core\Config\Configuracion;
use UNAM\Tupa\API\Factory;
use UNAM\Tupa\Backend\API\Factory;
use Symfony\Component\Yaml\Yaml;
class APIConfiguracion extends Configuracion
......
api-backend/src/UNAM/Tupa/API/Endpoints/v1/registros/registros.php → api-backend/src/UNAM/Tupa/Backend/API/Endpoints/v1/registros/registros.php
View file @ e32412f7
<?php
use SIUToba\rest\lib\rest_error;
use SIUToba\rest\lib\rest_hidratador;
use SIUToba\rest\lib\rest_validador;
use SIUToba\rest\lib\{rest_error,rest_hidratador,rest_validador};
use SIUToba\rest\rest;
use UNAM\Tupa\API\Factory;
use UNAM\Tupa\Backend\API\Factory;
use UNAM\Tupa\Core\Errors\RegistroNotFound;
use UNAM\Tupa\Core\Filtros\Filtro;
use UNAM\Tupa\Core\Negocio\Identidad\Datos\Contacto;
use UNAM\Tupa\Core\Negocio\Identidad\Datos\Documento;
use UNAM\Tupa\Core\Negocio\Identidad\Datos\Email;
use UNAM\Tupa\Core\Negocio\Identidad\Datos\Personal;
use UNAM\Tupa\Core\Negocio\Identidad\Datos\Telefono;
use UNAM\Tupa\Core\Negocio\Identidad\Datos\{Contacto,Documento,Email,Personal,Telefono};
/**
* @description Registro de solicitudes de Usuarios
......
api-backend/src/UNAM/Tupa/API/Factory.php → api-backend/src/UNAM/Tupa/Backend/API/Factory.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API;
namespace UNAM\Tupa\Backend\API;
use Gelf\Transport\TcpTransport;
use SIU\TobaDb\DbPDO;
use UNAM\Tupa\Core\Config\Builder\ApiConfigBuilder;
use UNAM\Tupa\Core\Config\Builder\GeneralConfigBuilder;
use UNAM\Tupa\Core\Config\Builder\ServicesConfigBuilder;
use UNAM\Tupa\Core\Util\Codigo;
use UNAM\Tupa\Core\Util\Varios;
use UNAM\Tupa\Core\Config\Builder\{ApiConfigBuilder,GeneralConfigBuilder,ServicesConfigBuilder};
use UNAM\Tupa\Core\Util\{Codigo,Varios,EnvLoader};
use UNAM\Tupa\Core\Manager\ManagerRegistro;
use UNAM\Tupa\Core\Util\EnvLoader;
use UNAM\Tupa\API\Config\APIConfiguracion;
use UNAM\Tupa\Backend\API\Config\APIConfiguracion;
use Gelf\Publisher;
use Gelf\Transport\UdpTransport;
use Gelf\Transport\IgnoreErrorTransportWrapper;
use Monolog\Formatter\LineFormatter;
use Monolog\Formatter\GelfMessageFormatter;
use Monolog\Handler\ErrorLogHandler;
use Monolog\Handler\GelfHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogHandler;
use Gelf\Transport\{UdpTransport,IgnoreErrorTransportWrapper};
use Monolog\Formatter\{LineFormatter,GelfMessageFormatter};
use Monolog\Handler\{ErrorLogHandler,GelfHandler,StreamHandler,SyslogHandler};
use Monolog\Logger;
use Pimple\Container;
use Symfony\Component\Config\Definition\Processor;
......@@ -42,7 +33,7 @@ class Factory
if (isset(static::$container) && !$reload) {
return static::$container;
}
$proyect_dir = realpath(__DIR__ . '/../../../..');
$proyect_dir = realpath(__DIR__ . '/../../../../..');
$container = new Container();
$container['project-dir'] = $proyect_dir;
......
api-frontend/src/UNAM/Tupa/API/Instalador/Configuracion.php → api-backend/src/UNAM/Tupa/Backend/API/Instalador/Configuracion.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API\Instalador;
namespace UNAM\Tupa\Backend\API\Instalador;
use SIU\Instalador\Configuracion as BaseConfiguracion;
......
api-backend/src/UNAM/Tupa/API/Instalador/Paso/ChequearDependencias.php → api-backend/src/UNAM/Tupa/Backend/API/Instalador/Paso/ChequearDependencias.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API\Instalador\Paso;
namespace UNAM\Tupa\Backend\API\Instalador\Paso;
use SIU\Instalador\Paso;
use SIU\CheckConstraints\Checker;
......
api-backend/src/UNAM/Tupa/API/Instalador/Paso/Parametrizar.php → api-backend/src/UNAM/Tupa/Backend/API/Instalador/Paso/Parametrizar.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API\Instalador\Paso;
namespace UNAM\Tupa\Backend\API\Instalador\Paso;
use UNAM\Tupa\API\Factory;
use UNAM\Tupa\Backend\API\Factory;
use SIU\Instalador\Paso;
/**
......
api-frontend/src/UNAM/Tupa/API/Instalador/Paso/Permisos.php → api-backend/src/UNAM/Tupa/Backend/API/Instalador/Paso/Permisos.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API\Instalador\Paso;
namespace UNAM\Tupa\Backend\API\Instalador\Paso;
use UNAM\Tupa\API\Factory;
use UNAM\Tupa\Backend\API\Factory;
use SIU\Instalador\Generico\Paso\CorregirPermisos;
/**
......
api-backend/src/UNAM/Tupa/API/Instalador/Workflow/Permisos.php → api-backend/src/UNAM/Tupa/Backend/API/Instalador/Workflow/Permisos.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API\Instalador\Workflow;
namespace UNAM\Tupa\Backend\API\Instalador\Workflow;
use SIU\Instalador\Workflow;
......@@ -25,7 +25,7 @@ EOF;
public function inicializarPasos()
{
return [
new \UNAM\Tupa\API\Instalador\Paso\Permisos()
new \UNAM\Tupa\Backend\API\Instalador\Paso\Permisos()
];
}
}
api-backend/templates/vhost.conf
View file @ e32412f7
<VirtualHost *:80>
Include /usr/local/app/modulo/config/api.conf
Include /usr/local/app/api-backend/config/api.conf
</VirtualHost>
api-backend/www/api.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API\www;
namespace UNAM\Tupa\Backend\API\www;
require __DIR__.'/../vendor/autoload.php';
use UNAM\Tupa\API\Authentication\ProviderApi;
use UNAM\Tupa\API\Factory;
use UNAM\Tupa\Backend\API\Authentication\ProviderApi;
use UNAM\Tupa\Backend\API\Factory;
use SIUToba\rest\rest;
use SIUToba\rest\seguridad\autenticacion\autenticacion_basic_http;
use SIUToba\rest\seguridad\autorizacion\autorizacion_anonima;
......@@ -15,7 +15,7 @@ $api_path = "/$api_nombre/";
$api_version = trim($api_nombre, 'v');
$settings = array(
'path_controladores' => realpath(__DIR__ . '/../src/UNAM/Tupa/API/Endpoints/' . $api_nombre),
'path_controladores' => realpath(__DIR__ . '/../src/UNAM/Tupa/Backend/API/Endpoints/' . $api_nombre),
'url_api' => $api_path,
'prefijo_api_docs' => 'api-docs',
'prefijo_controladores' => '',
......
api-frontend/arai.json
View file @ e32412f7
......@@ -2,7 +2,7 @@
"name": "unam/tupa-api-backend",
"description": "Tupá (API Backend)",
"scripts": {
"hooks": "UNAM\\Tupa\\API\\AraiRegistryHooks"
"hooks": "UNAM\\Tupa\\FrontEnd\\API\\AraiRegistryHooks"
},
"provide": [
......
api-frontend/bin/instalador
View file @ e32412f7
......@@ -8,17 +8,17 @@ if (!file_exists(__DIR__.'/../vendor/autoload.php')) {
}
$proyectoDir = realpath(__DIR__.'/..');
$configuracion = new \UNAM\Tupa\API\Instalador\Configuracion($proyectoDir);
$configuracion = new \UNAM\Tupa\Frontend\API\Instalador\Configuracion($proyectoDir);
$factory = new \SIU\Instalador\Factory($configuracion);
// el archivo de configuración del proyecto
$archivoParametros = \UNAM\Tupa\API\Factory::getContainer()['env-instalacion'];
$archivoParametrosTemplate = \UNAM\Tupa\API\Factory::getContainer()['env-instalacion-template'];
$archivoParametros = \UNAM\Tupa\Frontend\API\Factory::getContainer()['env-instalacion'];
$archivoParametrosTemplate = \UNAM\Tupa\Frontend\API\Factory::getContainer()['env-instalacion-template'];
$factory->getContainer()['parametros-file'] = $proyectoDir.'/'.$archivoParametros;
$factory->getContainer()['parametros-file-template'] = $proyectoDir.'/'.$archivoParametrosTemplate;
$worflowPermisos = new \UNAM\Tupa\API\Instalador\Workflow\Permisos($factory);
$worflowPermisos = new \UNAM\Tupa\Frontend\API\Instalador\Workflow\Permisos($factory);
$cmdPermisos = new \SIU\Instalador\Consola\ComandoPermisosSimple();
$cmdPermisos->setWorkflow($worflowPermisos);
......
api-frontend/config/api.conf
View file @ e32412f7
Alias /api "/usr/local/app/modulo/www"
<Directory "/usr/local/app/modulo/www">
Alias /api "/usr/local/app/api-frontend/www"
<Directory "/usr/local/app/api-frontend/www">
Options FollowSymLinks
DirectoryIndex api.php
<IfModule !mod_authz_core.c>
......
api-frontend/src/UNAM/Tupa/API/AraiRegistryHooks.php → api-frontend/src/UNAM/Tupa/Frontend/API/AraiRegistryHooks.php
View file @ e32412f7
<?php
namespace UNAM\Tupa\API;
namespace UNAM\Tupa\Frontend\API;
use SIU\AraiCli\Services\Registry\HooksInterface;
use SIU\AraiJsonParser\Feature\Provision;
use SIU\AraiJsonParser\Feature\Consumption;
use SIU\AraiJsonParser\Feature\{Provision,Consumption};
use Dotenv\Dotenv;
use SIU\AraiJsonParser\Version\VersionParser;
......@@ -20,7 +19,7 @@ class AraiRegistryHooks implements HooksInterface
public function __construct()
{
$this->pathBase = realpath(__DIR__.'/../../../../');
$this->pathBase = realpath(__DIR__.'/../../../../../');
$this->configuracion = Factory::getConfiguration();
}
......