Close #15 added two factor authentication
This commit is contained in:
Antonio Ramirez
70
src/User/resources/views/security/confirm.php
Normal file
70
src/User/resources/views/security/confirm.php
Normal file
@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the 2amigos/yii2-usuario project.
|
||||
*
|
||||
* (c) 2amigOS! <http://2amigos.us/>
|
||||
*
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
use Da\User\Widget\ConnectWidget;
|
||||
use yii\helpers\Html;
|
||||
use yii\widgets\ActiveForm;
|
||||
|
||||
/**
|
||||
* @var yii\web\View $this
|
||||
* @var \Da\User\Form\LoginForm $model
|
||||
* @var \Da\User\Module $module
|
||||
*/
|
||||
|
||||
$this->title = Yii::t('usuario', 'Sign in');
|
||||
$this->params['breadcrumbs'][] = $this->title;
|
||||
?>
|
||||
|
||||
<?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<?php $form = ActiveForm::begin(
|
||||
[
|
||||
'id' => $model->formName(),
|
||||
'enableAjaxValidation' => true,
|
||||
'enableClientValidation' => false,
|
||||
'validateOnBlur' => false,
|
||||
'validateOnType' => false,
|
||||
'validateOnChange' => false,
|
||||
]
|
||||
) ?>
|
||||
<?= $form->field(
|
||||
$model,
|
||||
'twoFactorAuthenticationCode',
|
||||
['inputOptions' => ['autofocus' => 'autofocus', 'class' => 'form-control', 'tabindex' => '1']]
|
||||
) ?>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<?= Html::a(
|
||||
Yii::t('usuario', 'Cancel'),
|
||||
['login'],
|
||||
['class' => 'btn btn-default btn-block', 'tabindex' => '3']
|
||||
) ?>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<?= Html::submitButton(
|
||||
Yii::t('usuario', 'Confirm'),
|
||||
['class' => 'btn btn-primary btn-block', 'tabindex' => '3']
|
||||
) ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php ActiveForm::end(); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -10,16 +10,20 @@
|
||||
*/
|
||||
|
||||
use yii\helpers\Html;
|
||||
use yii\helpers\Url;
|
||||
use yii\widgets\ActiveForm;
|
||||
|
||||
/**
|
||||
* @var yii\web\View $this
|
||||
* @var yii\widgets\ActiveForm $form
|
||||
* @var yii\web\View $this
|
||||
* @var yii\widgets\ActiveForm $form
|
||||
* @var \Da\User\Form\SettingsForm $model
|
||||
*/
|
||||
|
||||
$this->title = Yii::t('usuario', 'Account settings');
|
||||
$this->params['breadcrumbs'][] = $this->title;
|
||||
|
||||
/** @var \Da\User\Module $module */
|
||||
$module = Yii::$app->getModule('user');
|
||||
?>
|
||||
<div class="clearfix"></div>
|
||||
|
||||
@ -68,7 +72,61 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
<?php ActiveForm::end(); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if ($module->enableTwoFactorAuthentication): ?>
|
||||
<div class="modal fade" id="tfmodal" tabindex="-1" role="dialog" aria-labelledby="tfamodalLabel"
|
||||
aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
|
||||
aria-hidden="true">×</span></button>
|
||||
<h4 class="modal-title" id="myModalLabel">
|
||||
<?= Yii::t('usuario', 'Two Factor Authentication') ?></h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
...
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">
|
||||
<?= Yii::t('usuario', 'Close') ?>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel panel-info">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title"><?= Yii::t('usuario', 'Two-Factor Authentication') ?></h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>
|
||||
<?= Yii::t('usuario', 'Two-factor auth protects you against stolen credentials') ?>.
|
||||
</p>
|
||||
<div class="text-right">
|
||||
<?= Html::a(
|
||||
Yii::t('usuario', 'Disable Two-Factor Auth'),
|
||||
['two-factor-disable', 'id' => $model->getUser()->id],
|
||||
[
|
||||
'id' => 'disable_tf_btn',
|
||||
'class' => 'btn btn-warning ' . ($model->getUser()->auth_tf_enabled ? '' : 'hide'),
|
||||
'data-method' => 'post',
|
||||
'data-confirm' => Yii::t('usuario', 'This will disable two-factor auth. Are you sure?'),
|
||||
]
|
||||
) ?>
|
||||
<?= Html::a(
|
||||
Yii::t('usuario', 'Enable Two-factor auth'),
|
||||
'#tfmodal',
|
||||
[
|
||||
'id' => 'enable_tf_btn',
|
||||
'class' => 'btn btn-info ' . ($model->getUser()->auth_tf_enabled ? 'hide' : ''),
|
||||
'data-toggle' => 'modal',
|
||||
'data-target' => '#tfmodal'
|
||||
]
|
||||
) ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php if ($model->module->allowAccountDelete): ?>
|
||||
<div class="panel panel-danger">
|
||||
<div class="panel-heading">
|
||||
@ -80,17 +138,59 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
<?= Yii::t('usuario', 'It will be deleted forever') ?>.
|
||||
<?= Yii::t('usuario', 'Please be certain') ?>.
|
||||
</p>
|
||||
<?= Html::a(
|
||||
Yii::t('usuario', 'Delete account'),
|
||||
['delete'],
|
||||
[
|
||||
'class' => 'btn btn-danger',
|
||||
'data-method' => 'post',
|
||||
'data-confirm' => Yii::t('usuario', 'Are you sure? There is no going back'),
|
||||
]
|
||||
) ?>
|
||||
<div class="text-right">
|
||||
<?= Html::a(
|
||||
Yii::t('usuario', 'Delete account'),
|
||||
['delete'],
|
||||
[
|
||||
'class' => 'btn btn-danger',
|
||||
'data-method' => 'post',
|
||||
'data-confirm' => Yii::t('usuario', 'Are you sure? There is no going back'),
|
||||
]
|
||||
) ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php if ($module->enableTwoFactorAuthentication): ?>
|
||||
|
||||
<?php
|
||||
// This script should be in fact in a module as an external file
|
||||
// consider overriding this view and include your very own approach
|
||||
$uri = Url::to(['two-factor', 'id' => $model->getUser()->id]);
|
||||
$verify = Url::to(['two-factor-enable', 'id' => $model->getUser()->id]);
|
||||
$js = <<<JS
|
||||
$('#tfmodal')
|
||||
.on('show.bs.modal', function(){
|
||||
if(!$('img#qrCode').length) {
|
||||
$(this).find('.modal-body').load('{$uri}');
|
||||
} else {
|
||||
$('input#tfcode').val('');
|
||||
}
|
||||
});
|
||||
|
||||
$(document)
|
||||
.on('click', '.btn-submit-code', function(e) {
|
||||
e.preventDefault();
|
||||
var btn = $(this);
|
||||
btn.prop('disabled', true);
|
||||
|
||||
$.getJSON('{$verify}', {code: $('#tfcode').val()}, function(data){
|
||||
btn.prop('disabled', false);
|
||||
if(data.success) {
|
||||
$('#enable_tf_btn, #disable_tf_btn').toggleClass('hide');
|
||||
$('#tfmessage').removeClass('alert-danger').addClass('alert-success').find('p').text(data.message);
|
||||
setTimeout(function() { $('#tfmodal').modal('hide'); }, 2000);
|
||||
} else {
|
||||
$('input#tfcode').val('');
|
||||
$('#tfmessage').removeClass('alert-info').addClass('alert-danger').find('p').text(data.message);
|
||||
}
|
||||
}).fail(function(){ btn.prop('disabled', false); });
|
||||
});
|
||||
JS;
|
||||
|
||||
$this->registerJs($js);
|
||||
?>
|
||||
<?php endif; ?>
|
||||
|
||||
40
src/User/resources/views/settings/two-factor.php
Normal file
40
src/User/resources/views/settings/two-factor.php
Normal file
@ -0,0 +1,40 @@
|
||||
<?php
|
||||
/*
|
||||
* This file is part of the 2amigos/yii2-usuario-app project.
|
||||
*
|
||||
* (c) 2amigOS! <http://2amigos.us/>
|
||||
*
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
/** @var string $id */
|
||||
/** @var string $uri */
|
||||
?>
|
||||
|
||||
<div class="alert alert-info" id="tfmessage">
|
||||
<p>
|
||||
<?= Yii::t(
|
||||
'usuario',
|
||||
'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.'
|
||||
) ?>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-offset-3 col-md-6 text-center">
|
||||
<img id="qrCode" src="<?= $uri ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-offset-3 col-md-6 text-center">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', 'Two-factor code') ?>"/>
|
||||
<span class="input-group-btn">
|
||||
<button type="button" class="btn btn-primary btn-submit-code">
|
||||
<?= Yii::t('usuario', 'Enable') ?>
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user