Refactoring services #885

common/controllers/CommonController.php

@@ -76,7 +76,7 @@ class CommonController extends \yii\web\Controller
         return Yii::$app->urlManagerBackend;
     }
 
-    public function getUserCurrent(): User
+    public function getUserCurrent(): ?User
     {
         return Yii::$app->user->identity;
     }

common/logic/User/User/Service/UserBuilder.php

@@ -25,8 +25,8 @@ class UserBuilder extends AbstractBuilder
 
     public function initPassword(User $user, string $password)
     {
-        $user->setPassword($password);
-        $user->generateAuthKey();
+        $this->setPassword($user, $password);
+        $this->generateAuthKey($user);
     }
 
     public function initProducer(User $user, Producer $producer)

frontend/controllers/SiteController.php

@@ -254,19 +254,17 @@ class SiteController extends FrontendController
         if ($model->load(Yii::$app->request->post())) {
             $user = $model->signup();
 
-            if ($user) {
-                if ($this->getUser()->login($user)) {
-                    if ($model->isProducer()) {
-                        $this->redirect(Yii::$app->urlManagerBackend->createAbsoluteUrl(['site/index']));
+            if ($user && $this->getUserCurrent()->login($user)) {
+                if ($model->isProducer()) {
+                    $this->redirect(Yii::$app->urlManagerBackend->createAbsoluteUrl(['site/index']));
+                }
+                else {
+                    $producer = $producerManager->findOneProducerById($model->id_producer);
+                    if ($producer) {
+                        $this->redirect($this->getUrlManagerProducer()->createAbsoluteUrl(['site/index', 'slug_producer' => $producer->slug]));
                     }
                     else {
-                        $producer = $producerManager->findOneProducerById($model->id_producer);
-                        if ($producer) {
-                            $this->redirect($this->getUrlManagerProducer()->createAbsoluteUrl(['site/index', 'slug_producer' => $producer->slug]));
-                        }
-                        else {
-                            $this->redirect(['site/index']);
-                        }
+                        $this->redirect(['site/index']);
                     }
                 }
             }

frontend/forms/SignupForm.php

@@ -251,7 +251,7 @@ class SignupForm extends Model
 
             if ($user->save() && $producer) {
                 // Liaison User / Producer
-                $producerManager->addUser($user->id, $idProducer);
+                $producerManager->addUser($user, $producer);
 
                 // Envoi d'un email de bienvenue à l'utilisateur
                 if ($this->isCustomer()) {