diff options
66 files changed, 233 insertions, 351 deletions
diff --git a/admin/WebConsole3/backend/README.md b/admin/WebConsole3/backend/README.md index 8ae3da18..81401c9e 100644 --- a/admin/WebConsole3/backend/README.md +++ b/admin/WebConsole3/backend/README.md @@ -19,9 +19,10 @@ sudo apt-get install php7.0-xml php app/console doctrine:mapping:import --force MigrationBundle xml + ###### USER ###### // Crea un usuario: ususername / email / password -php bin/console fos:user:create testuser test@globunet.com password +php app/console fos:user:create admin admin@localhost.localdomain admin // Crea un usuario con el rol SUPER_ADMIN php app/console fos:user:create admin --super-admin @@ -47,7 +48,7 @@ php app/console fos:user:change-password testuser newp@ssword ###### AUTH 2 ###### // Crear el id y secret del Auth2 -php app/console opengsys:oauth-server:client:create --redirect-uri="http://globunet.es/" --grant-type="authorization_code" --grant-type="password" --grant-type="refresh_token" --grant-type="token" --grant-type="client_credentials" +php app/console opengnsys:oauth-server:client:create --grant-type="password" --grant-type="refresh_token" --grant-type="token" --grant-type="http://opengnsys.es/grants/og_client" ### TOKEN ### @@ -56,29 +57,10 @@ php app/console opengsys:oauth-server:client:create --redirect-uri="http://globu .../oauth/v2/token?client_id=CLIENT_ID&client_secret=CLIENT_SECRET&grant_type=password&username=USERNAME&password=PASSWORD # Autenticacion en una sola petición, añade las credenciales del clientes y del usuario. -# grant-type="client_credentials" -.../oauth/v2/token?client_id=CLIENT_ID&client_secret=CLIENT_SECRET&grant_type=client_credentials -# Autenticacion en una sola petición, añade las credenciales del clientes. solo indicando el client_id y secret te devuelve el access_token - - # grant-type="refresh_token" .../oauth/v2/token?client_id=CLIENT_ID&client_secret=CLIENT_SECRET&grant_type=refresh_token&refresh_token=REFRESH_TOKEN # Actualiza el access_token a partir de un refresh_token # grant-type="token" .../oauth/v2/auth?client_id=CLIENT_ID&redirect_uri=URL&response_type=token -# Es igual que authorization_code pero en un solo paso. - - -# grant-type="authorization_code" -.../oauth/v2/token?client_id=CLIENT_ID&client_secret=CLIENT_SECRET&grant_type=authorization_code&code=CODE&redirect_uri=URL -// Autenticación de tercero (IDP). - -### AUTH ### -// Autenticar SSO para clientes de terceros. La URL es la definida en el redirect-uri permitido. - -.../oauth/v2/auth?client_id=CLIENT_ID&response_type=code&redirect_uri=URL -# Te devuelve un code para luego solicitar el token con grant-type="authorization_code". - -.../oauth/v2/auth?client_id=CLIENT_ID&response_type=token&redirect_uri=URL -# Te devuelve el token directamente en el GET de la petición. +# Es igual que authorization_code pero en un solo paso.
\ No newline at end of file diff --git a/admin/WebConsole3/backend/app/config/config.yml b/admin/WebConsole3/backend/app/config/config.yml index 6ea364af..c4d37f11 100644 --- a/admin/WebConsole3/backend/app/config/config.yml +++ b/admin/WebConsole3/backend/app/config/config.yml @@ -102,12 +102,14 @@ monolog: channels: ['og_server', 'og_migration'] handlers: og_server: - type: stream + type: rotating_file + max_files: 31 level: debug path: '%kernel.logs_dir%/og_server.log' channels: [og_server] og_migration: - type: stream + type: rotating_file + max_files: 31 level: debug path: '%kernel.logs_dir%/og_migration.log' channels: [og_migration]
\ No newline at end of file diff --git a/admin/WebConsole3/backend/app/config/config_prod.yml b/admin/WebConsole3/backend/app/config/config_prod.yml index d387848e..66a8562d 100644 --- a/admin/WebConsole3/backend/app/config/config_prod.yml +++ b/admin/WebConsole3/backend/app/config/config_prod.yml @@ -20,7 +20,8 @@ monolog: action_level: error handler: nested nested: - type: stream + type: rotating_file + max_files: 31 path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug console: diff --git a/admin/WebConsole3/backend/app/config/security.yml b/admin/WebConsole3/backend/app/config/security.yml index 0deb121c..d8396109 100644 --- a/admin/WebConsole3/backend/app/config/security.yml +++ b/admin/WebConsole3/backend/app/config/security.yml @@ -44,7 +44,7 @@ security: secret: "%secret%" lifetime: 31536000 # 365 days in seconds path: / - name: REMEMBERME_MAIN + name: REMEMBERME_OG_MAIN access_control: # Auth login - { path: ^/oauth/v2/auth_login$, role: IS_AUTHENTICATED_ANONYMOUSLY } diff --git a/admin/WebConsole3/backend/composer.lock b/admin/WebConsole3/backend/composer.lock index 8f50218e..c0533888 100644 --- a/admin/WebConsole3/backend/composer.lock +++ b/admin/WebConsole3/backend/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "bb47c989d783013292749204f43c64f6", + "content-hash": "fd8853d766e80655e63261c9d6e86ab3", "packages": [ { "name": "composer/ca-bundle", @@ -1476,146 +1476,6 @@ "time": "2018-03-08T08:59:27+00:00" }, { - "name": "globunet/api-bundle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://gitlab.globunet.com/globunet/symfony-bundle/api.git", - "reference": "5a587fbf997c04572aed6e99f7976212dd16e0b9" - }, - "require": { - "friendsofsymfony/rest-bundle": "~2.0", - "globunet/core-bundle": "dev-master", - "jms/serializer-bundle": "~2.0", - "nelmio/api-doc-bundle": "~2.12.0", - "nelmio/cors-bundle": "~1.5.0", - "php": ">=7.0.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-4": { - "Globunet\\ApiBundle\\": "" - } - }, - "license": [ - "proprietary" - ], - "authors": [ - { - "name": "Miguel Angel", - "email": "ma.devega@globunet.com", - "homepage": "http://globunet.com" - }, - { - "name": "Juan Manuel", - "email": "jm.bardallo@globunet.com", - "homepage": "http://globunet.com" - } - ], - "description": "Symfony GlobunetApiBundle", - "homepage": "http://globunet.com", - "keywords": [ - "globunet api" - ], - "time": "2019-04-02T17:36:46+00:00" - }, - { - "name": "globunet/core-bundle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://gitlab.globunet.com/globunet/symfony-bundle/core.git", - "reference": "2b1f07e9feef6222dfcc0c520716b069c8290af9" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-4": { - "Globunet\\CoreBundle\\": "" - } - }, - "license": [ - "proprietary" - ], - "authors": [ - { - "name": "Miguel Angel", - "email": "ma.devega@globunet.com", - "homepage": "http://globunet.com" - }, - { - "name": "Juan Manuel", - "email": "jm.bardallo@globunet.com", - "homepage": "http://globunet.com" - } - ], - "description": "Symfony GlobunetCoreBundle", - "homepage": "http://globunet.com", - "keywords": [ - "globunet core" - ], - "time": "2019-03-26T20:25:25+00:00" - }, - { - "name": "globunet/user-bundle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://gitlab.globunet.com/globunet/symfony-bundle/user.git", - "reference": "8c7ff1fcfc4567daa31f06a2cf21e0d0f6999cc5" - }, - "require": { - "friendsofsymfony/oauth-server-bundle": ">=1.5.2", - "friendsofsymfony/user-bundle": ">=1.3.3", - "globunet/core-bundle": "dev-master", - "php": ">=7.0.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-4": { - "Globunet\\UserBundle\\": "" - } - }, - "license": [ - "proprietary" - ], - "authors": [ - { - "name": "Miguel Angel", - "email": "ma.devega@globunet.com", - "homepage": "http://globunet.com" - }, - { - "name": "Juan Manuel", - "email": "jm.bardallo@globunet.com", - "homepage": "http://globunet.com" - } - ], - "description": "Symfony GlobunetUserBundle", - "homepage": "http://globunet.com", - "keywords": [ - "globunet user" - ], - "time": "2019-03-31T00:10:08+00:00" - }, - { "name": "incenteev/composer-parameter-handler", "version": "v2.1.3", "source": { @@ -3913,11 +3773,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "globunet/core-bundle": 20, - "globunet/api-bundle": 20, - "globunet/user-bundle": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/ApiController.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/ApiController.php index 87d430e2..b50526f9 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/ApiController.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/ApiController.php @@ -2,13 +2,13 @@ namespace Opengnsys\CoreBundle\Controller; -use FOS\RestBundle\Controller\FOSRestController; +use FOS\RestBundle\Controller\AbstractFOSRestController; use FOS\RestBundle\Routing\ClassResourceInterface; use FOS\RestBundle\Request\ParamFetcherInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -class ApiController extends FOSRestController implements ClassResourceInterface +class ApiController extends AbstractFOSRestController implements ClassResourceInterface { /** * Constructor diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/SecurityOAuthController.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/SecurityOAuthController.php deleted file mode 100644 index 0b18ffb6..00000000 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Controller/SecurityOAuthController.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php - -namespace Opengnsys\CoreBundle\Controller; - -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\Security; - -class SecurityOAuthController extends Controller -{ - public function loginAction(Request $request) - { - $session = $request->getSession(); - - $authErrorKey = Security::AUTHENTICATION_ERROR; - $lastUsernameKey = Security::LAST_USERNAME; - - // get the error if any (works with forward and redirect -- see below) - if ($request->attributes->has($authErrorKey)) { - $error = $request->attributes->get($authErrorKey); - } elseif (null !== $session && $session->has($authErrorKey)) { - $error = $session->get($authErrorKey); - $session->remove($authErrorKey); - } else { - $error = null; - } - - if (!$error instanceof AuthenticationException) { - $error = null; // The value does not come from the security component. - } - - // last username entered by the user - $lastUsername = (null === $session) ? '' : $session->get($lastUsernameKey); - - return $this->render( - 'GlobunetUserBundle:Security:loginOAuth.html.twig', - array( - 'last_username' => $lastUsername, - 'error' => $error, - ) - ); - } - - public function loginCheckAction(Request $request) - { - - } -}
\ No newline at end of file diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelExtendedManager.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelExtendedManager.php index 1cc916bd..533be22c 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelExtendedManager.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelExtendedManager.php @@ -1,10 +1,10 @@ <?php /* - * This file is part of the Globunet Project package. + * This file is part of the Opengnsys Project package. * - * Created by Globunet on 15/03/19. <info@globunet.com> - * Copyright (c) 2015 Globunet Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 15/03/19. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ namespace Opengnsys\CoreBundle\Domain; @@ -94,7 +94,7 @@ class ModelExtendedManager extends ModelManager * * @return object * - * @throws \Globunet\UserBundle\Exception\InvalidFormException + * @throws \Opengnsys\CoreBundle\Exception\InvalidFormException */ public function persistForm($object, array $parameters, $method = "PUT", $flush = true, $validationGroup = null) { @@ -136,7 +136,7 @@ class ModelExtendedManager extends ModelManager * * @return object * - * @throws \Globunet\UserBundle\Exception\InvalidFormException + * @throws \Opengnsys\CoreBundle\Exception\InvalidFormException */ public function processForm($object, array $parameters, $method = "PUT", $validationGroup = "") { diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelManager.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelManager.php index 7cb2c2d0..59be01d9 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelManager.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Domain/ModelManager.php @@ -1,10 +1,10 @@ <?php /* - * This file is part of the Globunet Project package. + * This file is part of the Opengnsys Project package. * - * Created by Globunet on 16/04/16. <info@globunet.com> - * Copyright (c) 2015 Globunet Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 16/04/16. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ namespace Opengnsys\CoreBundle\Domain; diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AccessToken.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AccessToken.php index ddf89dc8..50aea333 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AccessToken.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AccessToken.php @@ -4,8 +4,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 20/10/15. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 20/10/15. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AuthCode.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AuthCode.php index 2fdb336f..200af41f 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AuthCode.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/AuthCode.php @@ -4,8 +4,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 20/10/15. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 20/10/15. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Client.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Client.php index 9117dc5d..2b9883d5 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Client.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Client.php @@ -4,8 +4,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 20/10/15. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 20/10/15. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/DBAL/EnumType.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/DBAL/EnumType.php index 0842ae5a..d6eb568f 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/DBAL/EnumType.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/DBAL/EnumType.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 27/009/16. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 27/009/16. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/RefreshToken.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/RefreshToken.php index c8fe519d..5e906242 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/RefreshToken.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/RefreshToken.php @@ -4,8 +4,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 20/10/15. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 20/10/15. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/BaseRepository.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/BaseRepository.php index b184374d..2faf395c 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/BaseRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/BaseRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/UserRepository.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/UserRepository.php index b97356f4..d65505a5 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/UserRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/UserRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/OAuth/OgClientGrantExtension.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/OAuth/OgClientGrantExtension.php new file mode 100644 index 00000000..f761c894 --- /dev/null +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/OAuth/OgClientGrantExtension.php @@ -0,0 +1,48 @@ +<?php + +namespace Opengnsys\CoreBundle\OAuth; + +use FOS\OAuthServerBundle\Storage\GrantExtensionInterface; +use OAuth2\Model\IOAuth2Client; + +class OgClientGrantExtension implements GrantExtensionInterface +{ + private $clientManager; + + public function __construct($clientManager) + { + $this->clientManager = $clientManager; + } + + /* + * {@inheritdoc} + */ + public function checkGrantExtension(IOAuth2Client $client, array $inputData, array $authHeaders) + { + // Check that the input data is correct + if (!isset($inputData['ip']) || !isset($inputData['mac'])|| !isset($inputData['token'])) { + return false; + } + + $repository = $this->clientManager->getRepository(); + $client = $repository->findOneBy(['ip'=>$inputData['ip'], 'mac'=>$inputData['mac']]); + + if (!$client) { + return false; + } + else { + $token = $inputData['token']; + $client->setAgentToken($token); + $this->clientManager->persist($client); + + return array( + // Only User + //'data' => $client + ); + } + + + + return false; // No number guessed, the grant will fail + } +}
\ No newline at end of file diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AccessToken.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AccessToken.orm.xml index 700ab4ef..9a39b3df 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AccessToken.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AccessToken.orm.xml @@ -3,7 +3,7 @@ <entity name="Opengnsys\CoreBundle\Entity\AccessToken" - table="globunet_user__access_tokens" + table="og_core__access_tokens" > <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AuthCode.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AuthCode.orm.xml index 85f8a37f..e9b773a5 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AuthCode.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/AuthCode.orm.xml @@ -3,7 +3,7 @@ <entity name="Opengnsys\CoreBundle\Entity\AuthCode" - table="globunet_user__auth_codes" + table="og_core__auth_codes" > <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Client.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Client.orm.xml index aad5c983..cc9665d6 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Client.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Client.orm.xml @@ -3,7 +3,7 @@ <entity name="Opengnsys\CoreBundle\Entity\Client" - table="globunet_user__clients" + table="og_core__clients" > <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Group.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Group.orm.xml index 92c8446c..c90e38a3 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Group.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/Group.orm.xml @@ -3,7 +3,7 @@ xsi="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\CoreBundle\Entity\Group" table="og_groups"> + <entity name="Opengnsys\CoreBundle\Entity\Group" table="og_core__groups"> <id name="id" type="integer" column="id"> <generator strategy="AUTO"/> diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/RefreshToken.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/RefreshToken.orm.xml index cca315c0..28e6d1ae 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/RefreshToken.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/RefreshToken.orm.xml @@ -5,7 +5,7 @@ <entity name="Opengnsys\CoreBundle\Entity\RefreshToken" - table="globunet_user__refresh_tokens" + table="og_core__refresh_tokens" > <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml index 751e647e..11630820 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\CoreBundle\Entity\User" table="og_users" + <entity name="Opengnsys\CoreBundle\Entity\User" table="og_core__users" repository-class="Opengnsys\CoreBundle\Entity\Repository\UserRepository"> <lifecycle-callbacks> @@ -28,7 +28,7 @@ <field name="updatedAt" type="datetime" column="updated_at"/> <many-to-many field="groups" target-entity="Opengnsys\CoreBundle\Entity\Group"> - <join-table name="globunet_user__users_groups"> + <join-table name="og_core__users_groups"> <join-columns> <join-column name="user_id" referenced-column-name="id" nullable="false" unique="false"/> </join-columns> @@ -40,7 +40,7 @@ <many-to-many field="organizationalUnits" target-entity="\Opengnsys\ServerBundle\Entity\OrganizationalUnit" inversed-by="users"> - <join-table name="og_users__organizational_units"> + <join-table name="og_core__organizational_units"> <join-columns> <join-column name="user_id" referenced-column-name="id"/> </join-columns> diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/routing/fos/oauth.yml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/routing/fos/oauth.yml index 524bb1ad..1ea2ae63 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/routing/fos/oauth.yml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/routing/fos/oauth.yml @@ -1,15 +1,3 @@ # Proporcionar un token como validación fos_oauth_server_token: - resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml" - -# Permitir autenticaciones para clientes de terceros -fos_oauth_server_authorize: - resource: "@FOSOAuthServerBundle/Resources/config/routing/authorize.xml" - -globunet_user_auth_login: - path: /oauth/v2/auth_login - defaults: { _controller: 'OpengnsysCoreBundle:SecurityOAuth:login' } -globunet_user_auth_login_check: - path: /oauth/v2/auth_login_check - defaults: { _controller: 'OpengnsysCoreBundle:SecurityOAuth:check' } - + resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
\ No newline at end of file diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/services.yml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/services.yml index a5ff1a59..4c904f8f 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/services.yml +++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/services.yml @@ -16,4 +16,11 @@ services: # MANAGER opengnsys_core.user_manager: class: Opengnsys\CoreBundle\Domain\ModelExtendedManager - arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\CoreBundle\Form\Type\UserFormType, Opengnsys\CoreBundle\Entity\User]
\ No newline at end of file + arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\CoreBundle\Form\Type\UserFormType, Opengnsys\CoreBundle\Entity\User] + + # OAuth + opengnsys_core.oauth.ogclient_extension: + class: Opengnsys\CoreBundle\OAuth\OgClientGrantExtension + arguments: ["@opengnsys_server.client_manager"] + tags: + - { name: fos_oauth_server.grant_extension, uri: 'http://opengnsys.es/grants/og_client' }
\ No newline at end of file diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Tests/Controller/DefaultControllerTest.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Tests/Controller/DefaultControllerTest.php deleted file mode 100644 index 4dd990a8..00000000 --- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Tests/Controller/DefaultControllerTest.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -namespace Opengnsys\CoreBundle\Tests\Controller; - -use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; - -class DefaultControllerTest extends WebTestCase -{ - public function testIndex() - { - $client = static::createClient(); - - $crawler = $client->request('GET', '/'); - - $this->assertContains('Hello World', $client->getResponse()->getContent()); - } -} diff --git a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php index 3f0f4bee..dc3ed3d1 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php +++ b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php @@ -389,6 +389,7 @@ class MigrateCommand extends ContainerAwareCommand $partition->setPartitionCode($particion->getCodpar()); $partition->setSize($particion->getTamano()); $partition->setCacheContent($particion->getCache()); + //$output->writeln(sprintf($particion->getUso())); $partition->setUsage($particion->getUso()); //$logger->warning("Find FylesSystema ID: ". $particion->getIdsistemafichero()); diff --git a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/OrdenadoresParticiones.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/OrdenadoresParticiones.orm.xml index 1bce206e..9e746407 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/OrdenadoresParticiones.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/OrdenadoresParticiones.orm.xml @@ -46,7 +46,7 @@ <option name="fixed"/> </options> </field> - <field name="uso" type="boolean" column="uso" nullable="false"> + <field name="uso" type="integer" column="uso" nullable="false"> <options> <option name="default">0</option> </options> diff --git a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/Repositorios.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/Repositorios.orm.xml index 8d67960e..58baee37 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/Repositorios.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Resources/config/doctrine/Repositorios.orm.xml @@ -15,6 +15,14 @@ <option name="default"/> </options> </field> + <!-- + <field name="passguor" type="string" column="passguor" length="50" nullable="false"> + <options> + <option name="fixed"/> + <option name="default"/> + </options> + </field> + --> <field name="idcentro" type="integer" column="idcentro" nullable="true"> <options> <option name="unsigned"/> @@ -30,6 +38,11 @@ <option name="fixed"/> </options> </field> + <field name="puertorepo" type="integer" column="puertorepo" nullable="false"> + <options> + <option name="unsigned"/> + </options> + </field> <field name="apikey" type="string" column="apikey" length="32" nullable="false"> <options> <option name="fixed"/> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php index 7b4ed58e..f7f19544 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php @@ -14,6 +14,7 @@ use Opengnsys\ServerBundle\Entity\Client; use Opengnsys\ServerBundle\Form\Type\Api\ClientType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Form\FormTypeInterface; @@ -374,13 +375,18 @@ class ClientController extends ApiController $data = $request->request->all(); $ip = $data['ip']; + $mac = $data['mac']; $config = $data['config']; $logger->info("----------- CLIENT CONFIG -----------"); - $logger->info("ip: " . $ip); - $logger->info("config: " . $config); + $logger->info("ip: " . $ip. " - mac: ". $mac." - config: " . $config ); + + $client = $clientRepository->findOneBy(array("ip"=>$ip, "mac"=>$mac)); + + if (!$client) { + throw new AccessDeniedHttpException(); + } - $client = $clientRepository->findOneBy(array("ip"=>$ip)); $config = explode(';', $config); $serialno = $config[0]; @@ -403,7 +409,7 @@ class ClientController extends ApiController // Si el Filesystem / PartitionCode es Cache leer la información del contenido de la cache. if($partition->getFilesystem() === "CACHE"){ - $path = $this->getParameter('path_client'); + $path = $this->container->getParameter('path_client'); $file = $ip.".cache.txt"; $filePath = $path.$file; if(file_exists($filePath)) { diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php index 20f4915b..6fe80f28 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 06/02/19. <info@globunet.com> - * Copyright (c) 2019 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 06/02/19. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2019 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php index 74755429..78d6b4a9 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php @@ -99,6 +99,11 @@ class Client extends BaseEntity private $netboot; /** + * @var string|null + */ + private $agentToken; + + /** * Constructor */ public function __construct() @@ -107,6 +112,22 @@ class Client extends BaseEntity } /** + * Get partitions + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getPartition($key) + { + $partition = null; + if(!$partition = $this->partitions->get($key)){ + $partition = new Partition(); + $partition->setClient($this); + $this->partitions[$key] = $partition; + } + return $partition; + } + + /** * Set name. * * @param string|null $name @@ -535,4 +556,28 @@ class Client extends BaseEntity { return $this->netboot; } + + /** + * Set agentToken. + * + * @param string|null $agentToken + * + * @return Client + */ + public function setAgentToken($agentToken = null) + { + $this->agentToken = $agentToken; + + return $this; + } + + /** + * Get agentToken. + * + * @return string|null + */ + public function getAgentToken() + { + return $this->agentToken; + } } diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php index 6477f18e..61bf9380 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php index 4d7cb637..1eb908f9 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php index 9c27b702..0ff30cc0 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php index 54026622..6c9fcce5 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php index ef26e21e..1d473c86 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php index ffa6889d..ff8e81b8 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php index 49d1b9c0..cd2808c6 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php index b43e7af2..ba7c5caf 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php index 24767ec1..c5cea8aa 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php index caec9aaf..497f6c30 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php index c32664db..9a543251 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php index c9d4aca9..332dc588 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php index df8f7ec3..6fe4be8d 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php index 77460f42..4226be63 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php index 347fa21d..f3d8c02f 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php index a3ee373d..ec672229 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php @@ -3,8 +3,8 @@ /* * This file is part of the Opengnsys Project package. * - * Created by Opengnsys on 01/10/18. <info@globunet.com> - * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved. + * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es> + * Copyright (c) 2015 Opengnsys. All rights reserved. * */ diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml index a2a14100..f66884a5 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Client" table="og_clients" + <entity name="Opengnsys\ServerBundle\Entity\Client" table="og_server__clients" repository-class="Opengnsys\ServerBundle\Entity\Repository\ClientRepository"> <id name="id" type="integer" column="id"> @@ -20,9 +20,15 @@ <field name="status" type="string" column="status" length="50" nullable="true"/> <field name="cache" type="integer" column="cache" nullable="true"/> - <field name="idproautoexec" type="integer" column="idproautoexec" nullable="false"/> + <field name="idproautoexec" type="integer" column="idproautoexec" nullable="true"/> <field name="oglive" type="string" length="255" column="oglive" nullable="true"/> + <field name="agentToken" type="string" column="agent_token" length="32" nullable="true"> + <options> + <option name="fixed"/> + </options> + </field> + <one-to-many field="partitions" target-entity="\Opengnsys\ServerBundle\Entity\Partition" mapped-by="client"> <cascade> <cascade-all/> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml index 86457065..709d7cd7 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Command" table="og_commands" + <entity name="Opengnsys\ServerBundle\Entity\Command" table="og_server__commands" repository-class="Opengnsys\ServerBundle\Entity\Repository\CommandRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml index 00c60eaa..17a46a53 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Hardware" table="og_hardwares" + <entity name="Opengnsys\ServerBundle\Entity\Hardware" table="og_server__hardwares" repository-class="Opengnsys\ServerBundle\Entity\Repository\HardwareRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml index 284fbe5f..1a1ab5b3 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\HardwareProfile" table="og_hardware_profiles" + <entity name="Opengnsys\ServerBundle\Entity\HardwareProfile" table="og_server__hardware_profiles" repository-class="Opengnsys\ServerBundle\Entity\Repository\HardwareProfileRepository"> <id name="id" type="integer" column="id"> @@ -23,7 +23,7 @@ <cascade-all/> </cascade> - <join-table name="og_hardware_profiles_hardwares"> + <join-table name="og_server__hardware_profiles_hardwares"> <join-columns> <join-column name="hardware_profile_id" referenced-column-name="id"/> </join-columns> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml index 76d40740..cc30ec0d 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Image" table="og_images" + <entity name="Opengnsys\ServerBundle\Entity\Image" table="og_server__images" repository-class="Opengnsys\ServerBundle\Entity\Repository\ImageRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml index 96ec3f4f..06c0c5f8 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Menu" table="og_menus" + <entity name="Opengnsys\ServerBundle\Entity\Menu" table="og_server__menus" repository-class="Opengnsys\ServerBundle\Entity\Repository\MenuRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml index b0daffd6..c0715ae8 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Netboot" table="og_netboots" + <entity name="Opengnsys\ServerBundle\Entity\Netboot" table="og_server__netboots" repository-class="Opengnsys\ServerBundle\Entity\Repository\NetbootRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml index 8a5bebc7..17c218bf 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\NetworkSettings" table="og_network_settings" + <entity name="Opengnsys\ServerBundle\Entity\NetworkSettings" table="og_server__network_settings" repository-class="Opengnsys\ServerBundle\Entity\Repository\NetworkSettingsRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml index 51951dfc..3f93b52b 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\OrganizationalUnit" table="og_organizational_units" + <entity name="Opengnsys\ServerBundle\Entity\OrganizationalUnit" table="og_server__organizational_units" repository-class="Opengnsys\ServerBundle\Entity\Repository\OrganizationalUnitRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml index e9cfee0c..751b4dad 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Partition" table="og_partitions" + <entity name="Opengnsys\ServerBundle\Entity\Partition" table="og_server__partitions" repository-class="Opengnsys\ServerBundle\Entity\Repository\PartitionRepository"> <unique-constraints> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml index 9036c2cd..a8d741de 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Repository" table="og_repositories" + <entity name="Opengnsys\ServerBundle\Entity\Repository" table="og_server__repositories" repository-class="Opengnsys\ServerBundle\Entity\Repository\RepositoryRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml index e60a8917..b4b1ed20 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Software" table="og_softwares" + <entity name="Opengnsys\ServerBundle\Entity\Software" table="og_server__softwares" repository-class="Opengnsys\ServerBundle\Entity\Repository\SoftwareRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml index 09499e09..6fe7f0ea 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\SoftwareProfile" table="og_software_profiles" + <entity name="Opengnsys\ServerBundle\Entity\SoftwareProfile" table="og_server__software_profiles" repository-class="Opengnsys\ServerBundle\Entity\Repository\SoftwareProfileRepository"> @@ -24,7 +24,7 @@ <cascade-all/> </cascade> - <join-table name="og_software_profiles_softwares"> + <join-table name="og_server__software_profiles_softwares"> <join-columns> <join-column name="software_profile_id" referenced-column-name="id"/> </join-columns> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml index 6ff885d3..00b3cea4 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Task" table="og_tasks" + <entity name="Opengnsys\ServerBundle\Entity\Task" table="og_server__tasks" repository-class="Opengnsys\ServerBundle\Entity\Repository\TaskRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml index 90e23d59..ce0308b2 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\Trace" table="og_traces" + <entity name="Opengnsys\ServerBundle\Entity\Trace" table="og_server__traces" repository-class="Opengnsys\ServerBundle\Entity\Repository\TraceRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml index 1157319e..5e01464b 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\ValidationSettings" table="og_validation_settings" + <entity name="Opengnsys\ServerBundle\Entity\ValidationSettings" table="og_server__validation_settings" repository-class="Opengnsys\ServerBundle\Entity\Repository\ValidationSettingsRepository"> <id name="id" type="integer" column="id"> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml index 89329119..004df1bb 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml @@ -2,7 +2,7 @@ <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - <entity name="Opengnsys\ServerBundle\Entity\View" table="og_views" + <entity name="Opengnsys\ServerBundle\Entity\View" table="og_server__views" repository-class="Opengnsys\ServerBundle\Entity\Repository\ViewRepository"> <id name="id" type="integer" column="id"> @@ -24,7 +24,7 @@ --> <many-to-many field="client" target-entity="\Opengnsys\ServerBundle\Entity\Client"> - <join-table name="og_views__clients"> + <join-table name="og_server__views__clients"> <join-columns> <join-column name="views_id" referenced-column-name="id"/> </join-columns> diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml index bcac998e..c585a89c 100644 --- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml +++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml @@ -29,14 +29,6 @@ Opengnsys\ServerBundle\Entity\Image: groups: [opengnsys_server__image_get, opengnsys_server__image_cget] expose: true serialized_name: fileSize - createdAt: - groups: [opengnsys_server__image_get, opengnsys_server__image_cget] - expose: true - serialized_name: createdAt - updatedAt: - groups: [opengnsys_server__image_get, opengnsys_server__image_cget] - expose: true - serialized_name: updatedAt id: groups: [opengnsys_server__image_get, opengnsys_server__image_cget] expose: true |