diff --git a/.env.example b/.env.example index 47a20e74..dd614b1e 100644 --- a/.env.example +++ b/.env.example @@ -50,4 +50,7 @@ FILESYSTEM_DRIVER="documents" JWT_SECRET= JWT_TTL=1440 -IS_PRODUCTION=false \ No newline at end of file +IS_PRODUCTION=false + +SHIPPING_URL=https://dev.portal.izyim.com/ +MIX_SHIPPING_URL="${SHIPPING_URL}" \ No newline at end of file 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; } diff --git a/resources/assets/vue/components/accounts/forms/CrossLoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/CrossLoginFormComponent.vue index 70fd4844..a2d51ca6 100644 --- a/resources/assets/vue/components/accounts/forms/CrossLoginFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/CrossLoginFormComponent.vue @@ -48,7 +48,8 @@ parameters: { email: this.email, password: '' - } + }, + shipping_url: process.env.MIX_SHIPPING_URL, }; }, methods: { @@ -56,7 +57,7 @@ this.submit(this.route('api.account.authentication.authenticate.attempt'), 'post', this.section, false, false) }, successHandler(response){ - window.parent.postMessage({"data": response}, 'http://shipping-portal.test'); + window.parent.postMessage({"data": response}, this.shipping_url); }, }, mixins: [loginFormValidation] diff --git a/routes/account.php b/routes/account.php index cd230f7c..977273c8 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 () { @@ -33,15 +41,6 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account Route::post('/verification/resend', 'ResendEmailVerificationController@resend')->name('verification.resend'); }); - Route::group(['middleware' => 'valid.token'], function () { - 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 + +});