This commit is contained in:
Naterfute
2025-10-23 19:21:26 -07:00
parent aab3075c14
commit 1e8410233a
3 changed files with 169 additions and 172 deletions

View File

@@ -19,7 +19,6 @@ class NewUserFormRequest extends AdminFormRequest
'email',
'username',
'name_first',
'name_last',
'password',
'language',
'root_admin',

View File

@@ -80,197 +80,197 @@ use Pterodactyl\Notifications\SendPasswordReset as ResetPasswordNotification;
* @mixin \Eloquent
*/
class User extends Model implements
AuthenticatableContract,
AuthorizableContract,
CanResetPasswordContract
AuthenticatableContract,
AuthorizableContract,
CanResetPasswordContract
{
use Authenticatable;
use Authorizable;
use AvailableLanguages;
use CanResetPassword;
use HasAccessTokens;
use Notifiable;
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory;
use Authenticatable;
use Authorizable;
use AvailableLanguages;
use CanResetPassword;
use HasAccessTokens;
use Notifiable;
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory;
public const USER_LEVEL_USER = 0;
public const USER_LEVEL_ADMIN = 1;
public const USER_LEVEL_USER = 0;
public const USER_LEVEL_ADMIN = 1;
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
*/
public const RESOURCE_NAME = 'user';
/**
* The resource name for this model when it is transformed into an
* API representation using fractal.
*/
public const RESOURCE_NAME = 'user';
/**
* Level of servers to display when using access() on a user.
*/
protected string $accessLevel = 'all';
/**
* Level of servers to display when using access() on a user.
*/
protected string $accessLevel = 'all';
/**
* The table associated with the model.
*/
protected $table = 'users';
/**
* The table associated with the model.
*/
protected $table = 'users';
/**
* A list of mass-assignable variables.
*/
protected $fillable = [
'external_id',
'username',
'email',
'name_first',
'name_last',
'password',
'language',
'use_totp',
'totp_secret',
'totp_authenticated_at',
'gravatar',
'root_admin',
];
/**
* A list of mass-assignable variables.
*/
protected $fillable = [
'external_id',
'username',
'email',
'name_first',
'name_last',
'password',
'language',
'use_totp',
'totp_secret',
'totp_authenticated_at',
'gravatar',
'root_admin',
];
/**
* Cast values to correct type.
*/
protected $casts = [
'root_admin' => 'boolean',
'use_totp' => 'boolean',
'gravatar' => 'boolean',
'totp_authenticated_at' => 'datetime',
];
/**
* Cast values to correct type.
*/
protected $casts = [
'root_admin' => 'boolean',
'use_totp' => 'boolean',
'gravatar' => 'boolean',
'totp_authenticated_at' => 'datetime',
];
/**
* The attributes excluded from the model's JSON form.
*/
protected $hidden = ['password', 'remember_token', 'totp_secret', 'totp_authenticated_at'];
/**
* The attributes excluded from the model's JSON form.
*/
protected $hidden = ['password', 'remember_token', 'totp_secret', 'totp_authenticated_at'];
/**
* Default values for specific fields in the database.
*/
protected $attributes = [
'external_id' => null,
'root_admin' => false,
'language' => 'en',
'use_totp' => false,
'totp_secret' => null,
];
/**
* Default values for specific fields in the database.
*/
protected $attributes = [
'external_id' => null,
'root_admin' => false,
'language' => 'en',
'use_totp' => false,
'totp_secret' => null,
];
/**
* Rules verifying that the data being stored matches the expectations of the database.
*/
public static array $validationRules = [
'uuid' => 'required|string|size:36|unique:users,uuid',
'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',
'root_admin' => 'boolean',
'language' => 'string',
'use_totp' => 'boolean',
'totp_secret' => 'nullable|string',
];
/**
* Rules verifying that the data being stored matches the expectations of the database.
*/
public static array $validationRules = [
'uuid' => 'required|string|size:36|unique:users,uuid',
'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' => 'sometimes|nullable|string|between:0,191',
'password' => 'sometimes|nullable|string',
'root_admin' => 'boolean',
'language' => 'string',
'use_totp' => 'boolean',
'totp_secret' => 'nullable|string',
];
/**
* Implement language verification by overriding Eloquence's gather
* rules function.
*/
public static function getRules(): array
{
$rules = parent::getRules();
/**
* Implement language verification by overriding Eloquence's gather
* rules function.
*/
public static function getRules(): array
{
$rules = parent::getRules();
$rules['language'][] = new In(array_keys((new self())->getAvailableLanguages()));
$rules['username'][] = new Username();
$rules['language'][] = new In(array_keys((new self())->getAvailableLanguages()));
$rules['username'][] = new Username();
return $rules;
}
return $rules;
}
/**
* Return the user model in a format that can be passed over to Vue templates.
*/
public function toVueObject(): array
{
return Collection::make($this->toArray())->except(['id', 'external_id'])->toArray();
}
/**
* Return the user model in a format that can be passed over to Vue templates.
*/
public function toVueObject(): array
{
return Collection::make($this->toArray())->except(['id', 'external_id'])->toArray();
}
/**
* Send the password reset notification.
*
* @param string $token
*/
public function sendPasswordResetNotification($token)
{
Activity::event('auth:reset-password')
->withRequestMetadata()
->subject($this)
->log('sending password reset email');
/**
* Send the password reset notification.
*
* @param string $token
*/
public function sendPasswordResetNotification($token)
{
Activity::event('auth:reset-password')
->withRequestMetadata()
->subject($this)
->log('sending password reset email');
$this->notify(new ResetPasswordNotification($token));
}
$this->notify(new ResetPasswordNotification($token));
}
/**
* Store the username as a lowercase string.
*/
public function setUsernameAttribute(string $value)
{
$this->attributes['username'] = mb_strtolower($value);
}
/**
* Store the username as a lowercase string.
*/
public function setUsernameAttribute(string $value)
{
$this->attributes['username'] = mb_strtolower($value);
}
/**
* Return a concatenated result for the accounts full name.
*/
public function getNameAttribute(): string
{
return trim($this->name_first . ' ' . $this->name_last);
}
/**
* Return a concatenated result for the accounts full name.
*/
public function getNameAttribute(): string
{
return trim($this->name_first . ' ' . $this->name_last);
}
/**
* Returns all servers that a user owns.
*/
public function servers(): HasMany
{
return $this->hasMany(Server::class, 'owner_id');
}
/**
* Returns all servers that a user owns.
*/
public function servers(): HasMany
{
return $this->hasMany(Server::class, 'owner_id');
}
public function apiKeys(): HasMany
{
return $this->hasMany(ApiKey::class)
->where('key_type', ApiKey::TYPE_ACCOUNT);
}
public function apiKeys(): HasMany
{
return $this->hasMany(ApiKey::class)
->where('key_type', ApiKey::TYPE_ACCOUNT);
}
public function recoveryTokens(): HasMany
{
return $this->hasMany(RecoveryToken::class);
}
public function recoveryTokens(): HasMany
{
return $this->hasMany(RecoveryToken::class);
}
public function sshKeys(): HasMany
{
return $this->hasMany(UserSSHKey::class);
}
public function sshKeys(): HasMany
{
return $this->hasMany(UserSSHKey::class);
}
/**
* Returns all the activity logs where this user is the subject — not to
* be confused by activity logs where this user is the _actor_.
*/
public function activity(): MorphToMany
{
return $this->morphToMany(ActivityLog::class, 'subject', 'activity_log_subjects');
}
/**
* Returns all the activity logs where this user is the subject — not to
* be confused by activity logs where this user is the _actor_.
*/
public function activity(): MorphToMany
{
return $this->morphToMany(ActivityLog::class, 'subject', 'activity_log_subjects');
}
/**
* Returns all the servers that a user can access by way of being the owner of the
* server, or because they are assigned as a subuser for that server.
*/
public function accessibleServers(): Builder
{
return Server::query()
->select('servers.id', 'servers.name', 'servers.owner_id')
->leftJoin('subusers', 'subusers.server_id', '=', 'servers.id')
->where(function (Builder $builder) {
$builder->where('servers.owner_id', $this->id)->orWhere('subusers.user_id', $this->id);
})
->groupBy('servers.id', 'servers.name', 'servers.owner_id');
}
/**
* Returns all the servers that a user can access by way of being the owner of the
* server, or because they are assigned as a subuser for that server.
*/
public function accessibleServers(): Builder
{
return Server::query()
->select('servers.id', 'servers.name', 'servers.owner_id')
->leftJoin('subusers', 'subusers.server_id', '=', 'servers.id')
->where(function (Builder $builder) {
$builder->where('servers.owner_id', $this->id)->orWhere('subusers.user_id', $this->id);
})
->groupBy('servers.id', 'servers.name', 'servers.owner_id');
}
}

View File

@@ -36,7 +36,6 @@
<tr>
<th>ID</th>
<th>Email</th>
<th>Client Name</th>
<th>Username</th>
<th class="text-center">2FA</th>
<th class="text-center"><span data-toggle="tooltip" data-placement="top" title="Servers that this user is marked as the owner of.">Servers Owned</span></th>
@@ -49,7 +48,6 @@
<tr class="align-middle">
<td><code>{{ $user->id }}</code></td>
<td><a href="{{ route('admin.users.view', $user->id) }}">{{ $user->email }}</a> @if($user->root_admin)<i class="fa fa-star text-yellow"></i>@endif</td>
<td>{{ $user->name_last }}, {{ $user->name_first }}</td>
<td>{{ $user->username }}</td>
<td class="text-center">
@if($user->use_totp)