Merge pull request #102 from laherre/iss101

allow changing identityClass in config. [issue101]

Author: webvimark

models/forms/LoginForm.php

@@ -105,7 +105,8 @@ public function getUser()
 	{
 		if ( $this->_user === false )
 		{
-			$this->_user = User::findByUsername($this->username);
+			$u = new \Yii::$app->user->identityClass;
+			$this->_user = ($u instanceof User ? $u->findByUsername($this->username) : User::findByUsername($this->username));
 		}
 
 		return $this->_user;

models/rbacDB/AbstractItem.php

@@ -85,7 +85,7 @@ public static function addChildren($parentName, $childrenNames, $throwException
 
 		$childrenNames = (array) $childrenNames;
 
-		$dbManager = new DbManager();
+		$dbManager = Yii::$app->authManager instanceof DbManager ? Yii::$app->authManager : new DbManager();
 
 		static::beforeAddChildren($parentName, $childrenNames, $throwException = false);
 		foreach ($childrenNames as $childName)

models/rbacDB/Permission.php

@@ -17,7 +17,9 @@ class Permission extends AbstractItem
 	 */
 	public static function getUserPermissions($userId)
 	{
-		return (new DbManager())->getPermissionsByUser($userId);
+		$dbManager = Yii::$app->authManager instanceof DbManager ? Yii::$app->authManager : new DbManager();
+		
+		return $dbManager->getPermissionsByUser($userId);
 	}
 
 	/**
@@ -69,4 +71,4 @@ public static function assignRoutes($permissionName, $routes, $permissionDescrip
 
 		return true;
 	}
-}
+}