diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..6fa4cd8 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ManAgileAPI \ No newline at end of file diff --git a/.idea/ManAgileAPI.iml b/.idea/ManAgileAPI.iml new file mode 100644 index 0000000..1156cb4 --- /dev/null +++ b/.idea/ManAgileAPI.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..19f74da --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..820d449 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..331eb58 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,594 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1448273702738 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/AppKernel.php b/app/AppKernel.php index 3fa489c..d826248 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -25,6 +25,7 @@ public function registerBundles() new ApiBundle\ApiBundle(), new FOS\UserBundle\FOSUserBundle(), new FOS\RestBundle\FOSRestBundle(), + new FOS\OAuthServerBundle\FOSOAuthServerBundle(), new JMS\SerializerBundle\JMSSerializerBundle(), ); diff --git a/app/config/config.yml b/app/config/config.yml index 6306d34..2db4958 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -31,12 +31,12 @@ framework: fragments: ~ http_method_override: true -# Twig Configuration +# Twig twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" -# Assetic Configuration +# Assetic assetic: debug: "%kernel.debug%" use_controller: false @@ -49,7 +49,7 @@ assetic: #yui_css: # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" -# Doctrine Configuration +# Doctrine doctrine: dbal: driver: pdo_mysql @@ -71,7 +71,7 @@ doctrine: naming_strategy: doctrine.orm.naming_strategy.underscore auto_mapping: true -# Swiftmailer Configuration +# Swiftmailer swiftmailer: transport: "%mailer_transport%" host: "%mailer_host%" @@ -79,13 +79,13 @@ swiftmailer: password: "%mailer_password%" spool: { type: memory } -# FOSUserBundle Configuration +# FOSUserBundle fos_user: db_driver: orm firewall_name: main user_class: ApiBundle\Entity\FosUser -# FOSRestBundle Configuration +# FOSRestBundle fos_rest: param_fetcher_listener: true body_listener: true @@ -103,3 +103,13 @@ fos_rest: default_engine: twig routing_loader: default_format: json + +# FOSOauthBundle +fos_oauth_server: + db_driver: orm # Driver availables: orm, mongodb, or propel + client_class: ApiBundle\Entity\Client + access_token_class: ApiBundle\Entity\AccessToken + refresh_token_class: ApiBundle\Entity\RefreshToken + auth_code_class: ApiBundle\Entity\AuthCode + service: + user_provider: fos_user.user_manager diff --git a/app/config/routing.yml b/app/config/routing.yml index 59c7cef..be051b7 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -10,3 +10,12 @@ rest : type : rest resource : "routing_rest.yml" prefix : /api + +api.oauth: + resource: "@ApiBundle/Resources/config/routing.yml" + +fos_oauth_server_token: + resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml" + +fos_oauth_server_authorize: + resource: "@FOSOAuthServerBundle/Resources/config/routing/authorize.xml" \ No newline at end of file diff --git a/app/config/security.yml b/app/config/security.yml index 2388c04..3d8ef44 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -13,6 +13,21 @@ security: id: fos_user.user_provider.username firewalls: + oauth_authorize: + pattern: ^/oauth/v2/auth + form_login: + provider: fos_userbundle + check_path: /oauth/v2/auth_login_check + login_path: /oauth/v2/auth_login + anonymous: true + oauth_token: + pattern: ^/oauth/v2/token + security: false + api: + pattern: ^/api + fos_oauth: true + stateless: true + anonymous: false # can be omitted as its default value main: pattern: ^/ form_login: @@ -23,6 +38,7 @@ security: anonymous: true access_control: + - { path: ^/api, roles: IS_AUTHENTICATED_FULLY } - { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } diff --git a/composer.json b/composer.json index d3317bf..6c962a9 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "friendsofsymfony/user-bundle": "~2.0@dev", "friendsofsymfony/rest-bundle": "^1.7", "jms/serializer-bundle": "^1.0", - "twig/twig": "~1.0" + "twig/twig": "~1.0", + "friendsofsymfony/oauth-server-bundle": "dev-master" }, "require-dev": { "sensio/generator-bundle": "~2.3" diff --git a/composer.lock b/composer.lock index 35da8cc..c45b28b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "945006e932961030e3e75bdb2ddf7b31", - "content-hash": "bcec073413472f5ec86e61ea6df6ab6c", + "hash": "099fbb3055799a2294e89a73bcbb253e", + "content-hash": "dc107360e4b36348d93765d8cac25597", "packages": [ { "name": "doctrine/annotations", @@ -769,6 +769,129 @@ ], "time": "2015-08-31 12:59:39" }, + { + "name": "friendsofsymfony/oauth-server-bundle", + "version": "dev-master", + "target-dir": "FOS/OAuthServerBundle", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle.git", + "reference": "0c72d8baf707dce59c59a4daa1549c06e510bbed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/0c72d8baf707dce59c59a4daa1549c06e510bbed", + "reference": "0c72d8baf707dce59c59a4daa1549c06e510bbed", + "shasum": "" + }, + "require": { + "friendsofsymfony/oauth2-php": "~1.1.0", + "php": ">=5.3.3", + "symfony/framework-bundle": "~2.2", + "symfony/security-bundle": "~2.1" + }, + "require-dev": { + "doctrine/doctrine-bundle": "~1.0", + "doctrine/mongodb-odm": "1.0.*@dev", + "doctrine/orm": ">=2.2,<2.5-dev", + "symfony/class-loader": "~2.1", + "symfony/yaml": "~2.1", + "willdurand/propel-typehintable-behavior": "~1.0,>1.0.4" + }, + "suggest": { + "doctrine/doctrine-bundle": "*", + "doctrine/mongodb-odm-bundle": "*", + "propel/propel-bundle": "If you want to use Propel with Symfony2, then you will have to install the PropelBundle", + "willdurand/propel-typehintable-behavior": "The Typehintable behavior is useful to add type hints on generated methods, to be compliant with interfaces" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-0": { + "FOS\\OAuthServerBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arnaud Le Blanc", + "email": "arnaud.lb@gmail.com" + }, + { + "name": "FriendsOfSymfony Community", + "homepage": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/contributors" + } + ], + "description": "Symfony2 OAuth Server Bundle", + "homepage": "http://friendsofsymfony.github.com", + "keywords": [ + "oauth", + "oauth2", + "server" + ], + "time": "2015-05-01 22:00:52" + }, + { + "name": "friendsofsymfony/oauth2-php", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfSymfony/oauth2-php.git", + "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfSymfony/oauth2-php/zipball/23e76537c4a02e666ab4ba5abe67a69a886a0310", + "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/http-foundation": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "OAuth2\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arnaud Le Blanc", + "email": "arnaud.lb@gmail.com" + }, + { + "name": "FriendsOfSymfony Community", + "homepage": "https://github.com/FriendsOfSymfony/oauth2-php/contributors" + } + ], + "description": "OAuth2 library", + "homepage": "https://github.com/FriendsOfSymfony/oauth2-php", + "keywords": [ + "oauth", + "oauth2" + ], + "time": "2014-11-03 10:21:20" + }, { "name": "friendsofsymfony/rest-bundle", "version": "1.7.2", @@ -2422,7 +2545,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "friendsofsymfony/user-bundle": 20 + "friendsofsymfony/user-bundle": 20, + "friendsofsymfony/oauth-server-bundle": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/src/ApiBundle/Command/ClientCreateCommand.php b/src/ApiBundle/Command/ClientCreateCommand.php new file mode 100644 index 0000000..77216f7 --- /dev/null +++ b/src/ApiBundle/Command/ClientCreateCommand.php @@ -0,0 +1,79 @@ +setName('oauth-server:client:create') + ->setDescription('Creates a new client') + ->addOption( + 'redirect-uri', + null, + InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'Sets redirect uri for client. Use this option multiple times to set multiple redirect URIs.', + null + ) + ->addOption( + 'grant-type', + null, + InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'Sets allowed grant type for client. Use this option multiple times to set multiple grant types..', + null + ) + ->addOption( + 'name', + null, + InputOption::VALUE_OPTIONAL, + 'Sets the name of the client', + null + ) + ->setHelp( + <<%command.name%command creates a new client. + +php %command.full_name% [--redirect-uri=...] [--grant-type=...] name + +EOT + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $clientManager = $this->getContainer()->get('fos_oauth_server.client_manager.default'); + + /** + * @var Client $client + */ + $client = $clientManager->createClient(); + $client->setRedirectUris($input->getOption('redirect-uri')); + $client->setAllowedGrantTypes($input->getOption('grant-type')); + $client->setName($input->getOption('name')); + + $clientManager->updateClient($client); + + $output->writeln( + sprintf( + 'Added a new client with public id %s, secret %s', + $client->getPublicId(), + $client->getSecret() + ) + ); + } + + //oauth/v2/token?client_id=4_ic2arr98w60c4o8cs4gkk8w848w44w00cwgcssg0kccw808ss&client_secret=24491s5r6t1c8wk4goo4s4wk88s0ocsw80kogwoowgocog4wg8&grant_type=client_credentials +} \ No newline at end of file diff --git a/src/ApiBundle/Controller/OAuthController.php b/src/ApiBundle/Controller/OAuthController.php new file mode 100644 index 0000000..858eb7e --- /dev/null +++ b/src/ApiBundle/Controller/OAuthController.php @@ -0,0 +1,73 @@ +getSession(); + + if ($request->attributes->has(Security::AUTHENTICATION_ERROR)) { + $error = $request->attributes->get(Security::AUTHENTICATION_ERROR); + } elseif (null !== $session && $session->has(Security::AUTHENTICATION_ERROR)) { + $error = $session->get(Security::AUTHENTICATION_ERROR); + $session->remove(Security::AUTHENTICATION_ERROR); + } else { + var_dump("Error"); + $error = ''; + } + + if ($error) { + $error = $error->getMessage(); // WARNING! Symfony source code identifies this line as a potential security threat. + } + + $lastUsername = (null === $session) ? '' : $session->get(Security::LAST_USERNAME); + + if ($session->has('_security.target_path')) { + if (false !== strpos($session->get('_security.target_path'), $this->generateUrl('fos_oauth_server_authorize'))) { + $session->set('_fos_oauth_server.ensure_logout', true); + } + } + + return $this->render( + 'ApiBundle:Security:login.html.twig', + array( + 'last_username' => $lastUsername, + 'error' => $error, + )); + } + + public function loginCheckAction(Request $request) + { + + } + + /** + * @Method({"GET"}) + */ + public function clientAction() + { + // creating a client + $clientManager = $this->get('fos_oauth_server.client_manager.default'); + $client = $clientManager->createClient(); + $client->setRedirectUris(array('http://www.google.com/')); + $client->setAllowedGrantTypes(array('token', 'authorization_code')); + $clientManager->updateClient($client); + + // redirecting to the authorized page + return $this->redirect($this->generateUrl('fos_oauth_server_authorize', array( + 'client_id' => $client->getPublicId(), + 'redirect_uri' => 'http://www.google.com/', + 'response_type' => 'code' + ))); + } +} \ No newline at end of file diff --git a/src/ApiBundle/Controller/UserRestController.php b/src/ApiBundle/Controller/UserRestController.php index c257761..6731c93 100644 --- a/src/ApiBundle/Controller/UserRestController.php +++ b/src/ApiBundle/Controller/UserRestController.php @@ -42,4 +42,14 @@ protected function forwardIfNotAuthenticated($message='warn.user.notAuthenticate throw new AccessDeniedException($message); } } + + public function getSecureResourceAction() + { + # this is it + if (false === $this->get('security.context')->isGranted('IS_AUTHENTICATED_FULLY')) { + throw new AccessDeniedException(); + } + + // [...] + } } \ No newline at end of file diff --git a/src/ApiBundle/Entity/AccessToken.php b/src/ApiBundle/Entity/AccessToken.php new file mode 100644 index 0000000..7281775 --- /dev/null +++ b/src/ApiBundle/Entity/AccessToken.php @@ -0,0 +1,31 @@ +id; - } + private $team; + /** * Set name @@ -144,6 +134,16 @@ public function getArchived() return $this->archived; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set team * @@ -168,4 +168,3 @@ public function getTeam() return $this->team; } } - diff --git a/src/ApiBundle/Entity/Checklist.php b/src/ApiBundle/Entity/Checklist.php index ccc5ded..003195a 100644 --- a/src/ApiBundle/Entity/Checklist.php +++ b/src/ApiBundle/Entity/Checklist.php @@ -7,11 +7,6 @@ */ class Checklist { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -23,20 +18,15 @@ class Checklist private $creationDate; /** - * @var \ApiBundle\Entity\Task + * @var integer */ - private $task; - + private $id; /** - * Get id - * - * @return integer + * @var \ApiBundle\Entity\Task */ - public function getId() - { - return $this->id; - } + private $task; + /** * Set tittle @@ -86,6 +76,16 @@ public function getCreationDate() return $this->creationDate; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set task * @@ -110,4 +110,3 @@ public function getTask() return $this->task; } } - diff --git a/src/ApiBundle/Entity/Client.php b/src/ApiBundle/Entity/Client.php new file mode 100644 index 0000000..43840c3 --- /dev/null +++ b/src/ApiBundle/Entity/Client.php @@ -0,0 +1,50 @@ +name; + } + + /** + * @param mixed $name + * @return Client + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } +} diff --git a/src/ApiBundle/Entity/FosUser.php b/src/ApiBundle/Entity/FosUser.php index f12c154..6e8d5f0 100644 --- a/src/ApiBundle/Entity/FosUser.php +++ b/src/ApiBundle/Entity/FosUser.php @@ -2,160 +2,488 @@ namespace ApiBundle\Entity; -use FOS\UserBundle\Model\User as BaseUser; -use Doctrine\ORM\Mapping as ORM; -use JMS\Serializer\Annotation\ExclusionPolicy; -use JMS\Serializer\Annotation\Expose; -use JMS\Serializer\Annotation\Groups; -use JMS\Serializer\Annotation\VirtualProperty; - /** - * @ORM\Entity - * @ORM\Table(name="fos_user") - * - * @ExclusionPolicy("all") + * FosUser */ -class FosUser extends BaseUser +class FosUser { /** - * @ORM\Id - * @ORM\Column(type="integer") - * @ORM\GeneratedValue(strategy="AUTO") - * @Expose - * @Groups({"Me","Details"}) + * @var string */ - protected $id; + private $username; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Me","Details"}) + * @var string */ - protected $username; + private $usernameCanonical; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Details"}) + * @var string */ - protected $usernameCanonical; + private $email; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Me","Details"}) + * @var string */ - protected $email; + private $emailCanonical; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Details"}) + * @var boolean */ - protected $emailCanonical; + private $enabled; /** - * @ORM\Column(type="boolean") - * @Expose - * @Groups({"Me","Details"}) + * @var string */ - protected $enabled; + private $salt; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Me","Details"}) + * @var string */ - protected $salt; + private $password; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Me","Details"}) + * @var \DateTime */ - protected $password; + private $lastLogin; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Details"}) + * @var boolean */ - protected $plainPassword; + private $locked; /** - * @ORM\Column(type="DateTime") - * @Expose - * @Groups({"Me","Details"}) + * @var boolean */ - protected $lastLogin; + private $expired; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Me","Details"}) + * @var \DateTime */ - protected $confirmationToken; + private $expiresAt; /** - * @ORM\Column(type="string", length=150, nullable=true) - * @Expose - * @Groups({"Details"}) + * @var string */ - protected $passwordRequestedAt; + private $confirmationToken; /** - * @ORM\Column(type="Collection") - * @Expose - * @Groups({"Me","Details"}) + * @var \DateTime */ - protected $groups; + private $passwordRequestedAt; /** - * @ORM\Column(type="boolean") - * @Expose - * @Groups({"Details"}) + * @var string */ - protected $locked; + private $roles; /** - * @ORM\Column(type="boolean") - * @Expose - * @Groups({"Details"}) + * @var boolean */ - protected $expired; + private $credentialsExpired; /** - * @ORM\Column(type="DateTime") - * @Expose - * @Groups({"Details"}) + * @var \DateTime */ - protected $expiresAt; + private $credentialsExpireAt; /** - * @ORM\Column(type="array") - * @Expose - * @Groups({"Me","Details"}) + * @var integer */ - protected $roles; + private $id; + /** - * @ORM\Column(type="boolean") - * @Expose - * @Groups({"Details"}) + * Set username + * + * @param string $username + * + * @return FosUser */ - protected $credentialsExpired; + public function setUsername($username) + { + $this->username = $username; + + return $this; + } /** - * @ORM\Column(type="DateTime") - * @Expose - * @Groups({"Details"}) + * Get username + * + * @return string */ - protected $credentialsExpireAt; + public function getUsername() + { + return $this->username; + } - public function __construct() + /** + * Set usernameCanonical + * + * @param string $usernameCanonical + * + * @return FosUser + */ + public function setUsernameCanonical($usernameCanonical) { - parent::__construct(); - // your own logic + $this->usernameCanonical = $usernameCanonical; + + return $this; + } + + /** + * Get usernameCanonical + * + * @return string + */ + public function getUsernameCanonical() + { + return $this->usernameCanonical; + } + + /** + * Set email + * + * @param string $email + * + * @return FosUser + */ + public function setEmail($email) + { + $this->email = $email; + + return $this; + } + + /** + * Get email + * + * @return string + */ + public function getEmail() + { + return $this->email; + } + + /** + * Set emailCanonical + * + * @param string $emailCanonical + * + * @return FosUser + */ + public function setEmailCanonical($emailCanonical) + { + $this->emailCanonical = $emailCanonical; + + return $this; + } + + /** + * Get emailCanonical + * + * @return string + */ + public function getEmailCanonical() + { + return $this->emailCanonical; + } + + /** + * Set enabled + * + * @param boolean $enabled + * + * @return FosUser + */ + public function setEnabled($enabled) + { + $this->enabled = $enabled; + + return $this; + } + + /** + * Get enabled + * + * @return boolean + */ + public function getEnabled() + { + return $this->enabled; + } + + /** + * Set salt + * + * @param string $salt + * + * @return FosUser + */ + public function setSalt($salt) + { + $this->salt = $salt; + + return $this; + } + + /** + * Get salt + * + * @return string + */ + public function getSalt() + { + return $this->salt; + } + + /** + * Set password + * + * @param string $password + * + * @return FosUser + */ + public function setPassword($password) + { + $this->password = $password; + + return $this; + } + + /** + * Get password + * + * @return string + */ + public function getPassword() + { + return $this->password; + } + + /** + * Set lastLogin + * + * @param \DateTime $lastLogin + * + * @return FosUser + */ + public function setLastLogin($lastLogin) + { + $this->lastLogin = $lastLogin; + + return $this; + } + + /** + * Get lastLogin + * + * @return \DateTime + */ + public function getLastLogin() + { + return $this->lastLogin; + } + + /** + * Set locked + * + * @param boolean $locked + * + * @return FosUser + */ + public function setLocked($locked) + { + $this->locked = $locked; + + return $this; } -} + /** + * Get locked + * + * @return boolean + */ + public function getLocked() + { + return $this->locked; + } + + /** + * Set expired + * + * @param boolean $expired + * + * @return FosUser + */ + public function setExpired($expired) + { + $this->expired = $expired; + + return $this; + } + + /** + * Get expired + * + * @return boolean + */ + public function getExpired() + { + return $this->expired; + } + + /** + * Set expiresAt + * + * @param \DateTime $expiresAt + * + * @return FosUser + */ + public function setExpiresAt($expiresAt) + { + $this->expiresAt = $expiresAt; + + return $this; + } + + /** + * Get expiresAt + * + * @return \DateTime + */ + public function getExpiresAt() + { + return $this->expiresAt; + } + + /** + * Set confirmationToken + * + * @param string $confirmationToken + * + * @return FosUser + */ + public function setConfirmationToken($confirmationToken) + { + $this->confirmationToken = $confirmationToken; + + return $this; + } + + /** + * Get confirmationToken + * + * @return string + */ + public function getConfirmationToken() + { + return $this->confirmationToken; + } + + /** + * Set passwordRequestedAt + * + * @param \DateTime $passwordRequestedAt + * + * @return FosUser + */ + public function setPasswordRequestedAt($passwordRequestedAt) + { + $this->passwordRequestedAt = $passwordRequestedAt; + + return $this; + } + + /** + * Get passwordRequestedAt + * + * @return \DateTime + */ + public function getPasswordRequestedAt() + { + return $this->passwordRequestedAt; + } + + /** + * Set roles + * + * @param string $roles + * + * @return FosUser + */ + public function setRoles($roles) + { + $this->roles = $roles; + + return $this; + } + + /** + * Get roles + * + * @return string + */ + public function getRoles() + { + return $this->roles; + } + + /** + * Set credentialsExpired + * + * @param boolean $credentialsExpired + * + * @return FosUser + */ + public function setCredentialsExpired($credentialsExpired) + { + $this->credentialsExpired = $credentialsExpired; + + return $this; + } + + /** + * Get credentialsExpired + * + * @return boolean + */ + public function getCredentialsExpired() + { + return $this->credentialsExpired; + } + + /** + * Set credentialsExpireAt + * + * @param \DateTime $credentialsExpireAt + * + * @return FosUser + */ + public function setCredentialsExpireAt($credentialsExpireAt) + { + $this->credentialsExpireAt = $credentialsExpireAt; + + return $this; + } + + /** + * Get credentialsExpireAt + * + * @return \DateTime + */ + public function getCredentialsExpireAt() + { + return $this->credentialsExpireAt; + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } +} diff --git a/src/ApiBundle/Entity/Item.php b/src/ApiBundle/Entity/Item.php index 2c85507..4a565d8 100644 --- a/src/ApiBundle/Entity/Item.php +++ b/src/ApiBundle/Entity/Item.php @@ -7,11 +7,6 @@ */ class Item { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -28,20 +23,15 @@ class Item private $checked = '0'; /** - * @var \ApiBundle\Entity\Checklist + * @var integer */ - private $checklist; - + private $id; /** - * Get id - * - * @return integer + * @var \ApiBundle\Entity\Checklist */ - public function getId() - { - return $this->id; - } + private $checklist; + /** * Set description @@ -115,6 +105,16 @@ public function getChecked() return $this->checked; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set checklist * @@ -139,4 +139,3 @@ public function getChecklist() return $this->checklist; } } - diff --git a/src/ApiBundle/Entity/Label.php b/src/ApiBundle/Entity/Label.php index 7364a5a..5e40620 100644 --- a/src/ApiBundle/Entity/Label.php +++ b/src/ApiBundle/Entity/Label.php @@ -7,11 +7,6 @@ */ class Label { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -23,20 +18,15 @@ class Label private $color; /** - * @var \ApiBundle\Entity\Team + * @var integer */ - private $team; - + private $id; /** - * Get id - * - * @return integer + * @var \ApiBundle\Entity\Team */ - public function getId() - { - return $this->id; - } + private $team; + /** * Set name @@ -86,6 +76,16 @@ public function getColor() return $this->color; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set team * @@ -110,4 +110,3 @@ public function getTeam() return $this->team; } } - diff --git a/src/ApiBundle/Entity/LabeledTask.php b/src/ApiBundle/Entity/LabeledTask.php index dfb7285..4f9a101 100644 --- a/src/ApiBundle/Entity/LabeledTask.php +++ b/src/ApiBundle/Entity/LabeledTask.php @@ -13,14 +13,14 @@ class LabeledTask private $id; /** - * @var \ApiBundle\Entity\Label + * @var \ApiBundle\Entity\Task */ - private $label; + private $task; /** - * @var \ApiBundle\Entity\Task + * @var \ApiBundle\Entity\Label */ - private $task; + private $label; /** @@ -34,51 +34,50 @@ public function getId() } /** - * Set label + * Set task * - * @param \ApiBundle\Entity\Label $label + * @param \ApiBundle\Entity\Task $task * * @return LabeledTask */ - public function setLabel(\ApiBundle\Entity\Label $label = null) + public function setTask(\ApiBundle\Entity\Task $task = null) { - $this->label = $label; + $this->task = $task; return $this; } /** - * Get label + * Get task * - * @return \ApiBundle\Entity\Label + * @return \ApiBundle\Entity\Task */ - public function getLabel() + public function getTask() { - return $this->label; + return $this->task; } /** - * Set task + * Set label * - * @param \ApiBundle\Entity\Task $task + * @param \ApiBundle\Entity\Label $label * * @return LabeledTask */ - public function setTask(\ApiBundle\Entity\Task $task = null) + public function setLabel(\ApiBundle\Entity\Label $label = null) { - $this->task = $task; + $this->label = $label; return $this; } /** - * Get task + * Get label * - * @return \ApiBundle\Entity\Task + * @return \ApiBundle\Entity\Label */ - public function getTask() + public function getLabel() { - return $this->task; + return $this->label; } } - diff --git a/src/ApiBundle/Entity/LogActivity.php b/src/ApiBundle/Entity/LogActivity.php index eeee387..16e64d3 100644 --- a/src/ApiBundle/Entity/LogActivity.php +++ b/src/ApiBundle/Entity/LogActivity.php @@ -7,25 +7,20 @@ */ class LogActivity { - /** - * @var integer - */ - private $id; - /** * @var \DateTime */ private $datetimeActivity; /** - * @var \ApiBundle\Entity\List + * @var integer */ - private $list; + private $id; /** - * @var \ApiBundle\Entity\Task + * @var \ApiBundle\Entity\FosUser */ - private $task; + private $user; /** * @var \ApiBundle\Entity\TypeActivity @@ -33,20 +28,15 @@ class LogActivity private $typeActivity; /** - * @var \ApiBundle\Entity\FosUser + * @var \ApiBundle\Entity\Task */ - private $user; - + private $task; /** - * Get id - * - * @return integer + * @var \ApiBundle\Entity\Tasklist */ - public function getId() - { - return $this->id; - } + private $list; + /** * Set datetimeActivity @@ -73,99 +63,108 @@ public function getDatetimeActivity() } /** - * Set list + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Set user * - * @param \ApiBundle\Entity\List $list + * @param \ApiBundle\Entity\FosUser $user * * @return LogActivity */ - public function setList(\ApiBundle\Entity\List $list = null) + public function setUser(\ApiBundle\Entity\FosUser $user = null) { - $this->list = $list; + $this->user = $user; return $this; } /** - * Get list + * Get user * - * @return \ApiBundle\Entity\List + * @return \ApiBundle\Entity\FosUser */ - public function getList() + public function getUser() { - return $this->list; + return $this->user; } /** - * Set task + * Set typeActivity * - * @param \ApiBundle\Entity\Task $task + * @param \ApiBundle\Entity\TypeActivity $typeActivity * * @return LogActivity */ - public function setTask(\ApiBundle\Entity\Task $task = null) + public function setTypeActivity(\ApiBundle\Entity\TypeActivity $typeActivity = null) { - $this->task = $task; + $this->typeActivity = $typeActivity; return $this; } /** - * Get task + * Get typeActivity * - * @return \ApiBundle\Entity\Task + * @return \ApiBundle\Entity\TypeActivity */ - public function getTask() + public function getTypeActivity() { - return $this->task; + return $this->typeActivity; } /** - * Set typeActivity + * Set task * - * @param \ApiBundle\Entity\TypeActivity $typeActivity + * @param \ApiBundle\Entity\Task $task * * @return LogActivity */ - public function setTypeActivity(\ApiBundle\Entity\TypeActivity $typeActivity = null) + public function setTask(\ApiBundle\Entity\Task $task = null) { - $this->typeActivity = $typeActivity; + $this->task = $task; return $this; } /** - * Get typeActivity + * Get task * - * @return \ApiBundle\Entity\TypeActivity + * @return \ApiBundle\Entity\Task */ - public function getTypeActivity() + public function getTask() { - return $this->typeActivity; + return $this->task; } /** - * Set user + * Set list * - * @param \ApiBundle\Entity\FosUser $user + * @param \ApiBundle\Entity\Tasklist $list * * @return LogActivity */ - public function setUser(\ApiBundle\Entity\FosUser $user = null) + public function setList(\ApiBundle\Entity\Tasklist $list = null) { - $this->user = $user; + $this->list = $list; return $this; } /** - * Get user + * Get list * - * @return \ApiBundle\Entity\FosUser + * @return \ApiBundle\Entity\Tasklist */ - public function getUser() + public function getList() { - return $this->user; + return $this->list; } } - diff --git a/src/ApiBundle/Entity/Member.php b/src/ApiBundle/Entity/Member.php index 334504e..51a8814 100644 --- a/src/ApiBundle/Entity/Member.php +++ b/src/ApiBundle/Entity/Member.php @@ -8,19 +8,19 @@ class Member { /** - * @var integer + * @var boolean */ - private $id; + private $archived = '0'; /** - * @var boolean + * @var integer */ - private $archived = '0'; + private $id; /** - * @var \ApiBundle\Entity\Team + * @var \ApiBundle\Entity\FosUser */ - private $team; + private $user; /** * @var \ApiBundle\Entity\TeamRole @@ -28,21 +28,11 @@ class Member private $role; /** - * @var \ApiBundle\Entity\FosUser + * @var \ApiBundle\Entity\Team */ - private $user; + private $team; - /** - * Get id - * - * @return integer - */ - public function getId() - { - return $this->id; - } - /** * Set archived * @@ -68,27 +58,37 @@ public function getArchived() } /** - * Set team + * Get id * - * @param \ApiBundle\Entity\Team $team + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Set user + * + * @param \ApiBundle\Entity\FosUser $user * * @return Member */ - public function setTeam(\ApiBundle\Entity\Team $team = null) + public function setUser(\ApiBundle\Entity\FosUser $user = null) { - $this->team = $team; + $this->user = $user; return $this; } /** - * Get team + * Get user * - * @return \ApiBundle\Entity\Team + * @return \ApiBundle\Entity\FosUser */ - public function getTeam() + public function getUser() { - return $this->team; + return $this->user; } /** @@ -116,27 +116,26 @@ public function getRole() } /** - * Set user + * Set team * - * @param \ApiBundle\Entity\FosUser $user + * @param \ApiBundle\Entity\Team $team * * @return Member */ - public function setUser(\ApiBundle\Entity\FosUser $user = null) + public function setTeam(\ApiBundle\Entity\Team $team = null) { - $this->user = $user; + $this->team = $team; return $this; } /** - * Get user + * Get team * - * @return \ApiBundle\Entity\FosUser + * @return \ApiBundle\Entity\Team */ - public function getUser() + public function getTeam() { - return $this->user; + return $this->team; } } - diff --git a/src/ApiBundle/Entity/MemberTask.php b/src/ApiBundle/Entity/MemberTask.php index 69254fb..afadbe8 100644 --- a/src/ApiBundle/Entity/MemberTask.php +++ b/src/ApiBundle/Entity/MemberTask.php @@ -13,14 +13,14 @@ class MemberTask private $id; /** - * @var \ApiBundle\Entity\Member + * @var \ApiBundle\Entity\Task */ - private $member; + private $task; /** - * @var \ApiBundle\Entity\Task + * @var \ApiBundle\Entity\Member */ - private $task; + private $member; /** @@ -34,51 +34,50 @@ public function getId() } /** - * Set member + * Set task * - * @param \ApiBundle\Entity\Member $member + * @param \ApiBundle\Entity\Task $task * * @return MemberTask */ - public function setMember(\ApiBundle\Entity\Member $member = null) + public function setTask(\ApiBundle\Entity\Task $task = null) { - $this->member = $member; + $this->task = $task; return $this; } /** - * Get member + * Get task * - * @return \ApiBundle\Entity\Member + * @return \ApiBundle\Entity\Task */ - public function getMember() + public function getTask() { - return $this->member; + return $this->task; } /** - * Set task + * Set member * - * @param \ApiBundle\Entity\Task $task + * @param \ApiBundle\Entity\Member $member * * @return MemberTask */ - public function setTask(\ApiBundle\Entity\Task $task = null) + public function setMember(\ApiBundle\Entity\Member $member = null) { - $this->task = $task; + $this->member = $member; return $this; } /** - * Get task + * Get member * - * @return \ApiBundle\Entity\Task + * @return \ApiBundle\Entity\Member */ - public function getTask() + public function getMember() { - return $this->task; + return $this->member; } } - diff --git a/src/ApiBundle/Entity/Notification.php b/src/ApiBundle/Entity/Notification.php index 6dc4d14..f14ad12 100644 --- a/src/ApiBundle/Entity/Notification.php +++ b/src/ApiBundle/Entity/Notification.php @@ -7,11 +7,6 @@ */ class Notification { - /** - * @var integer - */ - private $id; - /** * @var \DateTime */ @@ -28,20 +23,15 @@ class Notification private $readAt; /** - * @var \ApiBundle\Entity\FosUser + * @var integer */ - private $user; - + private $id; /** - * Get id - * - * @return integer + * @var \ApiBundle\Entity\FosUser */ - public function getId() - { - return $this->id; - } + private $user; + /** * Set createdAt @@ -115,6 +105,16 @@ public function getReadAt() return $this->readAt; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set user * @@ -139,4 +139,3 @@ public function getUser() return $this->user; } } - diff --git a/src/ApiBundle/Entity/RefreshToken.php b/src/ApiBundle/Entity/RefreshToken.php new file mode 100644 index 0000000..0ebdbf0 --- /dev/null +++ b/src/ApiBundle/Entity/RefreshToken.php @@ -0,0 +1,31 @@ +id; - } + private $list; + /** * Set name @@ -173,14 +163,24 @@ public function getArchived() return $this->archived; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set list * - * @param \ApiBundle\Entity\List $list + * @param \ApiBundle\Entity\Tasklist $list * * @return Task */ - public function setList(\ApiBundle\Entity\List $list = null) + public function setList(\ApiBundle\Entity\Tasklist $list = null) { $this->list = $list; @@ -190,11 +190,10 @@ public function setList(\ApiBundle\Entity\List $list = null) /** * Get list * - * @return \ApiBundle\Entity\List + * @return \ApiBundle\Entity\Tasklist */ public function getList() { return $this->list; } } - diff --git a/src/ApiBundle/Entity/List.php b/src/ApiBundle/Entity/Tasklist.php similarity index 93% rename from src/ApiBundle/Entity/List.php rename to src/ApiBundle/Entity/Tasklist.php index a61f894..2108f50 100644 --- a/src/ApiBundle/Entity/List.php +++ b/src/ApiBundle/Entity/Tasklist.php @@ -3,15 +3,10 @@ namespace ApiBundle\Entity; /** - * List + * Tasklist */ -class List +class Tasklist { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -28,27 +23,22 @@ class List private $archived = '0'; /** - * @var \ApiBundle\Entity\Board + * @var integer */ - private $board; - + private $id; /** - * Get id - * - * @return integer + * @var \ApiBundle\Entity\Board */ - public function getId() - { - return $this->id; - } + private $board; + /** * Set name * * @param string $name * - * @return List + * @return Tasklist */ public function setName($name) { @@ -72,7 +62,7 @@ public function getName() * * @param integer $position * - * @return List + * @return Tasklist */ public function setPosition($position) { @@ -96,7 +86,7 @@ public function getPosition() * * @param boolean $archived * - * @return List + * @return Tasklist */ public function setArchived($archived) { @@ -115,12 +105,22 @@ public function getArchived() return $this->archived; } + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + /** * Set board * * @param \ApiBundle\Entity\Board $board * - * @return List + * @return Tasklist */ public function setBoard(\ApiBundle\Entity\Board $board = null) { @@ -139,4 +139,3 @@ public function getBoard() return $this->board; } } - diff --git a/src/ApiBundle/Entity/Team.php b/src/ApiBundle/Entity/Team.php index b160b91..3f5284f 100644 --- a/src/ApiBundle/Entity/Team.php +++ b/src/ApiBundle/Entity/Team.php @@ -7,11 +7,6 @@ */ class Team { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -27,16 +22,11 @@ class Team */ private $archived = '0'; - /** - * Get id - * - * @return integer + * @var integer */ - public function getId() - { - return $this->id; - } + private $id; + /** * Set name @@ -109,5 +99,14 @@ public function getArchived() { return $this->archived; } -} + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } +} diff --git a/src/ApiBundle/Entity/TeamRole.php b/src/ApiBundle/Entity/TeamRole.php index 5b719bf..b41b484 100644 --- a/src/ApiBundle/Entity/TeamRole.php +++ b/src/ApiBundle/Entity/TeamRole.php @@ -7,11 +7,6 @@ */ class TeamRole { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -22,16 +17,11 @@ class TeamRole */ private $description; - /** - * Get id - * - * @return integer + * @var integer */ - public function getId() - { - return $this->id; - } + private $id; + /** * Set name @@ -80,5 +70,14 @@ public function getDescription() { return $this->description; } -} + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } +} diff --git a/src/ApiBundle/Entity/TypeActivity.php b/src/ApiBundle/Entity/TypeActivity.php index 9091bf9..a4d20d4 100644 --- a/src/ApiBundle/Entity/TypeActivity.php +++ b/src/ApiBundle/Entity/TypeActivity.php @@ -7,11 +7,6 @@ */ class TypeActivity { - /** - * @var integer - */ - private $id; - /** * @var string */ @@ -22,16 +17,11 @@ class TypeActivity */ private $patternMessage; - /** - * Get id - * - * @return integer + * @var integer */ - public function getId() - { - return $this->id; - } + private $id; + /** * Set type @@ -80,5 +70,14 @@ public function getPatternMessage() { return $this->patternMessage; } -} + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } +} diff --git a/src/ApiBundle/Resources/config/doctrine/AccessToken.orm.xml b/src/ApiBundle/Resources/config/doctrine/AccessToken.orm.xml new file mode 100644 index 0000000..5b2069a --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/AccessToken.orm.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/src/ApiBundle/Resources/config/doctrine/AuthCode.orm.xml b/src/ApiBundle/Resources/config/doctrine/AuthCode.orm.xml new file mode 100644 index 0000000..b5c4a61 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/AuthCode.orm.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/src/ApiBundle/Resources/config/doctrine/Board.orm.xml b/src/ApiBundle/Resources/config/doctrine/Board.orm.xml new file mode 100644 index 0000000..90e2966 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Board.orm.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Board.orm.yml b/src/ApiBundle/Resources/config/doctrine/Board.orm.yml deleted file mode 100644 index b563930..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Board.orm.yml +++ /dev/null @@ -1,51 +0,0 @@ -ApiBundle\Entity\Board: - type: entity - table: board - indexes: - fk_board_team_idx: - columns: - - team_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - name: - type: string - nullable: false - length: 500 - options: - fixed: false - description: - type: text - nullable: true - length: null - options: - fixed: false - favorite: - type: boolean - nullable: true - options: - default: '0' - archived: - type: boolean - nullable: true - options: - default: '0' - manyToOne: - team: - targetEntity: Team - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - team_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/Checklist.orm.xml b/src/ApiBundle/Resources/config/doctrine/Checklist.orm.xml new file mode 100644 index 0000000..cc7ac3c --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Checklist.orm.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Checklist.orm.yml b/src/ApiBundle/Resources/config/doctrine/Checklist.orm.yml deleted file mode 100644 index 32010aa..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Checklist.orm.yml +++ /dev/null @@ -1,39 +0,0 @@ -ApiBundle\Entity\Checklist: - type: entity - table: checklist - indexes: - fk_checklist_task_idx: - columns: - - task_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - tittle: - type: string - nullable: false - length: 500 - options: - fixed: false - creationDate: - type: datetime - nullable: false - column: creation_date - manyToOne: - task: - targetEntity: Task - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - task_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/Client.orm.xml b/src/ApiBundle/Resources/config/doctrine/Client.orm.xml new file mode 100644 index 0000000..b1a8bf6 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Client.orm.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/src/ApiBundle/Resources/config/doctrine/FosUser.orm.xml b/src/ApiBundle/Resources/config/doctrine/FosUser.orm.xml new file mode 100644 index 0000000..7a1764d --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/FosUser.orm.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/FosUser.orm.yml b/src/ApiBundle/Resources/config/doctrine/FosUser.orm.yml deleted file mode 100644 index e57e98b..0000000 --- a/src/ApiBundle/Resources/config/doctrine/FosUser.orm.yml +++ /dev/null @@ -1,12 +0,0 @@ -ApiBundle\Entity\FosUser: - type: entity - table: fos_user - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY diff --git a/src/ApiBundle/Resources/config/doctrine/Item.orm.xml b/src/ApiBundle/Resources/config/doctrine/Item.orm.xml new file mode 100644 index 0000000..3067185 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Item.orm.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Item.orm.yml b/src/ApiBundle/Resources/config/doctrine/Item.orm.yml deleted file mode 100644 index 0f80d94..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Item.orm.yml +++ /dev/null @@ -1,45 +0,0 @@ -ApiBundle\Entity\Item: - type: entity - table: item - indexes: - fk_item_checklist_idx: - columns: - - checklist_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - description: - type: text - nullable: false - length: null - options: - fixed: false - position: - type: integer - nullable: false - options: - unsigned: false - checked: - type: boolean - nullable: true - options: - default: '0' - manyToOne: - checklist: - targetEntity: Checklist - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - checklist_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/Label.orm.xml b/src/ApiBundle/Resources/config/doctrine/Label.orm.xml new file mode 100644 index 0000000..719fb00 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Label.orm.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Label.orm.yml b/src/ApiBundle/Resources/config/doctrine/Label.orm.yml deleted file mode 100644 index 2d755b8..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Label.orm.yml +++ /dev/null @@ -1,41 +0,0 @@ -ApiBundle\Entity\Label: - type: entity - table: label - indexes: - fk_label_team_idx: - columns: - - team_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - name: - type: string - nullable: false - length: 500 - options: - fixed: false - color: - type: string - nullable: true - length: 20 - options: - fixed: false - manyToOne: - team: - targetEntity: Team - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - team_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/LabeledTask.orm.xml b/src/ApiBundle/Resources/config/doctrine/LabeledTask.orm.xml new file mode 100644 index 0000000..26db6e3 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/LabeledTask.orm.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/LabeledTask.orm.yml b/src/ApiBundle/Resources/config/doctrine/LabeledTask.orm.yml deleted file mode 100644 index 74cbe02..0000000 --- a/src/ApiBundle/Resources/config/doctrine/LabeledTask.orm.yml +++ /dev/null @@ -1,41 +0,0 @@ -ApiBundle\Entity\LabeledTask: - type: entity - table: labeled_task - indexes: - fk_label_task_task_idx: - columns: - - task_id - fk_labeled_task_label_idx: - columns: - - label_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - manyToOne: - label: - targetEntity: Label - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - label_id: - referencedColumnName: id - orphanRemoval: false - task: - targetEntity: Task - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - task_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/List.orm.yml b/src/ApiBundle/Resources/config/doctrine/List.orm.yml deleted file mode 100644 index aa275d0..0000000 --- a/src/ApiBundle/Resources/config/doctrine/List.orm.yml +++ /dev/null @@ -1,45 +0,0 @@ -ApiBundle\Entity\List: - type: entity - table: list - indexes: - fk_list_board_idx: - columns: - - board_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - name: - type: string - nullable: false - length: 500 - options: - fixed: false - position: - type: integer - nullable: true - options: - unsigned: false - archived: - type: boolean - nullable: true - options: - default: '0' - manyToOne: - board: - targetEntity: Board - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - board_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/LogActivity.orm.xml b/src/ApiBundle/Resources/config/doctrine/LogActivity.orm.xml new file mode 100644 index 0000000..10b4731 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/LogActivity.orm.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/LogActivity.orm.yml b/src/ApiBundle/Resources/config/doctrine/LogActivity.orm.yml deleted file mode 100644 index c3a9355..0000000 --- a/src/ApiBundle/Resources/config/doctrine/LogActivity.orm.yml +++ /dev/null @@ -1,72 +0,0 @@ -ApiBundle\Entity\LogActivity: - type: entity - table: log_activity - indexes: - fk_log_activity_list_idx: - columns: - - list_id - fk_log_activity_task_idx: - columns: - - task_id - fk_log_activity_type_activity_idx: - columns: - - type_activity_id - fk_log_activity_user_idx: - columns: - - user_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - datetimeActivity: - type: datetime - nullable: false - column: datetime_activity - manyToOne: - list: - targetEntity: List - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - list_id: - referencedColumnName: id - orphanRemoval: false - task: - targetEntity: Task - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - task_id: - referencedColumnName: id - orphanRemoval: false - typeActivity: - targetEntity: TypeActivity - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - type_activity_id: - referencedColumnName: id - orphanRemoval: false - user: - targetEntity: FosUser - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - user_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/Member.orm.xml b/src/ApiBundle/Resources/config/doctrine/Member.orm.xml new file mode 100644 index 0000000..41f4c95 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Member.orm.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Member.orm.yml b/src/ApiBundle/Resources/config/doctrine/Member.orm.yml deleted file mode 100644 index 5bbb214..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Member.orm.yml +++ /dev/null @@ -1,60 +0,0 @@ -ApiBundle\Entity\Member: - type: entity - table: member - indexes: - fk_member_team_idx: - columns: - - team_id - fk_member_user_idx: - columns: - - user_id - fk_member_team_role_idx: - columns: - - role_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - archived: - type: boolean - nullable: true - options: - default: '0' - manyToOne: - team: - targetEntity: Team - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - team_id: - referencedColumnName: id - orphanRemoval: false - role: - targetEntity: TeamRole - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - role_id: - referencedColumnName: id - orphanRemoval: false - user: - targetEntity: FosUser - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - user_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/MemberTask.orm.xml b/src/ApiBundle/Resources/config/doctrine/MemberTask.orm.xml new file mode 100644 index 0000000..ab53e88 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/MemberTask.orm.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/MemberTask.orm.yml b/src/ApiBundle/Resources/config/doctrine/MemberTask.orm.yml deleted file mode 100644 index 9b37a02..0000000 --- a/src/ApiBundle/Resources/config/doctrine/MemberTask.orm.yml +++ /dev/null @@ -1,41 +0,0 @@ -ApiBundle\Entity\MemberTask: - type: entity - table: member_task - indexes: - fk_member_task_task_idx: - columns: - - task_id - fk_member_task_member_idx: - columns: - - member_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - manyToOne: - member: - targetEntity: Member - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - member_id: - referencedColumnName: id - orphanRemoval: false - task: - targetEntity: Task - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - task_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/Notification.orm.xml b/src/ApiBundle/Resources/config/doctrine/Notification.orm.xml new file mode 100644 index 0000000..4f7c071 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Notification.orm.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Notification.orm.yml b/src/ApiBundle/Resources/config/doctrine/Notification.orm.yml deleted file mode 100644 index ad491ea..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Notification.orm.yml +++ /dev/null @@ -1,43 +0,0 @@ -ApiBundle\Entity\Notification: - type: entity - table: notification - indexes: - fk_notification_user_idx: - columns: - - user_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - createdAt: - type: datetime - nullable: false - column: created_at - message: - type: text - nullable: false - length: null - options: - fixed: false - readAt: - type: datetime - nullable: true - column: read_at - manyToOne: - user: - targetEntity: FosUser - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - user_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/RefreshToken.orm.xml b/src/ApiBundle/Resources/config/doctrine/RefreshToken.orm.xml new file mode 100644 index 0000000..56f98f0 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/RefreshToken.orm.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/src/ApiBundle/Resources/config/doctrine/Task.orm.xml b/src/ApiBundle/Resources/config/doctrine/Task.orm.xml new file mode 100644 index 0000000..ae5e87c --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Task.orm.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Task.orm.yml b/src/ApiBundle/Resources/config/doctrine/Task.orm.yml deleted file mode 100644 index 05ede0f..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Task.orm.yml +++ /dev/null @@ -1,55 +0,0 @@ -ApiBundle\Entity\Task: - type: entity - table: task - indexes: - fk_task_list_idx: - columns: - - list_id - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - name: - type: string - nullable: false - length: 500 - options: - fixed: false - description: - type: text - nullable: true - length: null - options: - fixed: false - position: - type: integer - nullable: false - options: - unsigned: false - dueDate: - type: datetime - nullable: true - column: due_date - archived: - type: boolean - nullable: true - options: - default: '0' - manyToOne: - list: - targetEntity: List - cascade: { } - fetch: LAZY - mappedBy: null - inversedBy: null - joinColumns: - list_id: - referencedColumnName: id - orphanRemoval: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/Tasklist.orm.xml b/src/ApiBundle/Resources/config/doctrine/Tasklist.orm.xml new file mode 100644 index 0000000..2a3c922 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Tasklist.orm.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Team.orm.xml b/src/ApiBundle/Resources/config/doctrine/Team.orm.xml new file mode 100644 index 0000000..eb3d866 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/Team.orm.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/Team.orm.yml b/src/ApiBundle/Resources/config/doctrine/Team.orm.yml deleted file mode 100644 index 41603d4..0000000 --- a/src/ApiBundle/Resources/config/doctrine/Team.orm.yml +++ /dev/null @@ -1,31 +0,0 @@ -ApiBundle\Entity\Team: - type: entity - table: team - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - name: - type: string - nullable: false - length: 500 - options: - fixed: false - description: - type: text - nullable: true - length: null - options: - fixed: false - archived: - type: boolean - nullable: true - options: - default: '0' - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/TeamRole.orm.xml b/src/ApiBundle/Resources/config/doctrine/TeamRole.orm.xml new file mode 100644 index 0000000..bcebab1 --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/TeamRole.orm.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/TeamRole.orm.yml b/src/ApiBundle/Resources/config/doctrine/TeamRole.orm.yml deleted file mode 100644 index 0d8c89f..0000000 --- a/src/ApiBundle/Resources/config/doctrine/TeamRole.orm.yml +++ /dev/null @@ -1,26 +0,0 @@ -ApiBundle\Entity\TeamRole: - type: entity - table: team_role - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - name: - type: string - nullable: false - length: 500 - options: - fixed: false - description: - type: text - nullable: true - length: null - options: - fixed: false - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/TypeActivity.orm.xml b/src/ApiBundle/Resources/config/doctrine/TypeActivity.orm.xml new file mode 100644 index 0000000..eed7e4c --- /dev/null +++ b/src/ApiBundle/Resources/config/doctrine/TypeActivity.orm.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/src/ApiBundle/Resources/config/doctrine/TypeActivity.orm.yml b/src/ApiBundle/Resources/config/doctrine/TypeActivity.orm.yml deleted file mode 100644 index 4c99cce..0000000 --- a/src/ApiBundle/Resources/config/doctrine/TypeActivity.orm.yml +++ /dev/null @@ -1,27 +0,0 @@ -ApiBundle\Entity\TypeActivity: - type: entity - table: type_activity - id: - id: - type: integer - nullable: false - options: - unsigned: false - id: true - generator: - strategy: IDENTITY - fields: - type: - type: string - nullable: false - length: 100 - options: - fixed: false - patternMessage: - type: text - nullable: true - length: null - options: - fixed: false - column: pattern_message - lifecycleCallbacks: { } diff --git a/src/ApiBundle/Resources/config/doctrine/routing_rest.yml b/src/ApiBundle/Resources/config/doctrine/routing_rest.yml deleted file mode 100644 index 23f624d..0000000 --- a/src/ApiBundle/Resources/config/doctrine/routing_rest.yml +++ /dev/null @@ -1,4 +0,0 @@ -users : - type: rest - resource: "UserBundle:UserRest" - name_prefix: api_ \ No newline at end of file diff --git a/src/ApiBundle/Resources/config/routing.yml b/src/ApiBundle/Resources/config/routing.yml index 34dd86a..f568734 100644 --- a/src/ApiBundle/Resources/config/routing.yml +++ b/src/ApiBundle/Resources/config/routing.yml @@ -16,4 +16,12 @@ fos_user_resetting: fos_user_change_password: resource: "@FOSUserBundle/Resources/config/routing/change_password.xml" - prefix: /profile \ No newline at end of file + prefix: /profile + +managile_oauth_server_auth_login: + pattern: /oauth/v2/auth_login + defaults: { _controller: ApiBundle:OAuth:login } + +managile_server_auth_login_check: + path: /oauth/v2/auth_login_check + defaults: { _controller: ApiBundle:OAuth:loginCheck } \ No newline at end of file diff --git a/src/ApiBundle/Resources/views/Security/login.html.twig b/src/ApiBundle/Resources/views/Security/login.html.twig new file mode 100644 index 0000000..06a0798 --- /dev/null +++ b/src/ApiBundle/Resources/views/Security/login.html.twig @@ -0,0 +1,21 @@ +
+
+
+ OAuth Authorization +
+ {% if(error) %} +
+ {% endif %} +
+
:
+
+
+
+
:
+
+
+
+ +
+
+
\ No newline at end of file