Добавлена конвертация старых запросов к аккаунтам в новые

This commit is contained in:
ErickSkrauch
2017-09-21 20:00:13 +03:00
parent d2b7f28db6
commit 0198a3e010
2 changed files with 37 additions and 2 deletions

View File

@@ -16,12 +16,23 @@ class DefaultController extends Controller {
public function behaviors(): array {
$paramsCallback = function() {
$id = Yii::$app->request->get('id');
if ($id === null) {
$identity = Yii::$app->user->getIdentity();
if ($identity !== null) {
$account = $identity->getAccount();
if ($account !== null) {
$id = $account->id;
}
}
}
return [
'accountId' => Yii::$app->request->get('id'),
'accountId' => $id,
];
};
return ArrayHelper::merge(Controller::behaviors(), [
return ArrayHelper::merge(parent::behaviors(), [
'access' => [
'class' => AccessControl::class,
'rules' => [
@@ -121,6 +132,18 @@ class DefaultController extends Controller {
return (new TwoFactorAuthInfo($this->findAccount($id)))->getCredentials();
}
public function bindActionParams($action, $params) {
if (!isset($params['id'])) {
/** @noinspection NullPointerExceptionInspection */
$account = Yii::$app->user->getIdentity()->getAccount();
if ($account !== null) {
$params['id'] = $account->id;
}
}
return parent::bindActionParams($action, $params);
}
private function findAccount(int $id): Account {
$account = Account::findOne($id);
if ($account === null) {