fixed bug after register/login, that the user has no role

fixed change pw length in filter
kokspflanze · May 18, 2015 · be89e6b · be89e6b
1 parent 4cbe643
commit be89e6b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/PServerCMS/Controller/AuthController.php b/src/PServerCMS/Controller/AuthController.php
@@ -31,7 +31,9 @@ public function registerAction()
             }
         }
 
-        return [ 'registerForm' => $form ];
+        return [
+            'registerForm' => $form
+        ];
     }
 
     /**
@@ -70,7 +72,9 @@ public function registerConfirmAction()
             }
         }
 
-        return [ 'registerForm' => $form ];
+        return [
+            'registerForm' => $form
+        ];
     }
 
     public function ipConfirmAction()
@@ -108,7 +112,9 @@ public function pwLostAction()
             }
         }
 
-        return [ 'pwLostForm' => $form ];
+        return [
+            'pwLostForm' => $form
+        ];
     }
 
     public function pwLostDoneAction()
@@ -134,7 +140,9 @@ public function pwLostConfirmAction()
             }
         }
 
-        return [ 'pwLostForm' => $form ];
+        return [
+            'pwLostForm' => $form
+        ];
     }
 
     public function pwLostConfirmDoneAction()

diff --git a/src/PServerCMS/Entity/User.php b/src/PServerCMS/Entity/User.php
@@ -59,13 +59,13 @@ class User implements UserInterface
 
     /**
      * @var \Doctrine\Common\Collections\Collection|UserRole[]
-     * @ORM\ManyToMany(targetEntity="PServerCMS\Entity\UserRole", mappedBy="user")
+     * @ORM\ManyToMany(targetEntity="PServerCMS\Entity\UserRole", mappedBy="user", fetch="EAGER")
      */
     private $userRole;
 
     /**
      * @var \Doctrine\Common\Collections\Collection|UserExtension[]
-     * @ORM\OneToMany(targetEntity="UserExtension", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="UserExtension", mappedBy="user", fetch="EAGER")
      * @ORM\JoinColumn(name="usrId", referencedColumnName="userId")
      */
     private $userExtension;

diff --git a/src/PServerCMS/Entity/UserExtension.php b/src/PServerCMS/Entity/UserExtension.php
@@ -28,7 +28,7 @@ class UserExtension
 
     /**
      * @var string
-     * @ORM\Column(name="key", type="string", length=255, nullable=false)
+     * @ORM\Column(name="`key`", type="string", length=255, nullable=false)
      */
     private $key;
 

diff --git a/src/PServerCMS/Form/ChangePwdFilter.php b/src/PServerCMS/Form/ChangePwdFilter.php
@@ -18,7 +18,7 @@ public function __construct(){
                     'name'    => 'StringLength',
                     'options' => array(
                         'min' => 6,
-                        'max' => 16,
+                        'max' => 32,
                     ),
                 ),
             ),
@@ -32,7 +32,7 @@ public function __construct(){
 					'name'    => 'StringLength',
 					'options' => array(
 						'min' => 6,
-						'max' => 16,
+						'max' => 32,
 					),
 				),
 			),
@@ -47,7 +47,7 @@ public function __construct(){
 					'name'    => 'StringLength',
 					'options' => array(
 						'min' => 6,
-						'max' => 16,
+						'max' => 32,
 					),
 				),
 				array(

diff --git a/src/PServerCMS/Service/User.php b/src/PServerCMS/Service/User.php
@@ -542,9 +542,6 @@ public function doAuthentication( UserInterface $user )
         $userNew = $repository->getUser4UserName( $user->getUsername() );
 
         $authService = $this->getAuthService();
-        // FIX: no roles after register
-        $userNew->getUserRole();
-        $userNew->getUserExtension();
 
         $authService->getStorage()->write( $userNew );
     }