Update auth table names to new standard, fix model association config for acl #730

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

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
 

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")
  */

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;