mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-10-17 02:03:16 +01:00
Compare commits
1 Commits
feature/co
...
e1ec883459
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1ec883459 |
@@ -1,22 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use Filament\Http\Middleware\Authenticate as Middleware;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class AuthenticateFilamentPanel extends Middleware
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The admin panel has no login page of its own (it shares the app's
|
|
||||||
* session-based login), so Filament::getLoginUrl() always returns null.
|
|
||||||
* Fall back to the app's login route so guests are redirected instead
|
|
||||||
* of receiving an empty 401 response.
|
|
||||||
*/
|
|
||||||
protected function redirectTo($request): ?string
|
|
||||||
{
|
|
||||||
return parent::redirectTo($request) ?? ($request->expectsJson() ? null : route('login'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,7 +9,7 @@ use App\Filament\Widgets\ServerOverview;
|
|||||||
use App\Filament\Widgets\TimeEntriesCreated;
|
use App\Filament\Widgets\TimeEntriesCreated;
|
||||||
use App\Filament\Widgets\TimeEntriesImported;
|
use App\Filament\Widgets\TimeEntriesImported;
|
||||||
use App\Filament\Widgets\UserRegistrations;
|
use App\Filament\Widgets\UserRegistrations;
|
||||||
use App\Http\Middleware\AuthenticateFilamentPanel;
|
use Filament\Http\Middleware\Authenticate;
|
||||||
use Filament\Http\Middleware\DisableBladeIconComponents;
|
use Filament\Http\Middleware\DisableBladeIconComponents;
|
||||||
use Filament\Http\Middleware\DispatchServingFilamentEvent;
|
use Filament\Http\Middleware\DispatchServingFilamentEvent;
|
||||||
use Filament\Navigation\NavigationGroup;
|
use Filament\Navigation\NavigationGroup;
|
||||||
@@ -87,7 +87,7 @@ class AdminPanelProvider extends PanelProvider
|
|||||||
DispatchServingFilamentEvent::class,
|
DispatchServingFilamentEvent::class,
|
||||||
])
|
])
|
||||||
->authMiddleware([
|
->authMiddleware([
|
||||||
AuthenticateFilamentPanel::class,
|
Authenticate::class,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$modules = Module::allEnabled();
|
$modules = Module::allEnabled();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('MAIL_MAILER', 'smtp'),
|
'default' => env('MAIL_MAILER', 'log'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ export async function getPasswordResetUrl(
|
|||||||
for (let attempt = 0; attempt < 5; attempt++) {
|
for (let attempt = 0; attempt < 5; attempt++) {
|
||||||
searchResult = await searchEmails(
|
searchResult = await searchEmails(
|
||||||
request,
|
request,
|
||||||
`to:${encodeURIComponent(recipientEmail)} subject:"Reset your password"`
|
`to:${encodeURIComponent(recipientEmail)} subject:"Reset Password"`
|
||||||
);
|
);
|
||||||
if (searchResult.messages.length > 0) break;
|
if (searchResult.messages.length > 0) break;
|
||||||
await new Promise((resolve) => setTimeout(resolve, 500));
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
{
|
{
|
||||||
"Billing": {
|
"Billing": {
|
||||||
"repository": "solidtime-io/extension-billing",
|
"repository": "solidtime-io/extension-billing",
|
||||||
"ref": "v0.0.7"
|
"ref": "feature/composer-update"
|
||||||
},
|
},
|
||||||
"Services": {
|
"Services": {
|
||||||
"repository": "solidtime-io/extension-services",
|
"repository": "solidtime-io/extension-services",
|
||||||
"ref": "v0.0.3"
|
"ref": "feature/composer-update"
|
||||||
},
|
},
|
||||||
"Invoicing": {
|
"Invoicing": {
|
||||||
"repository": "solidtime-io/extension-invoicing",
|
"repository": "solidtime-io/extension-invoicing",
|
||||||
"ref": "v0.0.7"
|
"ref": "feature/composer-update"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user