Merge branch '2fa-channels-email-sms' of https://github.com/acordeddu/yii2-usuario into acordeddu-2fa-channels-email-sms

src/User/Service/TwoFactorEmailCodeGeneratorService.php

@@ -0,0 +1,64 @@
+<?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.
+ */
+
+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;
+
+class TwoFactorEmailCodeGeneratorService implements ServiceInterface
+{
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * TwoFactorEmailCodeGeneratorService constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $user = $this->user;
+        if (!$user->auth_tf_key) {
+            $user->auth_tf_key = (new Manager())->generateSecretKey();
+            $user->updateAttributes(['auth_tf_key']);
+        }
+        // generate key
+        $code = random_int(0, 999999);
+        $code = str_pad($code, 6, 0, STR_PAD_LEFT);
+        // 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.'));
+            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);
+        }        
+        return $code;
+    }
+}

src/User/Service/TwoFactorSmsCodeGeneratorService.php

@@ -0,0 +1,83 @@
+<?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.
+ */
+
+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 yetopen\smssender\SmsSenderInterface;
+use yii\helpers\ArrayHelper;
+
+use Yii;
+
+class TwoFactorSmsCodeGeneratorService implements ServiceInterface
+{
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * @var Type
+     */
+    protected $type;
+
+    /**
+     * @var SmsSenderInterface
+     */
+    protected $smsSender;
+
+    /**
+     * TwoFactorSmsCodeGeneratorService constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+        $this->type = 'sms';
+        $module = Yii::$app->getModule('user');
+        $validators = $module->twoFactorAuthenticationValidators;
+        $smsSender = ArrayHelper::getValue($validators,'sms'.'.smsSender');
+        $this->smsSender = Instance::ensure($smsSender, SmsSenderInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        // generate key
+        $code = random_int(0, 999999);
+        $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;  
+        }    
+        // send sms
+        $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;
+        }
+        return true;
+    }
+}