leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:2amigos/yii2-usuario

Browse Source
This commit is contained in:
Lorenzo Milesi
2022-09-22 11:14:28 +02:00
parent 0e7324b762 5ea3404358
commit 3ada36cbba
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/User/Controller/SettingsController.php Executable file → Normal file
View File

@ -40,6 +40,7 @@ use Da\User\Validator\TwoFactorEmailValidator;
use Da\User\Validator\TwoFactorTextMessageValidator;
use Yii;
use yii\base\DynamicModel;
use yii\base\InvalidParamException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\helpers\ArrayHelper;
@ -453,6 +454,10 @@ class SettingsController extends Controller
public function actionTwoFactor($id)
{
if(!$this->module->enableTwoFactorAuthentication){
throw new ForbiddenHttpException(Yii::t('usuario','Application not configured for two factor authentication.'));
}
if($id != Yii::$app->user->id) {
throw new ForbiddenHttpException();
}
@ -477,18 +482,20 @@ class SettingsController extends Controller
$mobilePhone = $user->getAuthTfMobilePhone();
$smsCode = $this->make(TwoFactorSmsCodeGeneratorService::class, [$user])->run();
return $this->renderAjax('two-factor-sms', ['id' => $id, 'code' => $smsCode, 'mobilePhone' => $mobilePhone]);
default:
throw new InvalidParamException("Invalid 2FA choice");
}
}
public function actionTwoFactorEnable($id)
{
if(!$this->module->enableTwoFactorAuthentication){
throw new ForbiddenHttpException(Yii::t('usuario','Application not configured for two factor authentication.'));
}
Yii::$app->response->format = Response::FORMAT_JSON;
/**
*
*
* @var User $user
*/
/** @var User $user */
$user = $this->userQuery->whereId($id)->one();
if (null === $user) {
@ -518,9 +525,15 @@ class SettingsController extends Controller
public function actionTwoFactorDisable($id)
{
if(!$this->module->enableTwoFactorAuthentication){
throw new ForbiddenHttpException(Yii::t('usuario','Application not configured for two factor authentication.'));
}
if($id != Yii::$app->user->id) {
throw new ForbiddenHttpException();
}
/**
*
*
* @var User $user
*/
$user = $this->userQuery->whereId($id)->one();
@ -529,7 +542,7 @@ class SettingsController extends Controller
throw new NotFoundHttpException();
}
if ($user->updateAttributes(['auth_tf_enabled' => '0'])) {
if ($user->updateAttributes(['auth_tf_enabled' => '0', 'auth_tf_key' => NULL])) {
Yii::$app
->getSession()
->setFlash('success', Yii::t('usuario', 'Two factor authentication has been disabled.'));