diff --git a/app/AppKernel.php b/app/AppKernel.php index ad2d8ac..896c7c9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -20,13 +20,12 @@ public function registerBundles() new JMS\I18nRoutingBundle\JMSI18nRoutingBundle(), new JMS\TranslationBundle\JMSTranslationBundle(), new Mopa\Bundle\BootstrapBundle\MopaBootstrapBundle(), - new FOS\UserBundle\FOSUserBundle(), new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(), new Knp\Bundle\MenuBundle\KnpMenuBundle(), new Eo\AirbrakeBundle\EoAirbrakeBundle(), new SumoCoders\FrameworkCoreBundle\SumoCodersFrameworkCoreBundle(), - new SumoCoders\FrameworkUserBundle\SumoCodersFrameworkUserBundle(), + new SumoCoders\FrameworkMultiUserBundle\SumoCodersFrameworkMultiUserBundle(), new SumoCoders\FrameworkSearchBundle\SumoCodersFrameworkSearchBundle(), new SumoCoders\FrameworkErrorBundle\SumoCodersFrameworkErrorBundle(), ); diff --git a/app/config/config.yml b/app/config/config.yml index 1e23154..7d2056c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,10 +3,6 @@ imports: - { resource: security.yml } - { resource: "@SumoCodersFrameworkErrorBundle/Resources/config/config.yml" } -services: - fos_user.doctrine_registry: - alias: doctrine - # Framework configuration framework: translator: { fallback: "%locale%" } @@ -111,3 +107,16 @@ swiftmailer: host: "%mailer_host%" username: "%mailer_user%" password: "%mailer_password%" + +sumo_coders_framework_multi_user: + redirect_routes: + SumoCoders\FrameworkMultiUserBundle\User\User: sumocoders_frameworkexample_bootstrap_carousel + +services: + sumocoders.in_memory_user_repository: + class: SumoCoders\FrameworkMultiUserBundle\User\InMemoryUserRepository + + sumocoders.in_memory_user_provider: + class: SumoCoders\FrameworkMultiUserBundle\Security\ObjectUserProvider + arguments: + - "@sumocoders.in_memory_user_repository" diff --git a/app/config/routing.yml b/app/config/routing.yml index 957b0ef..e70097f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -8,5 +8,6 @@ sumo_coders_framework_core: type: annotation prefix: / -sumo_coders_users_bundle: - resource: "@SumoCodersFrameworkUserBundle/Resources/config/routing.yml" +sumo_coders_framework_multi_user: + resource: "@SumoCodersFrameworkMultiUserBundle/Resources/config/routing.yml" + prefix: / diff --git a/app/config/security.yml b/app/config/security.yml index 258bfd0..937e23b 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,41 +1,33 @@ security: encoders: - FOS\UserBundle\Model\UserInterface: sha512 + SumoCoders\FrameworkMultiUserBundle\User\User: plaintext role_hierarchy: ROLE_ADMIN: ROLE_USER ROLE_SUPER_ADMIN: ROLE_ADMIN providers: - fos_userbundle: - id: fos_user.user_provider.username_email + in_memory: + id: sumocoders.in_memory_user_provider firewalls: main: + provider: in_memory pattern: ^/ - form_login: - provider: fos_userbundle - csrf_token_generator: security.csrf.token_manager - login_path: fos_user_security_login - check_path: fos_user_security_check + anonymous: ~ + guard: + authenticators: + - sumocoders.form_authenticator logout: - path: fos_user_security_logout - target: fos_user_security_login - anonymous: true - remember_me: - secret: %secret% - lifetime: 604800 - path: / + path: /%locale%/logout + target: / + dev: pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false access_control: - - { path: ^/\w\w/user/login, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/\w\w/user/request, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/\w\w/user/send-email, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/\w\w/user/check-email, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/\w\w/user/reset, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/(_(profiler|wdt|tests)|css|js)/, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/\w\w/locale.json, role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/\w\w/login, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/, role: ROLE_USER } diff --git a/composer.json b/composer.json index d6cdb55..6945e07 100644 --- a/composer.json +++ b/composer.json @@ -29,8 +29,6 @@ "sensio/distribution-bundle": "^5.0", "sensio/framework-extra-bundle": "^3.0", "incenteev/composer-parameter-handler": "^2.1", - - "friendsofsymfony/user-bundle": "2.0.x-dev", "mopa/bootstrap-bundle": "^3.0", "jms/i18n-routing-bundle": "^2.0", "jms/translation-bundle": "^1.1", @@ -38,9 +36,10 @@ "tijsverkoyen/css-to-inline-styles": "^2.0", "sumocoders/framework-error-bundle": "^3.0", - "sumocoders/framework-user-bundle": "^3.0", "sumocoders/framework-search-bundle": "^3.0", - "sumocoders/framework-example-bundle": "^4.0" + "sumocoders/framework-example-bundle": "^4.0", + "knplabs/knp-paginator-bundle": "^2.5", + "sumocoders/framework-multi-user-bundle": "dev-master" }, "require-dev": { "composer/composer": "1.0.*@dev", diff --git a/composer.lock b/composer.lock index 4fd5dca..c94f74a 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": "db29e00614ded6157b51227da96b1467", - "content-hash": "19647745fea04e590e1bd7b2f63fcf7a", + "hash": "dc930fd78e3689d1a564686c1734f1a3", + "content-hash": "4fbfefebf791015bc31900ef1ff2c98c", "packages": [ { "name": "dbtlr/php-airbrake", @@ -998,75 +998,6 @@ ], "time": "2016-02-02 11:43:50" }, - { - "name": "friendsofsymfony/user-bundle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", - "reference": "88f84f631ee7859c069cf98b475c679e90b16b22" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/16b04c49af05dd3fb381e4abe04f0e5e231ac76d", - "reference": "88f84f631ee7859c069cf98b475c679e90b16b22", - "shasum": "" - }, - "require": { - "php": ">=5.3.9", - "symfony/form": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0", - "symfony/security-bundle": "~2.3|~3.0", - "symfony/twig-bundle": "~2.3|~3.0" - }, - "require-dev": { - "doctrine/doctrine-bundle": "~1.3", - "swiftmailer/swiftmailer": "~4.3|~5", - "symfony/console": "~2.3|~3.0", - "symfony/phpunit-bridge": "~2.7|~3.0", - "symfony/validator": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0", - "willdurand/propel-typehintable-behavior": "~1.0" - }, - "suggest": { - "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "FOS\\UserBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christophe Coevoet", - "email": "stof@notk.org" - }, - { - "name": "FriendsOfSymfony Community", - "homepage": "https://github.com/friendsofsymfony/FOSUserBundle/contributors" - }, - { - "name": "Thibault Duplessis", - "email": "thibault.duplessis@gmail.com" - } - ], - "description": "Symfony FOSUserBundle", - "homepage": "http://friendsofsymfony.github.com", - "keywords": [ - "User management" - ], - "time": "2016-03-04 13:20:42" - }, { "name": "incenteev/composer-parameter-handler", "version": "v2.1.2", @@ -1533,16 +1464,16 @@ }, { "name": "knplabs/knp-paginator-bundle", - "version": "2.5.1", + "version": "2.5.3", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git", - "reference": "5147740faff4d32e6f42acf64475314c35320fa4" + "reference": "c988761005504007c6c87d6a557641281194a0e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/5147740faff4d32e6f42acf64475314c35320fa4", - "reference": "5147740faff4d32e6f42acf64475314c35320fa4", + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/c988761005504007c6c87d6a557641281194a0e5", + "reference": "c988761005504007c6c87d6a557641281194a0e5", "shasum": "" }, "require": { @@ -1557,7 +1488,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -1590,7 +1521,7 @@ "pagination", "paginator" ], - "time": "2015-11-23 17:51:40" + "time": "2016-04-20 11:40:30" }, { "name": "monolog/monolog", @@ -2237,36 +2168,27 @@ "time": "2016-03-11 14:22:15" }, { - "name": "sumocoders/framework-search-bundle", - "version": "v3.0.0", - "target-dir": "SumoCoders/FrameworkSearchBundle", + "name": "sumocoders/framework-multi-user-bundle", + "version": "dev-master", + "target-dir": "SumoCoders/FrameworkMultiUserBundle", "source": { "type": "git", - "url": "https://github.com/sumocoders/FrameworkSearchBundle.git", - "reference": "49cf181cee0d8db856f1c3444868fc401c2e5c5a" + "url": "https://github.com/sumocoders/FrameworkMultiUserBundle.git", + "reference": "8f86ae5459891a8490e0e194031b454447615ecb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sumocoders/FrameworkSearchBundle/zipball/49cf181cee0d8db856f1c3444868fc401c2e5c5a", - "reference": "49cf181cee0d8db856f1c3444868fc401c2e5c5a", + "url": "https://api.github.com/repos/sumocoders/FrameworkMultiUserBundle/zipball/8f86ae5459891a8490e0e194031b454447615ecb", + "reference": "8f86ae5459891a8490e0e194031b454447615ecb", "shasum": "" }, - "require": { - "doctrine/orm": "^2.5", - "php": "^5.5 || ^7.0", - "symfony/event-dispatcher": "^2.8" - }, "require-dev": { - "mopa/bootstrap-bundle": "^3.0", - "phpunit/phpunit": "^5.2 || ^4.8", - "symfony/form": "^2.8", - "symfony/phpunit-bridge": "^3.0", - "symfony/validator": "^2.8" + "phpunit/phpunit": "^5.2 || ^4.8" }, "type": "symfony-bundle", "autoload": { "psr-0": { - "SumoCoders\\FrameworkSearchBundle": "" + "SumoCoders\\FrameworkMultiUserBundle": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -2277,43 +2199,66 @@ { "name": "Tijs Verkoyen", "email": "tijs@sumocoders.be" + }, + { + "name": "Wouter Sioen", + "email": "wouter@sumocoders.be" + }, + { + "name": "Jelmer Prins", + "email": "jelmer@sumocoders.be" + }, + { + "name": "Stijn Vrolijk", + "email": "stijn@sumocoders.be" + }, + { + "name": "Jonas De Keukelaere", + "email": "jonas@sumocoders.be" + }, + { + "name": "Dylan Moerman", + "email": "dylan@sumocoders.be" } ], - "description": "Search bundle for our mini-framework", + "description": "The new multi user bundle for our mini-framework", "keywords": [ "SumoCoders", - "search" + "framework" ], - "time": "2016-03-04 08:39:22" + "time": "2016-04-29 09:22:39" }, { - "name": "sumocoders/framework-user-bundle", + "name": "sumocoders/framework-search-bundle", "version": "v3.0.0", - "target-dir": "SumoCoders/FrameworkUserBundle", + "target-dir": "SumoCoders/FrameworkSearchBundle", "source": { "type": "git", - "url": "https://github.com/sumocoders/FrameworkUserBundle.git", - "reference": "e7c62711ec7b27cb4c4cd4e60efa84c5d4d485af" + "url": "https://github.com/sumocoders/FrameworkSearchBundle.git", + "reference": "49cf181cee0d8db856f1c3444868fc401c2e5c5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sumocoders/FrameworkUserBundle/zipball/e7c62711ec7b27cb4c4cd4e60efa84c5d4d485af", - "reference": "e7c62711ec7b27cb4c4cd4e60efa84c5d4d485af", + "url": "https://api.github.com/repos/sumocoders/FrameworkSearchBundle/zipball/49cf181cee0d8db856f1c3444868fc401c2e5c5a", + "reference": "49cf181cee0d8db856f1c3444868fc401c2e5c5a", "shasum": "" }, "require": { - "friendsofsymfony/user-bundle": "^2.0@dev", - "knplabs/knp-paginator-bundle": "^2.5", - "php": "^5.5 || ^7.0" + "doctrine/orm": "^2.5", + "php": "^5.5 || ^7.0", + "symfony/event-dispatcher": "^2.8" }, "require-dev": { + "mopa/bootstrap-bundle": "^3.0", "phpunit/phpunit": "^5.2 || ^4.8", - "symfony/phpunit-bridge": "^3.0" + "symfony/form": "^2.8", + "symfony/phpunit-bridge": "^3.0", + "symfony/validator": "^2.8" }, "type": "symfony-bundle", "autoload": { "psr-0": { - "SumoCoders\\FrameworkUserBundle": "" + "SumoCoders\\FrameworkSearchBundle": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -2326,12 +2271,12 @@ "email": "tijs@sumocoders.be" } ], - "description": "The user bundle for our mini-framework", + "description": "Search bundle for our mini-framework", "keywords": [ "SumoCoders", - "framework" + "search" ], - "time": "2016-03-04 08:39:32" + "time": "2016-03-04 08:39:22" }, { "name": "swiftmailer/swiftmailer", @@ -3158,7 +3103,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/bb535b05ba1e23a0400ecc73adaa00d37289baf1", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/f0eb80ba341b62536531880423f10fed134dbcf9", "reference": "bb535b05ba1e23a0400ecc73adaa00d37289baf1", "shasum": "" }, @@ -5084,7 +5029,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "friendsofsymfony/user-bundle": 20, + "sumocoders/framework-multi-user-bundle": 20, "composer/composer": 20 }, "prefer-stable": true,