From b999d29bb10b452525d68c49ff1780045ee4d59b Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Tue, 2 Sep 2025 09:28:22 +0200 Subject: [PATCH 1/3] fix: :bento: update logo project --- resources/assets/images/logo.png | Bin 1090 -> 3157 bytes resources/views/vendor/errors/403.blade.php | 3 +-- resources/views/vendor/errors/404.blade.php | 3 +-- resources/views/vendor/errors/503.blade.php | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/assets/images/logo.png b/resources/assets/images/logo.png index 6e5a62b8853d589d2efbf9e5f6a26bb1c29a2893..7d9cea27cc07748f9971238f5dff6b7e3e943193 100644 GIT binary patch literal 3157 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 diff --git a/resources/views/vendor/errors/403.blade.php b/resources/views/vendor/errors/403.blade.php index 08ae36b..dd72459 100644 --- a/resources/views/vendor/errors/403.blade.php +++ b/resources/views/vendor/errors/403.blade.php @@ -8,6 +8,5 @@ @section('button', true) @section('image') -{{-- FIXME: Personaliser ca --}} - + @endsection diff --git a/resources/views/vendor/errors/404.blade.php b/resources/views/vendor/errors/404.blade.php index dd14f0c..d529d28 100644 --- a/resources/views/vendor/errors/404.blade.php +++ b/resources/views/vendor/errors/404.blade.php @@ -8,6 +8,5 @@ @section('button', true) @section('image') -{{-- FIXME: Personaliser ca --}} - + @endsection diff --git a/resources/views/vendor/errors/503.blade.php b/resources/views/vendor/errors/503.blade.php index 9b4c100..12d2fa1 100644 --- a/resources/views/vendor/errors/503.blade.php +++ b/resources/views/vendor/errors/503.blade.php @@ -6,6 +6,5 @@ @section('submessage', __('Le site est en maintenance, nous reviendrons...')) @section('image') -{{-- FIXME: Personaliser ca --}} - + @endsection From 5bba7b87f4ea48d007c66c5c989df9f7f8c2f8fb Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Tue, 2 Sep 2025 12:44:53 +0200 Subject: [PATCH 2/3] fix: :bug: update document accessibility --- app/Http/Controllers/Bo/DocumentController.php | 5 +++-- app/Models/Formulary.php | 3 ++- routes/web-bo.php | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Bo/DocumentController.php b/app/Http/Controllers/Bo/DocumentController.php index 8fd2961..2a3a8e3 100644 --- a/app/Http/Controllers/Bo/DocumentController.php +++ b/app/Http/Controllers/Bo/DocumentController.php @@ -209,14 +209,15 @@ class DocumentController extends Controller /** * Download the document * + * @param string $tenant * @param string $uuid * @return \Symfony\Component\HttpFoundation\BinaryFileResponse */ - public function download(string $uuid): \Symfony\Component\HttpFoundation\BinaryFileResponse + public function download(string $tenant, string $uuid): \Symfony\Component\HttpFoundation\BinaryFileResponse { $doc = Document::where('uuid', $uuid)->firstOrFail(); $pathToFile = public_path() . Storage::url( - sprintf('docs/%s/%s.%s', \tenant()->getKey(), $doc->uuid, $doc->type) + sprintf('docs/%s/%s.%s', $tenant, $doc->uuid, $doc->type) ); return response()->download($pathToFile, $doc->path); } diff --git a/app/Models/Formulary.php b/app/Models/Formulary.php index 5800c46..b4256e9 100644 --- a/app/Models/Formulary.php +++ b/app/Models/Formulary.php @@ -8,6 +8,7 @@ use App\Traits\Models\IsRelatedToTenant; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Str; +use Stancl\Tenancy\Contracts\Tenant as BaseTenant; use Stancl\Tenancy\Database\Concerns\BelongsToTenant; use Uwil\LaravelCommon\Helpers\ToolboxHelper; @@ -104,7 +105,7 @@ class Formulary extends Model private static function assertNameIsUnique( string|null $name, ?int $id = null, - \App\Models\Tenant|\Stancl\Tenancy\Contracts\Tenant $tenant = null + Tenant|BaseTenant|null $tenant = null ) { $table = (new self())->getTable(); ToolboxHelper::assertFieldIsUnique($table, 'name', $name, $id, self::whereTenantQuery($tenant)); diff --git a/routes/web-bo.php b/routes/web-bo.php index 917f539..95b09e9 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -104,10 +104,10 @@ Route::middleware(['web', 'admin-secure'])->name('bo.')->group(function () { ])->where('direction', 'up|down') ->name('formularies.change-order'); }); - - // * Public files download - Route::get('/docs/{uuid}/download', [DocumentController::class, 'download']) - ->name('docs.download') - ->middleware('signed'); }); }); + +// Public files download. +Route::get('/{tenant}/docs/{uuid}/download', [DocumentController::class, 'download']) + ->name('docs.download') + ->middleware('signed'); From 77a2b3f12da47adab54bdd1f94e198cd898685ca Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Wed, 3 Sep 2025 14:06:14 +0200 Subject: [PATCH 3/3] fix: :bug: update document download signed route --- app/Http/Controllers/API/SyncController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php index 985ce98..60101e3 100644 --- a/app/Http/Controllers/API/SyncController.php +++ b/app/Http/Controllers/API/SyncController.php @@ -221,7 +221,7 @@ class SyncController extends Controller ->exists(sprintf('docs/%s/%s.%s', \tenant()->getKey(), $doc['uuid'], $doc['type'])); if ($exists) { array_push($attach, URL::temporarySignedRoute( - 'bo.docs.download', + 'docs.download', now()->addDays(30), ['tenant' => \tenant()->getKey(), 'uuid' => $doc['uuid']] ));