diff --git a/backend/app/User/Controller/Auth/AuthController.php b/backend/app/User/Controller/Auth/AuthController.php index d8b59502..cbd4f33d 100755 --- a/backend/app/User/Controller/Auth/AuthController.php +++ b/backend/app/User/Controller/Auth/AuthController.php @@ -3,11 +3,11 @@ namespace App\User\Controller\Auth; use App\Http\Controllers\Controller; -use App\Http\Resources\UserResource; use App\Models\User; use App\Traits\ApiResponse; use App\User\Requests\Auth\LoginRequest; use App\User\Requests\Auth\RegisterRequest; +use App\User\Resources\UserResource; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -46,9 +46,7 @@ class AuthController extends Controller $user = Auth::user(); - return $this->successResponse([ - 'info' => new UserResource($user), - ]); + return $this->successResponse(new UserResource($user)); } return $this->errorResponse(__('messages.incorrect_or_username_password')); diff --git a/backend/app/User/Controller/ProfileController.php b/backend/app/User/Controller/ProfileController.php index b3aa09ce..c3c07706 100644 --- a/backend/app/User/Controller/ProfileController.php +++ b/backend/app/User/Controller/ProfileController.php @@ -3,10 +3,10 @@ namespace App\User\Controller; use App\Http\Controllers\Controller; -use App\Http\Resources\UserResource; use App\Traits\ApiResponse; use App\User\Requests\Profile\ChangePasswordRequest; use App\User\Requests\Profile\EditRequest; +use App\User\Resources\UserResource; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; @@ -17,11 +17,7 @@ class ProfileController extends Controller public function info(): JsonResponse { - $user = Auth::user(); - - return $this->successResponse([ - 'info' => new UserResource($user), - ]); + return $this->successResponse(new UserResource(Auth::user())); } public function edit(EditRequest $request): JsonResponse @@ -56,6 +52,5 @@ class ProfileController extends Controller ]); return $this->successResponse(); - } } diff --git a/backend/app/User/Requests/Auth/RegisterRequest.php b/backend/app/User/Requests/Auth/RegisterRequest.php index 97667b23..1c8055fe 100755 --- a/backend/app/User/Requests/Auth/RegisterRequest.php +++ b/backend/app/User/Requests/Auth/RegisterRequest.php @@ -24,7 +24,7 @@ class RegisterRequest extends FormRequest return [ 'username' => 'required|unique:users,username', 'email' => 'required|email|unique:users,email', - 'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6', + 'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6|confirmed:', ]; } } diff --git a/backend/app/Http/Resources/UserResource.php b/backend/app/User/Resources/UserResource.php similarity index 93% rename from backend/app/Http/Resources/UserResource.php rename to backend/app/User/Resources/UserResource.php index 30459058..55f98563 100755 --- a/backend/app/Http/Resources/UserResource.php +++ b/backend/app/User/Resources/UserResource.php @@ -1,6 +1,6 @@ name('login'); Route::post('logout', 'logout')->name('logout'); }); + Route::prefix('profile') ->name('profile.') + ->middleware('auth') ->controller(ProfileController::class) ->group(function () { Route::get('info', 'info')->name('info');