From 202db588771e5e16d1613252f717fb71d2a49003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 25 Aug 2021 09:24:01 +0200 Subject: [PATCH] Bug fix in authenticate when no token is provided --- app/Http/Middleware/Authenticate.php | 2 +- app/Providers/AppServiceProvider.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 941d1bd..6832d89 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -27,7 +27,7 @@ class Authenticate extends Middleware // TODO: check this works if (Helper::isRequestForApiV1($request)) { // Use patched v1 Auth mecanism (without bearer reimplementation) - $bearerToken = Helper::getBearerTokenFromRequest($request) ?? $request->api_token; + $bearerToken = Helper::getBearerTokenFromRequest($request) ?? $request->api_token ?? ''; $brand = Service::getFromBearerToken($bearerToken)->brand; $request->request->add(['brand_id' => $brand->id]); $response = $next($request); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 7c7e915..df4b423 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,6 +25,8 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { + //! Important pourra etre retiré quand la V1 sera supprimé + // empeche l'encapsulation dans data JsonResource::withoutWrapping(); if (!in_array(config('app.env'), ['local', 'testing'])) { URL::forceScheme('https');