From d18e8fdc4f7721fc0655e65de8bf303b9f537183 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 28 Oct 2020 10:31:49 +0300
Subject: [PATCH] #2330 oc.com role assignment at the user registration stage

---
 .../Command/AssociateActivationRoles.php      | 50 -------------------
 .../Register2/Register2FormBuilder.php        |  9 ----
 .../Register2/Register2FormHandler.php        |  9 ++++
 3 files changed, 9 insertions(+), 59 deletions(-)
 delete mode 100644 addons/default/visiosoft/profile-module/src/Profile/Register2/Command/AssociateActivationRoles.php

diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/AssociateActivationRoles.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/AssociateActivationRoles.php
deleted file mode 100644
index 341af1439..000000000
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/AssociateActivationRoles.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php namespace Visiosoft\ProfileModule\Profile\Register2\Command;
-
-use Anomaly\UsersModule\Role\Command\GetRole;
-use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-
-/**
- * Class AssociateActivationRoles
- *
- * @link          http://openclassify.com/
- * @author        OpenClassify, Inc. <support@openclassify.com>
- * @author        Visiosoft Inc <support@openclassify.com>
- */
-class AssociateActivationRoles
-{
-
-    use DispatchesJobs;
-
-    /**
-     * The form builder.
-     *
-     * @var RegisterFormBuilder
-     */
-    protected $builder;
-
-    /**
-     * Create a new AssociateActivationRoles instance.
-     *
-     * @param RegisterFormBuilder $builder
-     */
-    public function __construct(Register2FormBuilder $builder)
-    {
-        $this->builder = $builder;
-    }
-
-    /**
-     * Handle the command.
-     */
-    public function handle()
-    {
-        /* @var UserInterface $user */
-        $user = $this->builder->getFormEntry();
-
-        foreach ($this->builder->getRoles() as $role) {
-            if ($role = $this->dispatch(new GetRole($role))) {
-                $user->attachRole($role);
-            }
-        }
-    }
-}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
index a339becc5..2604da98c 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
@@ -1,7 +1,6 @@
 <?php namespace Visiosoft\ProfileModule\Profile\Register2;
 
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
-use Visiosoft\ProfileModule\Profile\Register2\Command\AssociateActivationRoles;
 use Visiosoft\ProfileModule\Profile\Register2\Command\SetOptions;
 use Anomaly\UsersModule\User\UserModel;
 use Visiosoft\ProfileModule\Profile\Validation\ValidateRegister;
@@ -94,14 +93,6 @@ class Register2FormBuilder extends FormBuilder
         'activated_message' => 'anomaly.module.users::message.account_activated',
     ];
 
-    /**
-     * Fired after the form is saved.
-     */
-    public function onSaved()
-    {
-        $this->dispatch(new AssociateActivationRoles($this));
-    }
-
     /**
      * Get the roles.
      *
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
index 13313aa75..23f0fee96 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -1,5 +1,6 @@
 <?php namespace Visiosoft\ProfileModule\Profile\Register2;
 
+use Anomaly\UsersModule\Role\Command\GetRole;
 use Anomaly\UsersModule\User\Contract\UserInterface;
 use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
 use Anomaly\UsersModule\User\Event\UserHasRegistered;
@@ -84,6 +85,14 @@ class Register2FormHandler
                 break;
         }
 
+	    $user = $builder->getFormEntry();
+
+	    foreach ($builder->getRoles() as $role) {
+		    if ($role = $this->dispatch(new GetRole($role))) {
+			    $user->attachRole($role);
+		    }
+	    }
+
         $events->dispatch(new UserHasRegistered($user));
     }
 }