From 34981c8d4f92d69ed7282ddc230f2a0c22ed3647 Mon Sep 17 00:00:00 2001
From: Lorenzo Milesi <maxxer@yetopen.com>
Date: Fri, 12 Aug 2022 09:47:02 +0200
Subject: [PATCH] Files left out of merge

---
 src/User/Controller/SettingsController.php | 36 ++++++++++------------
 src/User/Model/User.php                    |  4 +--
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php
index 812089e..048c457 100755
--- a/src/User/Controller/SettingsController.php
+++ b/src/User/Controller/SettingsController.php
@@ -397,7 +397,7 @@ class SettingsController extends Controller
     public function actionConfirm($id, $code)
     {
         $user = $this->userQuery->whereId($id)->one();
-        
+
         if ($user === null || MailChangeStrategyInterface::TYPE_INSECURE === $this->module->emailChangeStrategy) {
             throw new NotFoundHttpException();
         }
@@ -454,15 +454,14 @@ class SettingsController extends Controller
     public function actionTwoFactor($id)
     {
         $choice=Yii::$app->request->post('choice');
-        /** @var User $user */        
+        /** @var User $user */
         $user = $this->userQuery->whereId($id)->one();
 
         if (null === $user) {
             throw new NotFoundHttpException();
         }
-        
-        switch($choice)
-        {
+
+        switch ($choice) {
             case 'google-authenticator':
                 $uri = $this->make(TwoFactorQrCodeUriGeneratorService::class, [$user])->run();
                 return $this->renderAjax('two-factor', ['id' => $id, 'uri' => $uri]);
@@ -473,9 +472,8 @@ class SettingsController extends Controller
                 // get mobile phone, if exists
                 $mobilePhone=$user->getAuthTfMobilePhone();
                 $smsCode = $this->make(TwoFactorSmsCodeGeneratorService::class, [$user])->run();
-                return $this->renderAjax('two-factor-sms', ['id' => $id, 'code' => $smsCode, 'mobilePhone' => $mobilePhone] );
+                return $this->renderAjax('two-factor-sms', ['id' => $id, 'code' => $smsCode, 'mobilePhone' => $mobilePhone]);
         }
-       
     }
 
     public function actionTwoFactorEnable($id)
@@ -497,17 +495,17 @@ class SettingsController extends Controller
         }
         $code = Yii::$app->request->get('code');
         $module = Yii::$app->getModule('user');
-        $validators = $module->twoFactorAuthenticationValidators; 
+        $validators = $module->twoFactorAuthenticationValidators;
         $choice = Yii::$app->request->get('choice');
-        $codeDurationTime = ArrayHelper::getValue($validators,$choice.'.codeDurationTime', 300);
-        $class = ArrayHelper::getValue($validators,$choice.'.class');
+        $codeDurationTime = ArrayHelper::getValue($validators, $choice.'.codeDurationTime', 300);
+        $class = ArrayHelper::getValue($validators, $choice.'.class');
 
         $object = $this
             ->make($class, [$user, $code, $this->module->twoFactorAuthenticationCycles]);
         $success = $object->validate();
         $success = $success && $user->updateAttributes(['auth_tf_enabled' => '1','auth_tf_type' => $choice]);
-        $message = $success? $object->getSuccessMessage():$object->getUnsuccessMessage($codeDurationTime);
-        
+        $message = $success ? $object->getSuccessMessage() : $object->getUnsuccessMessage($codeDurationTime);
+
         return [
             'success' => $success,
             'message' => $message
@@ -601,9 +599,9 @@ class SettingsController extends Controller
         Yii::$app->response->format = Response::FORMAT_JSON;
 
         /**
-        * 
         *
-        * @var User $user 
+        *
+        * @var User $user
         */
         $user = $this->userQuery->whereId($id)->one();
 
@@ -616,13 +614,13 @@ class SettingsController extends Controller
         $mobilePhone = Yii::$app->request->get('mobilephone');
         $currentMobilePhone = $user->getAuthTfMobilePhone();
         $success=false;
-        if($currentMobilePhone==$mobilePhone){
-            $success=true;    
-        }else{
+        if ($currentMobilePhone==$mobilePhone) {
+            $success=true;
+        } else {
             $success = $user->updateAttributes(['auth_tf_mobile_phone' => $mobilePhone]);
             $success = $success && $this->make(TwoFactorSmsCodeGeneratorService::class, [$user])->run();
-        }    
-        
+        }
+
         return [
                     'success' => $success,
                     'message' => $success
diff --git a/src/User/Model/User.php b/src/User/Model/User.php
index 807dd72..dbd5484 100644
--- a/src/User/Model/User.php
+++ b/src/User/Model/User.php
@@ -67,8 +67,8 @@ class User extends ActiveRecord implements IdentityInterface
     use ContainerAwareTrait;
 
     // following constants are used on secured email changing process
-    const OLD_EMAIL_CONFIRMED = 0b01;
-    const NEW_EMAIL_CONFIRMED = 0b10;
+    public const OLD_EMAIL_CONFIRMED = 0b01;
+    public const NEW_EMAIL_CONFIRMED = 0b10;
 
     /**
      * @var string Plain password. Used for model validation