yeet name_first and name_last from users table
This commit is contained in:
parent
f1be653486
commit
bf9dfa87da
20 changed files with 144 additions and 82 deletions
|
@ -50,8 +50,6 @@ class MakeUserCommand extends Command
|
|||
$root_admin = $this->option('admin') ?? $this->confirm(trans('command/messages.user.ask_admin'));
|
||||
$email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
|
||||
$username = $this->option('username') ?? $this->ask(trans('command/messages.user.ask_username'));
|
||||
$name_first = $this->option('name-first') ?? $this->ask(trans('command/messages.user.ask_name_first'));
|
||||
$name_last = $this->option('name-last') ?? $this->ask(trans('command/messages.user.ask_name_last'));
|
||||
|
||||
if (is_null($password = $this->option('password')) && !$this->option('no-password')) {
|
||||
$this->warn(trans('command/messages.user.ask_password_help'));
|
||||
|
@ -59,7 +57,7 @@ class MakeUserCommand extends Command
|
|||
$password = $this->secret(trans('command/messages.user.ask_password'));
|
||||
}
|
||||
|
||||
$user = $this->creationService->handle(compact('email', 'username', 'name_first', 'name_last', 'password', 'root_admin'));
|
||||
$user = $this->creationService->handle(compact('email', 'username', 'password', 'root_admin'));
|
||||
$this->table(['Field', 'Value'], [
|
||||
['UUID', $user->uuid],
|
||||
['Email', $user->email],
|
||||
|
|
|
@ -24,30 +24,13 @@ class StoreUserRequest extends ApplicationApiRequest
|
|||
'admin_role_id',
|
||||
])->toArray();
|
||||
|
||||
$response['first_name'] = $rules['name_first'];
|
||||
$response['last_name'] = $rules['name_last'];
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
public function validated(): array
|
||||
{
|
||||
$data = parent::validated();
|
||||
|
||||
$data['name_first'] = $data['first_name'];
|
||||
$data['name_last'] = $data['last_name'];
|
||||
|
||||
unset($data['first_name'], $data['last_name']);
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
public function attributes(): array
|
||||
{
|
||||
return [
|
||||
'external_id' => 'Third Party Identifier',
|
||||
'name_first' => 'First Name',
|
||||
'name_last' => 'Last Name',
|
||||
'root_admin' => 'Root Administrator Status',
|
||||
];
|
||||
}
|
||||
|
|
|
@ -87,8 +87,6 @@ class User extends Model implements
|
|||
'external_id',
|
||||
'username',
|
||||
'email',
|
||||
'name_first',
|
||||
'name_last',
|
||||
'password',
|
||||
'language',
|
||||
'use_totp',
|
||||
|
@ -144,8 +142,6 @@ class User extends Model implements
|
|||
'email' => 'required|email|between:1,191|unique:users,email',
|
||||
'external_id' => 'sometimes|nullable|string|max:191|unique:users,external_id',
|
||||
'username' => 'required|between:1,191|unique:users,username',
|
||||
'name_first' => 'required|string|between:1,191',
|
||||
'name_last' => 'required|string|between:1,191',
|
||||
'password' => 'sometimes|nullable|string',
|
||||
'admin_role_id' => 'sometimes|nullable|exists:admin_roles,id',
|
||||
'root_admin' => 'boolean',
|
||||
|
|
|
@ -53,7 +53,7 @@ class AddedToServer extends Notification implements ShouldQueue
|
|||
public function toMail($notifiable)
|
||||
{
|
||||
return (new MailMessage())
|
||||
->greeting('Hello ' . $this->server->user . '!')
|
||||
->greeting('Hello user!')
|
||||
->line('You have been added as a subuser for the following server, allowing you certain control over the server.')
|
||||
->line('Server Name: ' . $this->server->name)
|
||||
->action('Visit Server', url('/server/' . $this->server->uuidShort));
|
||||
|
|
|
@ -54,7 +54,7 @@ class RemovedFromServer extends Notification implements ShouldQueue
|
|||
{
|
||||
return (new MailMessage())
|
||||
->error()
|
||||
->greeting('Hello ' . $this->server->user . '.')
|
||||
->greeting('Hello user!')
|
||||
->line('You have been removed as a subuser for the following server.')
|
||||
->line('Server Name: ' . $this->server->name)
|
||||
->action('Visit Panel', route('index'));
|
||||
|
|
|
@ -32,7 +32,6 @@ class SubuserObserver
|
|||
event(new Events\Subuser\Created($subuser));
|
||||
|
||||
$subuser->user->notify((new AddedToServer([
|
||||
'user' => $subuser->user->name_first,
|
||||
'name' => $subuser->server->name,
|
||||
'uuidShort' => $subuser->server->uuidShort,
|
||||
])));
|
||||
|
@ -54,7 +53,6 @@ class SubuserObserver
|
|||
event(new Events\Subuser\Deleted($subuser));
|
||||
|
||||
$subuser->user->notify((new RemovedFromServer([
|
||||
'user' => $subuser->user->name_first,
|
||||
'name' => $subuser->server->name,
|
||||
])));
|
||||
}
|
||||
|
|
|
@ -82,8 +82,6 @@ class SubuserCreationService
|
|||
$user = $this->userCreationService->handle([
|
||||
'email' => $email,
|
||||
'username' => $username,
|
||||
'name_first' => 'Server',
|
||||
'name_last' => 'Subuser',
|
||||
'root_admin' => false,
|
||||
]);
|
||||
}
|
||||
|
|
|
@ -33,8 +33,6 @@ class UserTransformer extends BaseTransformer
|
|||
'uuid' => $model->uuid,
|
||||
'username' => $model->username,
|
||||
'email' => $model->email,
|
||||
'first_name' => $model->name_first,
|
||||
'last_name' => $model->name_last,
|
||||
'language' => $model->language,
|
||||
'root_admin' => (bool) $model->root_admin,
|
||||
'2fa' => (bool) $model->use_totp,
|
||||
|
|
|
@ -26,8 +26,6 @@ class AccountTransformer extends BaseClientTransformer
|
|||
'admin' => $model->root_admin,
|
||||
'username' => $model->username,
|
||||
'email' => $model->email,
|
||||
'first_name' => $model->name_first,
|
||||
'last_name' => $model->name_last,
|
||||
'language' => $model->language,
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue