Skip to content

the ability to set User component by configuartion #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

the ability to set User component by configuartion #218

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2916d2e
=the ability to set User component by configuartion
taskibayev May 22, 2018
6ae7f88
setting user component id instead of user instance
taskibayev May 24, 2018
1038e1b
mend
taskibayev May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/AuthAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,19 @@ class AuthAction extends Action
*/
private $_cancelUrl;

/**
* @var string the ID of user component
* user component ID, which might be set in different module
*/
public $userComponentID;

/**
* @var instance of \yii\web\User
* user component, which is build via [[userComponentID]] property
* if [[userComponentID]] propety not set, then default app user (Yii::$app->getUser()) component will be used
*/
private $_user;


/**
* @param string $url successful URL.
Expand Down Expand Up @@ -165,7 +178,7 @@ public function getCancelUrl()
*/
protected function defaultSuccessUrl()
{
return Yii::$app->getUser()->getReturnUrl();
return $this->_user->getReturnUrl();
}

/**
Expand All @@ -174,7 +187,7 @@ protected function defaultSuccessUrl()
*/
protected function defaultCancelUrl()
{
return Url::to(Yii::$app->getUser()->loginUrl);
return Url::to($this->_user->loginUrl);
}

/**
Expand All @@ -191,6 +204,12 @@ public function run()
}
$client = $collection->getClient($clientId);

$this->_user = (!empty($this->userComponentID) && is_string($this->userComponentID)) ? Yii::createObject(["class" => $this->userComponentID]) : Yii::$app->getUser() ;

if (!($this->_user instanceof \yii\web\User)) {
throw new InvalidConfigException('"' . get_class($this) . '::$user" should be a instance of \yii\web\User.');
}

return $this->auth($client);
}

Expand Down