From 2a0ca3b9ea1117c8d8618443d123f9bb219e4cf9 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Mon, 6 Feb 2023 05:14:08 +0800
Subject: [PATCH] Update auth table names to new standard, fix model
 association config for acl #730

---
 config/packages/catalyst_auth.yaml | 4 ++--
 config/packages/security.yaml      | 1 +
 src/Entity/Role.php                | 2 +-
 src/Entity/User.php                | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/packages/catalyst_auth.yaml b/config/packages/catalyst_auth.yaml
index cea91009..84715770 100644
--- a/config/packages/catalyst_auth.yaml
+++ b/config/packages/catalyst_auth.yaml
@@ -1,6 +1,6 @@
 catalyst_auth:
     main:
-        user_entity: "Catalyst\\UserBundle\\Entity\\User"
+        user_entity: "App\\Entity\\User"
         acl_data: 
             - id: dashboard
               label: Dashboard Access
@@ -591,7 +591,7 @@ catalyst_auth:
                   label: Delete
 
     api:
-        user_entity: "App\\Entity\\ApiUser"
+        user_entity: "Catalyst\\ApiBundle\\Entity\\User"
         acl_data:
             - id: api_test
               label: Test
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index 79a7ae0a..bcb125dd 100644
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -89,6 +89,7 @@ security:
                 lifetime: 604800
                 path: /
             user_checker: Catalyst\AuthBundle\Service\UserChecker
+            switch_user: { role: ROLE_SUPER_ADMIN }
 
             # activate different ways to authenticate
 
diff --git a/src/Entity/Role.php b/src/Entity/Role.php
index 38fcc0b2..0072e6f1 100644
--- a/src/Entity/Role.php
+++ b/src/Entity/Role.php
@@ -10,7 +10,7 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="role")
+ * @ORM\Table(name="user_role")
  * @UniqueEntity("id")
  * @UniqueEntity("name")
  */
diff --git a/src/Entity/User.php b/src/Entity/User.php
index a57afb97..a121ef5f 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -12,7 +12,7 @@ use Serializable;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="user")
+ * @ORM\Table(name="user_user")
  * @UniqueEntity("username")
  * @UniqueEntity("email")
  */
@@ -39,7 +39,7 @@ class User extends BaseUser implements Serializable
 
     /**
      * @ORM\ManyToMany(targetEntity="Role", inversedBy="users")
-     * @ORM\JoinTable(name="user_role")
+     * @ORM\JoinTable(name="user_user_role")
      */
     protected $roles;