diff --git a/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php index eafd55a3..3f9f0b3d 100644 --- a/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php +++ b/app/Classes/Modules/Accounts/ControllersLogic/FetchUserLogic.php @@ -48,7 +48,7 @@ class FetchUserLogic extends AbstractControllerLogic public function logic(Request $request) : JsonResponse { try { - + $this->canFetchUser->passes(); $query = $this->fetchessUser->execute(['id' => $request->input('user_id')]); diff --git a/app/Http/Controllers/Accounts/UserAuthenticationController.php b/app/Http/Controllers/Accounts/UserAuthenticationController.php index fdf4442d..fd2dd9ed 100644 --- a/app/Http/Controllers/Accounts/UserAuthenticationController.php +++ b/app/Http/Controllers/Accounts/UserAuthenticationController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Accounts; use App\Classes\Modules\Accounts\ControllersLogic\AuthenticateUserLogic; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Http; class UserAuthenticationController { @@ -15,6 +16,11 @@ class UserAuthenticationController * @return JsonResponse */ public function authenticate(Request $request, AuthenticateUserLogic $logic): JsonResponse { + + $response = Http::withToken('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zaGlwcGluZy1wb3J0YWwudGVzdFwvYXBpXC92MVwvYWNjb3VudFwvYXV0aGVudGljYXRpb25cL2xvZ2luXC9hdHRlbXB0IiwiaWF0IjoxNjMwNTY4NzU5LCJleHAiOjk5NDY5ODc4Mjk5LCJuYmYiOjE2MzA1Njg3NTksImp0aSI6ImQ0NGZTbnNtdlQ1Z0FrN20iLCJ1c2VyIjp7ImlkIjoyLCJuYW1lIjoiQWRtaW4iLCJlbWFpbCI6ImFkbWluQGNpZWYtbWFsYXlzaWEuY29tIiwidHlwZSI6Miwic3RhdHVzIjoyfSwic3ViIjoyLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.1FM75NcuRA7g-s4uqXP43TY6AeY1e6mkEl3QAk6R0WQ')->get('http://shipping-portal.test/api/v1/account/user/list')->object(); + + dd($response); + return $logic->execute($request); } diff --git a/app/Http/Middleware/ValidateToken.php b/app/Http/Middleware/ValidateToken.php index 846972aa..4e13e65c 100644 --- a/app/Http/Middleware/ValidateToken.php +++ b/app/Http/Middleware/ValidateToken.php @@ -33,6 +33,8 @@ class ValidateToken */ public function handle($request, Closure $next) { + return response()->json(['status' =>2, 'msg' => $this->manager->getPayload()]); + try { if(!$this->manager->check()){ throw new AccessUnauthorisedException(); } diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 0c13b854..1511cfec 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware * @var array */ protected $except = [ - // + 'api/v1/*', ]; } diff --git a/routes/account.php b/routes/account.php index 5b4d45f9..cd230f7c 100644 --- a/routes/account.php +++ b/routes/account.php @@ -33,13 +33,15 @@ 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'); + 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