fix: email reemplazado por username en controladores
This commit is contained in:
parent
927c46aa2e
commit
1d7afe1b9a
@ -33,17 +33,15 @@ public function index()
|
|||||||
$query->where('name', 'developer');
|
$query->where('name', 'developer');
|
||||||
})->orderBy('name');
|
})->orderBy('name');
|
||||||
|
|
||||||
QuerySupport::queryByKeys($users, ['name', 'email']);
|
QuerySupport::queryByKeys($users, ['name', 'username']);
|
||||||
|
|
||||||
return ApiResponse::OK->response([
|
return ApiResponse::OK->response([
|
||||||
/* 'models' => $users->paginate(config('app.pagination')), */
|
|
||||||
'users' => $users->select([
|
'users' => $users->select([
|
||||||
'id',
|
'id',
|
||||||
'name',
|
'name',
|
||||||
'paternal',
|
'paternal',
|
||||||
'maternal',
|
'maternal',
|
||||||
'username',
|
'username',
|
||||||
'email',
|
|
||||||
'module_id',
|
'module_id',
|
||||||
'deleted_at'
|
'deleted_at'
|
||||||
])->paginate(config('app.pagination'))
|
])->paginate(config('app.pagination'))
|
||||||
|
|||||||
@ -23,11 +23,11 @@ class AuthController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function login(LoginRequest $request)
|
public function login(LoginRequest $request)
|
||||||
{
|
{
|
||||||
$user = User::where('email', $request->get('email'))->first();
|
$user = User::where('username', $request->get('username'))->first();
|
||||||
|
|
||||||
if (!$user || !$user->validateForPassportPasswordGrant($request->get('password'))) {
|
if (!$user || !$user->validateForPassportPasswordGrant($request->get('password'))) {
|
||||||
return ApiResponse::UNPROCESSABLE_CONTENT->response([
|
return ApiResponse::UNPROCESSABLE_CONTENT->response([
|
||||||
'email' => ['Usuario no valido']
|
'username' => ['Usuario no valido']
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -181,7 +181,7 @@ public function update(DeviceUpdateRequest $request, $id)
|
|||||||
->map(fn($dm) => [
|
->map(fn($dm) => [
|
||||||
'id' => $dm->user->id,
|
'id' => $dm->user->id,
|
||||||
'name' => $dm->user->full_name,
|
'name' => $dm->user->full_name,
|
||||||
'email' => $dm->user->email,
|
'username' => $dm->user->username,
|
||||||
])
|
])
|
||||||
->unique('id')
|
->unique('id')
|
||||||
->values(),
|
->values(),
|
||||||
|
|||||||
@ -899,7 +899,7 @@ public function exportSearchRecords(Request $request)
|
|||||||
'vehicle.tag.module:id,name',
|
'vehicle.tag.module:id,name',
|
||||||
'files:id,record_id,name_id,path,md5',
|
'files:id,record_id,name_id,path,md5',
|
||||||
'files.catalogName:id,name',
|
'files.catalogName:id,name',
|
||||||
'user:id,name,email,module_id',
|
'user:id,name,username,module_id',
|
||||||
'module:id,name',
|
'module:id,name',
|
||||||
'error:id,code,description',
|
'error:id,code,description',
|
||||||
'vehicle.vehicleTagLogs' => function ($q) {
|
'vehicle.vehicleTagLogs' => function ($q) {
|
||||||
|
|||||||
@ -322,7 +322,7 @@ public function searchRecord(Request $request)
|
|||||||
'files.catalogName:id,name',
|
'files.catalogName:id,name',
|
||||||
|
|
||||||
// Operador y módulo
|
// Operador y módulo
|
||||||
'user:id,name,email,module_id',
|
'user:id,name,username,module_id',
|
||||||
'module:id,name',
|
'module:id,name',
|
||||||
|
|
||||||
// Error si existe
|
// Error si existe
|
||||||
@ -462,7 +462,7 @@ public function searchRecord(Request $request)
|
|||||||
'operator' => $record->user ? [
|
'operator' => $record->user ? [
|
||||||
'id' => $record->user->id,
|
'id' => $record->user->id,
|
||||||
'name' => $record->user->name,
|
'name' => $record->user->name,
|
||||||
'email' => $record->user->email,
|
'username' => $record->user->username,
|
||||||
] : null,
|
] : null,
|
||||||
|
|
||||||
// VEHÍCULO
|
// VEHÍCULO
|
||||||
|
|||||||
@ -22,9 +22,9 @@ public function index(Request $request)
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$modules = Module::with([
|
$modules = Module::with([
|
||||||
'responsible:id,name,email',
|
'responsible:id,name,username',
|
||||||
'municipality:id,code,name',
|
'municipality:id,code,name',
|
||||||
'users:id,name,paternal,maternal,email,module_id',
|
'users:id,name,paternal,maternal,username,module_id',
|
||||||
'users.roles:id,name,description'
|
'users.roles:id,name,description'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@ -107,9 +107,9 @@ public function show($id)
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$modules = Module::with([
|
$modules = Module::with([
|
||||||
'responsible:id,name,email',
|
'responsible:id,name,username',
|
||||||
'municipality:id,code,name',
|
'municipality:id,code,name',
|
||||||
'users:id,name,paternal,maternal,email,module_id',
|
'users:id,name,paternal,maternal,username,module_id',
|
||||||
'users.roles:id,name,description'
|
'users.roles:id,name,description'
|
||||||
])->find($id);
|
])->find($id);
|
||||||
|
|
||||||
|
|||||||
@ -31,10 +31,10 @@ public function index(Request $request)
|
|||||||
'tags.status:id,code,name',
|
'tags.status:id,code,name',
|
||||||
'tags.vehicle:id,placa,niv',
|
'tags.vehicle:id,placa,niv',
|
||||||
'tags.module:id,name',
|
'tags.module:id,name',
|
||||||
'user:id,name,email'
|
'user:id,name,username'
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
$packages->with('user:id,name,email');
|
$packages->with('user:id,name,username');
|
||||||
}
|
}
|
||||||
|
|
||||||
$packages->withCount('tags')->orderBy('id', 'ASC');
|
$packages->withCount('tags')->orderBy('id', 'ASC');
|
||||||
@ -74,7 +74,7 @@ public function index(Request $request)
|
|||||||
'created_by' => $package->user ? [
|
'created_by' => $package->user ? [
|
||||||
'id' => $package->user->id,
|
'id' => $package->user->id,
|
||||||
'name' => $package->user->name,
|
'name' => $package->user->name,
|
||||||
'email' => $package->user->email,
|
'username' => $package->user->username,
|
||||||
] : null,
|
] : null,
|
||||||
'estadisticas' => [
|
'estadisticas' => [
|
||||||
'total' => $package->tags->count(),
|
'total' => $package->tags->count(),
|
||||||
@ -460,7 +460,7 @@ public function getBoxTags(Request $request)
|
|||||||
'created_by' => $package->user ? [
|
'created_by' => $package->user ? [
|
||||||
'id' => $package->user->id,
|
'id' => $package->user->id,
|
||||||
'name' => $package->user->name,
|
'name' => $package->user->name,
|
||||||
'email' => $package->user->email,
|
'username' => $package->user->username,
|
||||||
] : null,
|
] : null,
|
||||||
],
|
],
|
||||||
'tags' => $paginatedTags,
|
'tags' => $paginatedTags,
|
||||||
|
|||||||
@ -32,11 +32,11 @@ public function rules(): array
|
|||||||
'name' => ['required', 'string', 'max:255'],
|
'name' => ['required', 'string', 'max:255'],
|
||||||
'paternal' => ['required', 'string', 'max:255'],
|
'paternal' => ['required', 'string', 'max:255'],
|
||||||
'maternal' => ['required', 'string', 'max:255'],
|
'maternal' => ['required', 'string', 'max:255'],
|
||||||
'email' => [
|
'username' => [
|
||||||
'required',
|
'required',
|
||||||
'string',
|
'string',
|
||||||
'email',
|
|
||||||
'max:255',
|
'max:255',
|
||||||
|
'alpha_dash',
|
||||||
Rule::unique('users')->ignore(auth()->user()->id),
|
Rule::unique('users')->ignore(auth()->user()->id),
|
||||||
],
|
],
|
||||||
'phone' => ['nullable', 'numeric', 'digits:10'],
|
'phone' => ['nullable', 'numeric', 'digits:10'],
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<x-mail::message>
|
<x-mail::message>
|
||||||
{{ __('auth.forgot.description') }}
|
{{ __('auth.forgot.description') }}
|
||||||
|
|
||||||
<x-mail::button :url="config('app.frontend_url') . '/auth.html#/reset-password?token=' . $token . '&email=' . $user->email">
|
<x-mail::button :url="config('app.frontend_url') . '/auth.html#/reset-password?token=' . $token . '&username=' . $user->username">
|
||||||
{{ __('auth.forgot.reset') }}
|
{{ __('auth.forgot.reset') }}
|
||||||
</x-mail::button>
|
</x-mail::button>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user