Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Auth/SharpAuthorizationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,9 @@ private function deny()
{
throw new SharpAuthorizationException('Unauthorized action');
}

public function reset(): void
{
$this->cachedPolicies = [];
}
}
5 changes: 5 additions & 0 deletions src/Http/Middleware/AddLinkHeadersForPreloadedRequests.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ public function handle(Request $request, $next)
});
}

public function reset(): void
{
$this->preloadedRequests = [];
}

private function isSafari(): bool
{
return str_contains(request()->userAgent(), 'Safari')
Expand Down
37 changes: 37 additions & 0 deletions src/SharpInternalServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\ServiceProvider;
use Inertia\ServiceProvider as InertiaServiceProvider;
use Laravel\Octane\Events\RequestReceived;
use Laravel\Octane\Events\RequestTerminated;
use Laravel\Octane\Events\TaskReceived;
use Laravel\Octane\Events\TickReceived;

class SharpInternalServiceProvider extends ServiceProvider
{
Expand Down Expand Up @@ -85,6 +89,8 @@ public function boot()
setlocale(LC_ALL, config('sharp.locale'));
Carbon::setLocale(config('sharp.locale'));
}

$this->configureOctane();
}

public function register()
Expand Down Expand Up @@ -211,4 +217,35 @@ public function loadRoutes(): void
$this->loadRoutesFrom(__DIR__.'/routes/auth/impersonate.php');
}
}

private function configureOctane(): void
{
if (isset($_SERVER['LARAVEL_OCTANE'])) {
$this->app['events']->listen(RequestReceived::class, function () {
$this->resetSharp();
});

$this->app['events']->listen(TaskReceived::class, function () {
$this->resetSharp();
});

$this->app['events']->listen(TickReceived::class, function () {
$this->resetSharp();
});

$this->app['events']->listen(RequestTerminated::class, function () {
$this->resetSharp();
});
}
}

private function resetSharp()
{
$this->app->get(SharpMenuManager::class)->reset();
$this->app->get(SharpAuthorizationManager::class)->reset();
$this->app->get(SharpUploadManager::class)->reset();
$this->app->get(SharpUtil::class)->__construct();
$this->app->get(SharpImageManager::class)->__construct();
$this->app->get(AddLinkHeadersForPreloadedRequests::class)->reset();
}
}
9 changes: 9 additions & 0 deletions src/Utils/Menu/SharpMenu.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,13 @@ final public function isVisible(): bool
}

abstract public function build(): self;

final public function reset(): self
{
$this->items = [];
$this->userMenu = null;
$this->visible = true;

return $this;
}
}
8 changes: 8 additions & 0 deletions src/Utils/Menu/SharpMenuManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,12 @@ private function filterSeparators(Collection $items): Collection

return $filtered->reverse();
}

public function reset(): void
{
if ($this->menu) {
$this->menu->reset();
$this->buildMenu();
}
}
}
6 changes: 6 additions & 0 deletions src/Utils/Uploads/SharpUploadManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,10 @@ public function queueHandleTransformedFile(
'transformFilters',
);
}

public function reset(): void
{
$this->uploadedFileQueue = [];
$this->transformedFileQueue = [];
}
}
Loading