PR #458 - fix and improvement required by @mp1509

This commit is contained in:
Antonio Cordeddu
2022-08-09 12:21:34 +02:00
parent 1ea46e9952
commit 97a2de2f48
35 changed files with 287 additions and 62 deletions

View File

@ -50,12 +50,14 @@ class TwoFactorEmailCodeGeneratorService implements ServiceInterface
$code = str_pad($code, 6, 0, STR_PAD_LEFT);
// send email
$mailService = MailFactory::makeTwoFactorCodeMailerService($user, $code);
$mailService->run();
// 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);
// check the sending emailYii::t(
if(!$mailService->run()){
Yii::$app->session->addFlash('error', Yii::t('usuario','The email sending failed, please check your configuration.'));
}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);
}
return $code;
}
}

View File

@ -67,13 +67,19 @@ class TwoFactorSmsCodeGeneratorService implements ServiceInterface
if( !(null===$mobilePhone) && $mobilePhone!='' ){
// send sms
$this->smsSender->send($mobilePhone, $code);
// put key in session
Yii::$app->session->set("sms_code_time", date('Y-m-d H:i:s'));
Yii::$app->session->set("sms_code", $code);
}
return $code;
$success = $this->smsSender->send($mobilePhone, $code);
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", $code);
}else{
Yii::$app->session->addFlash('error', Yii::t('usuario','The sms sending failed, please check your configuration.'));
return false;
}
} else{
Yii::$app->session->addFlash('error', Yii::t('usuario','Mobile phone not found, please check your profile'));
return false;
}
return true;
}
}