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

PHP-CS-Fixer run

Browse Source
This commit is contained in:
Lorenzo Milesi
2022-08-15 08:16:03 +02:00
parent 7fb900dfe1
commit ca84ceca4b
26 changed files with 233 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/User/Service/SessionHistory/DBTerminateSessionsService.php
View File

@ -11,7 +11,6 @@
namespace Da\User\Service\SessionHistory;
use yii\web\DbSession;
class DBTerminateSessionsService implements TerminateSessionsServiceInterface

11
src/User/Service/SessionHistory/SessionHistoryDecorator.php
View File

@ -16,9 +16,9 @@ use Da\User\Query\SessionHistoryCondition;
use Da\User\Query\SessionHistoryQuery;
use Da\User\Traits\ModuleAwareTrait;
use Yii;
use yii\base\InvalidArgumentException as BaseInvalidArgumentException;
use yii\db\Exception;
use yii\web\Session;
use yii\base\InvalidArgumentException as BaseInvalidArgumentException;
/**
* Decorator for the {@see Session} class for storing the 'session history'
@ -255,7 +255,6 @@ class SessionHistoryDecorator extends Session
return $result;
})
);
}
/** @inheritdoc */
@ -404,9 +403,9 @@ class SessionHistoryDecorator extends Session
}
/**
* @param string $id
* @return bool
* @param string $id
* @throws Exception
* @return bool
*/
protected function unbindSessionHistory($id)
{
@ -419,9 +418,9 @@ class SessionHistoryDecorator extends Session
/**
*
* @param int $userId
* @return bool
* @param int $userId
* @throws Exception
* @return bool
*/
protected function displacementHistory($userId)
{

1
src/User/Service/SessionHistory/TerminateSessionsService.php
View File

@ -11,7 +11,6 @@
namespace Da\User\Service\SessionHistory;
class TerminateSessionsService implements TerminateSessionsServiceInterface
{
protected $sessionIds;

1
src/User/Service/SessionHistory/TerminateSessionsServiceInterface.php
View File

@ -11,7 +11,6 @@
namespace Da\User\Service\SessionHistory;
use Da\User\Contracts\ServiceInterface;
interface TerminateSessionsServiceInterface extends ServiceInterface

5
src/User/Service/SessionHistory/TerminateUserSessionsService.php
View File

@ -11,15 +11,14 @@
namespace Da\User\Service\SessionHistory;
use Da\User\Contracts\ServiceInterface;
use Da\User\Event\SessionEvent;
use Da\User\Model\SessionHistory;
use Da\User\Model\User;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use yii\web\Session;
use Yii;
use yii\web\Session;
class TerminateUserSessionsService implements ServiceInterface
{
@ -68,7 +67,7 @@ class TerminateUserSessionsService implements ServiceInterface
}
/**
* @param int $userId
* @param int $userId
* @return User
*/
protected function getUser($userId)

17
src/User/Service/TwoFactorEmailCodeGeneratorService.php
View File

@ -13,9 +13,8 @@ namespace Da\User\Service;
use Da\TwoFA\Manager;
use Da\User\Contracts\ServiceInterface;
use Da\User\Model\User;
use Da\User\Factory\MailFactory;
use Da\User\Model\User;
use Yii;
class TwoFactorEmailCodeGeneratorService implements ServiceInterface
@ -51,14 +50,14 @@ class TwoFactorEmailCodeGeneratorService implements ServiceInterface
// send email
$mailService = MailFactory::makeTwoFactorCodeMailerService($user, $code);
// check the sending emailYii::t(
if(!$mailService->run()){
Yii::$app->session->addFlash('error', Yii::t('usuario','The email sending failed, please check your configuration.'));
if (!$mailService->run()) {
Yii::$app->session->addFlash('error', Yii::t('usuario', 'The email sending failed, please check your configuration.'));
return false;
}else{
// put key in session
Yii::$app->session->set("email_code_time", date('Y-m-d H:i:s'));
Yii::$app->session->set("email_code", $code);
}
}
// put key in session
Yii::$app->session->set("email_code_time", date('Y-m-d H:i:s'));
Yii::$app->session->set("email_code", $code);
return $code;
}
}

27
src/User/Service/TwoFactorSmsCodeGeneratorService.php
View File

@ -13,13 +13,12 @@ namespace Da\User\Service;
use Da\TwoFA\Manager;
use Da\User\Contracts\ServiceInterface;
use Da\User\Model\User;
use Da\User\Factory\MailFactory;
use yii\di\Instance;
use Da\User\Model\User;
use yetopen\smssender\SmsSenderInterface;
use yii\helpers\ArrayHelper;
use Yii;
use yii\di\Instance;
use yii\helpers\ArrayHelper;
class TwoFactorSmsCodeGeneratorService implements ServiceInterface
{
@ -49,7 +48,7 @@ class TwoFactorSmsCodeGeneratorService implements ServiceInterface
$this->type = 'sms';
$module = Yii::$app->getModule('user');
$validators = $module->twoFactorAuthenticationValidators;
$smsSender = ArrayHelper::getValue($validators,'sms'.'.smsSender');
$smsSender = ArrayHelper::getValue($validators, 'sms'.'.smsSender');
$this->smsSender = Instance::ensure($smsSender, SmsSenderInterface::class);
}
@ -63,19 +62,19 @@ class TwoFactorSmsCodeGeneratorService implements ServiceInterface
$code = str_pad($code, 6, 0, STR_PAD_LEFT);
// get the mobile phone of the user
$user = $this->user;
$mobilePhone=$user->getAuthTfMobilePhone();
if( null===$mobilePhone || $mobilePhone=='' ){
return false;
}
$mobilePhone = $user->getAuthTfMobilePhone();
if (null === $mobilePhone || $mobilePhone == '') {
return false;
}
// send sms
$success = $this->smsSender->send($mobilePhone, $code);
if($success){
if ($success) {
// put key in session
Yii::$app->session->set("sms_code_time", date('Y-m-d H:i:s'));
Yii::$app->session->set("sms_code_time", date('Y-m-d H:i:s'));
Yii::$app->session->set("sms_code", $code);
}else{
Yii::$app->session->addFlash('error', Yii::t('usuario','The sms sending failed, please check your configuration.'));
} else {
Yii::$app->session->addFlash('error', Yii::t('usuario', 'The sms sending failed, please check your configuration.'));
return false;
}
return true;