Fix urls parteners and access for social network list

config/packages/security.yaml

@@ -37,11 +37,7 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        - { path: ^/profile, roles: ROLE_USER }
-        - { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/user/, role: ROLE_USER }
+        - { path: ^/profile/, roles: ROLE_USER }
         - { path: ^/admin/, role: ROLE_ADMIN }
 
 when@test:

config/routes.yaml

@@ -1,19 +1,35 @@
 presta_sitemap:
   resource: "@PrestaSitemapBundle/config/routing.yml"
 
-controllers:
-  resource: ../src/Controller/
-  type: annotation
-
-kernel:
-  resource: ../src/Kernel.php
-  type: annotation
-
 profile:
   resource: ../src/Controller/Profile/
   type: annotation
   prefix: /profile/{_locale}
   name_prefix: profile_
+  requirements:
+    _locale: en|pt_BR
+  defaults:
+    _locale: pt_BR
+
+admin:
+  resource: ../src/Controller/Admin/
+  type: annotation
+  prefix: /admin/{_locale}
+  name_prefix: admin_
+  requirements:
+    _locale: en|pt_BR
+  defaults:
+    _locale: pt_BR
+
+site:
+  resource: ../src/Controller/Site/
+  type: annotation
+  requirements:
+    _locale: en|pt_BR
+
+kernel:
+  resource: ../src/Kernel.php
+  type: annotation
 
 # it's a fake endpoint, ThirdPartyAuthenticator will handle it.
 app_auth_third_party__callback:

src/Controller/SocialNetworkingController.php → src/Controller/Admin/SocialNetworkingController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Admin;
 
 use App\Entity\SocialNetworking;
 use App\Form\SocialNetworkingType;
@@ -12,7 +12,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
-#[Route(path: '/{_locale}/admin/socialnetworking', name: 'admin_socialnetworking_', requirements: ['_locale' => 'en|pt_BR'], defaults: ['_locale' => 'pt_BR'])]
+#[Route(path: '/socialnetworking', name: 'socialnetworking_')]
 class SocialNetworkingController extends AbstractController
 {
     public function __construct(private readonly EntityManagerInterface $entityManager)

src/Controller/UserController.php → src/Controller/Admin/UserController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Admin;
 
 use App\Entity\User;
 use App\Repository\UserRepository;
@@ -12,7 +12,7 @@
 /**
  * User controller.
  */
-#[Route(path: '/admin/{_locale}/user', name: 'admin_user_')]
+#[Route(path: '/user', name: 'user_')]
 class UserController extends AbstractController
 {
     /**

src/Controller/SecurityController.php → src/Controller/Site/SecurityController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Site;
 
 use League\OAuth2\Client\Provider\AbstractProvider;
 use LogicException;
@@ -11,10 +11,10 @@
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenException;
 
-#[Route(name: 'app_', defaults: ['_locale' => 'pt_BR'], priority: 10)]
+#[Route(name: 'app_')]
 class SecurityController extends AbstractController
 {
-    #[Route(path: '/logout/{_locale}', name: 'logout')]
+    #[Route(path: '/logout/{_locale}', name: 'logout', defaults: ['_locale' => 'pt_BR'])]
     public function logout(): never
     {
         throw new LogicException('it will be intercepted by the logout key on your firewall.');

src/Controller/SiteController.php → src/Controller/Site/SiteController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\Site;
 
 use App\Entity\User;
 use App\Repository\UserRepository;
@@ -17,7 +17,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
-#[Route(name: 'app_', requirements: ['_locale' => 'en|pt_BR'])]
+#[Route(name: 'app_')]
 class SiteController extends AbstractController
 {
     #[Route(path: '/{_locale}/privacy-policy', name: 'privacy_policy', defaults: ['_locale' => 'pt_BR'])]
@@ -36,7 +36,7 @@ public function robots(): Response
     }
 
     #[Route(path: '/{_locale}', name: 'homepage', defaults: ['_locale' => 'pt_BR'])]
-    #[Route(path: '/login/{_locale}', name: 'login')]
+    #[Route(path: '/login/{_locale}', name: 'login', defaults: ['_locale' => 'pt_BR'])]
     public function homepage(UserRepository $userRepository): Response
     {
         $users = $userRepository->findBy(['isVerified' => true], ['updatedAt' => 'desc'], 18);
@@ -52,20 +52,12 @@ public function homepage(UserRepository $userRepository): Response
         ]);
     }
 
-    #[Route(path: '/{slug}/{_locale}', name: 'user_profile', defaults: ['_locale' => 'pt_BR'])]
-    public function userProfileAction(User $user): Response
-    {
-        return $this->render('default/profile.html.twig', [
-            'user' => $user,
-        ]);
-    }
-
     /**
      * _locale need to be the last parameter because it'll be curriculum name.
      * I removed _locale default from Class because here it's required,
      *      but it can be resolved creating other controller.
      */
-    #[Route(path: '/{slug}/curriculum/{_locale}', name: 'curriculum')]
+    #[Route(path: '/curriculum/{slug}/{_locale}', name: 'curriculum')]
     public function curriculumAction(User $user): Response
     {
         return $this->render('@!Curriculum/cv01/index.html.twig', [
@@ -79,4 +71,12 @@ public function curriculumAction(User $user): Response
             UserInfoInterface::INDEX => $user,
         ]);
     }
+
+    #[Route(path: '/{slug}/{_locale}', name: 'user_profile', defaults: ['_locale' => 'pt_BR'])]
+    public function userProfileAction(User $user): Response
+    {
+        return $this->render('default/profile.html.twig', [
+            'user' => $user,
+        ]);
+    }
 }

tests/Functional/SmokeTest.php

@@ -19,13 +19,13 @@
     'Public user profile (Portuguese)' => ['/test-mock', '#home-title'],
     'Public user profile (English)' => ['/test-mock/en', '#home-title'],
 
-    'Curriculum (Portuguese)' => ['/test-mock/curriculum/pt_BR', '#name'],
-    'Curriculum (English)' => ['/test-mock/curriculum/en', '#name'],
+    'Curriculum (Portuguese)' => ['/curriculum/test-mock/pt_BR', '#name'],
+    'Curriculum (English)' => ['/curriculum/test-mock/en', '#name'],
 
     'Privacy policy (Portuguese)' => ['/pt_BR/privacy-policy', '#privacy-policy-title'],
     'Privacy policy (English)' => ['/en/privacy-policy', '#privacy-policy-title'],
 
-    'Login (Portuguese)' => ['/login/pt_BR', '#logo'],
+    'Login (Portuguese)' => ['/login', '#logo'],
     'Login (English)' => ['/login/en', '#logo'],
 
     'Main sitemap' => ['/sitemap.xml'],
@@ -46,6 +46,9 @@
     $client->request(Request::METHOD_GET, $redirectTo);
     expect($client->getResponse()->isRedirect())->toBeFalse();
 })->with([
-    'Logout (Portuguese)' => ['/logout/pt_BR', 'http://localhost/login/pt_BR'],
+    'Logout (Portuguese)' => ['/logout', 'http://localhost/login'],
     'Logout (English)' => ['/logout/en', 'http://localhost/login/en'],
+
+    'list all users - Admin' => ['/admin/en/user', '/login/en'],
+    'list all social network - Admin' => ['/admin/en/socialnetworking/', '/login/en'],
 ]);