Skip to content

Commit 7e93b1c

Browse files
committed
wip
1 parent 6579ac5 commit 7e93b1c

5 files changed

Lines changed: 27 additions & 9 deletions

File tree

app/Filament/Resources/Profiles/Concerns/ResolvesRecord.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ public function mount($record = null): void
1414
$this->authorizeAccess();
1515
}
1616

17-
$this->callHook('beforeFill');
17+
if (! method_exists($this, 'hasInfolist') || ! $this->hasInfolist()) {
18+
$this->fillForm();
19+
} else {
20+
$this->callHook('beforeFill');
21+
}
1822
}
1923
}

app/Http/Middleware/EnsureUserIsActive.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace App\Http\Middleware;
66

77
use Closure;
8+
use Filament\Facades\Filament;
89
use Illuminate\Http\Request;
910
use Illuminate\Support\Facades\Auth;
1011
use Symfony\Component\HttpFoundation\Response;
@@ -27,7 +28,7 @@ public function handle(Request $request, Closure $next): Response
2728
$request->session()->invalidate();
2829
$request->session()->regenerateToken();
2930

30-
return redirect()->route('filament.auth.login')
31+
return redirect()->to(Filament::getLoginUrl())
3132
->with('error', __('user.inactive_error'));
3233
}
3334
}

app/Providers/Filament/AdminPanelProvider.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
use App\Filament\Resources\Beneficiaries\BeneficiaryResource;
1212
use App\Filament\Resources\Profiles\ProfileResource;
1313
use App\Filament\Resources\Vacations\VacationResource;
14+
use App\Http\Middleware\EnsureUserHasCompletedProfile;
15+
use App\Http\Middleware\EnsureUserIsActive;
16+
use App\Http\Middleware\FixMissingPasswordSetAtAttribute;
1417
use App\Models\User;
1518
use Filament\Actions\Action;
1619
use Filament\Http\Middleware\Authenticate;
@@ -114,6 +117,9 @@ public function panel(Panel $panel): Panel
114117
})
115118
->authMiddleware([
116119
Authenticate::class,
120+
EnsureUserIsActive::class,
121+
EnsureUserHasCompletedProfile::class,
122+
FixMissingPasswordSetAtAttribute::class,
117123
]);
118124
}
119125

tests/Unit/ExampleTest.php

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/Unit/SanitizeTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use App\Services\Sanitize;
6+
7+
it('sanitizes urls', function () {
8+
$this->assertSame('http://www.example.com', Sanitize::url('www.example.com'));
9+
$this->assertSame('https://example.com', Sanitize::url('https://example.com'));
10+
$this->assertSame('https://example.com/path/to/resource', Sanitize::url('https://example.com/path/to/resource'));
11+
$this->assertSame('https://example.com/path/to/resource', Sanitize::url(' https://example.com/path/to/resource '));
12+
$this->assertSame('https://example.com/path/to/resourcealert("xss")', Sanitize::url('https://example.com/path/to/resource<script>alert("xss")</script>'));
13+
$this->assertSame('https://example.com/path/to/resource?param=alert("xss")', Sanitize::url('https://example.com/path/to/resource?param=<script>alert("xss")</script>'));
14+
});

0 commit comments

Comments
 (0)