banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 02:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix phpstan in Node and EditProfile

Browse Source
This commit is contained in:
Boy132 2024-06-07 08:59:00 +02:00
parent eb99f53d87
commit f43fb985a2
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/Filament/Resources/UserResource/Pages/EditProfile.php
View File

@ -101,15 +101,18 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
->icon('tabler-shield-lock')
->schema(function () {
if ($this->getUser()->use_totp) {
/** @var User */
$user = auth()->user();
if (auth()->user()->use_totp) {
return [
Placeholder::make('2fa-already-enabled')
->label('Two Factor Authentication is currently enabled!'),
Textarea::make('backup-tokens')
->hidden(fn () => !cache()->get("users.{$this->getUser()->id}.2fa.tokens"))
->hidden(fn () => !cache()->get("users.{$user->id}.2fa.tokens"))
->rows(10)
->readOnly()
->formatStateUsing(fn () => cache()->get("users.{$this->getUser()->id}.2fa.tokens"))
->formatStateUsing(fn () => cache()->get("users.{$user->id}.2fa.tokens"))
->helperText('These will not be shown again!')
->label('Backup Tokens:'),
TextInput::make('2fa-disable-code')
@ -117,15 +120,17 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
->helperText('Enter your current 2FA code to disable Two Factor Authentication'),
];
}
/** @var TwoFactorSetupService */
$setupService = app(TwoFactorSetupService::class);
['image_url_data' => $url, 'secret' => $secret] = cache()->remember(
"users.{$this->getUser()->id}.2fa.state",
now()->addMinutes(5), fn () => $setupService->handle($this->getUser())
"users.{$user->id}.2fa.state",
now()->addMinutes(5), fn () => $setupService->handle(auth()->user())
);
$options = new QROptions([
'svgLogo' => public_path('pelican.svg'),
'svgLogoScale' => 0.05,
'addLogoSpace' => true,
'logoSpaceWidth' => 13,
'logoSpaceHeight' => 13,
@ -133,22 +138,24 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
// https://github.com/chillerlan/php-qrcode/blob/main/examples/svgWithLogo.php
// SVG logo options (see extended class)
$options->svgLogo = public_path('pelican.svg'); // logo from: https://github.com/simple-icons/simple-icons
$options->svgLogoScale = 0.05;
// $options->svgLogoCssClass = 'dark';
// QROptions
// @phpstan-ignore property.protected
$options->version = Version::AUTO;
// $options->outputInterface = QRSvgWithLogo::class;
// @phpstan-ignore property.protected
$options->outputBase64 = false;
// @phpstan-ignore property.protected
$options->eccLevel = EccLevel::H; // ECC level H is necessary when using logos
// @phpstan-ignore property.protected
$options->addQuietzone = true;
// $options->drawLightModules = true;
// @phpstan-ignore property.protected
$options->connectPaths = true;
// @phpstan-ignore property.protected
$options->drawCircularModules = true;
// $options->circleRadius = 0.45;
// @phpstan-ignore property.protected
$options->svgDefs = '<linearGradient id="gradient" x1="100%" y2="100%">
<stop stop-color="#7dd4fc" offset="0"/>
<stop stop-color="#38bdf8" offset="0.5"/>
@ -196,8 +203,8 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
])->headerActions([
Action::make('Create')
->successRedirectUrl(route('filament.admin.auth.profile', ['tab' => '-api-keys-tab']))
->action(function (Get $get, Action $action) {
$token = auth()->user()->createToken(
->action(function (Get $get, Action $action, $user) {
$token = $user->createToken(
$get('description'),
$get('allowed_ips'),
);
@ -258,7 +265,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile
]),
])
->operation('edit')
->model($this->getUser())
->model(auth()->user())
->statePath('data')
->inlineLabel(!static::isSimple()),
),

5
app/Models/Node.php
View File

@ -34,6 +34,7 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough;
* @property int $daemon_listen
* @property int $daemon_sftp
* @property string $daemon_base
* @property array $tags
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property \App\Models\Mount[]|\Illuminate\Database\Eloquent\Collection $mounts
@ -131,6 +132,10 @@ class Node extends Model
];
}
public int $servers_sum_memory;
public int $servers_sum_disk;
public int $servers_sum_cpu;
public function getRouteKeyName(): string
{
return 'id';