From 18ec3e2c3dd58d4a6cdab83508b960345a96502b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Sep 2021 14:10:02 +0800
Subject: [PATCH 1/2] protect user routes with valid token middleware

---
 routes/account.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/routes/account.php b/routes/account.php
index 5b4d45f9..2da67709 100644
--- a/routes/account.php
+++ b/routes/account.php
@@ -10,6 +10,14 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
         Route::group(['middleware' => 'valid.token'], function () {
             Route::get('/logout', 'UserAuthenticationLogoutController@logout')->name('logout');
             Route::get('/refresh', 'RefreshAuthenticationTokenController@refresh')->name('refresh');
+            Route::group(['prefix' => 'user', 'as' => 'user.'], function () {
+                Route::post('/show', 'FetchUserController@fetch')->name('show');
+                Route::get('/list', 'ListUsersController@list')->name('list');
+                Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
+
+                Route::post('/admin/create', 'CreateAdminUserController@create')->name('admin.create');
+                Route::delete('/delete/{id}', 'DeleteUserController@delete')->name('delete');
+            });
         });
 
          Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () {
@@ -34,12 +42,5 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
     });
 
 
-    Route::group(['prefix' => 'user', 'as' => 'user.'], function () {
-        Route::post('/show', 'FetchUserController@fetch')->name('show');
-        Route::get('/list', 'ListUsersController@list')->name('list');
-        Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
-        
-        Route::post('/admin/create', 'CreateAdminUserController@create')->name('admin.create');
-        Route::delete('/delete/{id}', 'DeleteUserController@delete')->name('delete');
-    });
+
 });
\ No newline at end of file

From 7282c24ee086a0b2e1b748c14506378ea4bd39d3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Sep 2021 19:02:52 +0800
Subject: [PATCH 2/2] clean up add new member logic

---
 .../ControllersLogic/AddNewMemberLogic.php      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
index 5b15b689..1744f50c 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
@@ -2,23 +2,17 @@
 
 namespace App\Classes\Modules\Accounts\ControllersLogic;
 
-use App\Classes\Exceptions\ErrorException;
 use App\Classes\Exceptions\ResourceConflictException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
 use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
 use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Http\Resources\UserResource;
-use App\Models\User;
-use Carbon\Carbon;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 
 class AddNewMemberLogic extends AbstractControllerLogic
@@ -37,17 +31,18 @@ class AddNewMemberLogic extends AbstractControllerLogic
      */
     private $assignEmployeeProcessor;
 
-    /** @var CreateUserProcessor */
-    private $createUserProcessor;
     /**
      * @var GenerateEmailVerificationAttemptProcessor
      */
     private $generateEmailVerificationAttemptProcessor;
 
-
-    public function __construct(CreateUserProcessor $createUserProcessor, AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    /**
+     * AddNewMemberLogic constructor.
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     */
+    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
     {
-        $this->createUserProcessor = $createUserProcessor;
         $this->assignEmployeeProcessor = $assignEmployeeProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
     }