From fd97aff3f14f424dbc4f075e8d455d6fa7d0a95c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 28 Jul 2020 23:24:01 +1000 Subject: [PATCH] Fixes for routes" git push --- app/Http/Controllers/Shop/ClientController.php | 4 ++-- app/Http/Controllers/Shop/InvoiceController.php | 4 ++-- app/Http/Controllers/Shop/ProductController.php | 4 ++-- app/Http/Middleware/Cors.php | 4 ++-- app/Http/Middleware/SetDbByCompanyKey.php | 4 ++-- routes/shop.php | 4 ++-- tests/Feature/Shop/ShopInvoiceTest.php | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Shop/ClientController.php b/app/Http/Controllers/Shop/ClientController.php index 52800c568bb9..1a52b35e638e 100644 --- a/app/Http/Controllers/Shop/ClientController.php +++ b/app/Http/Controllers/Shop/ClientController.php @@ -51,7 +51,7 @@ class ClientController extends BaseController public function show(Request $request, string $contact_key) { - $company = Company::where('company_key', $request->header('X-API-COMPANY_KEY'))->first(); + $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); if(!$company->enable_shop_api) return response()->json(['message' => 'Shop is disabled', 'errors' => []],403); @@ -66,7 +66,7 @@ class ClientController extends BaseController public function store(StoreClientRequest $request) { - $company = Company::where('company_key', $request->header('X-API-COMPANY_KEY'))->first(); + $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); if(!$company->enable_shop_api) return response()->json(['message' => 'Shop is disabled', 'errors' => []],403); diff --git a/app/Http/Controllers/Shop/InvoiceController.php b/app/Http/Controllers/Shop/InvoiceController.php index ace6fef91abd..003234f13e7d 100644 --- a/app/Http/Controllers/Shop/InvoiceController.php +++ b/app/Http/Controllers/Shop/InvoiceController.php @@ -52,7 +52,7 @@ class InvoiceController extends BaseController public function show(string $invitation_key) { - $company = Company::where('company_key', $request->header('X-API-COMPANY_KEY'))->first(); + $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); if(!$company->enable_shop_api) return response()->json(['message' => 'Shop is disabled', 'errors' => []],403); @@ -69,7 +69,7 @@ class InvoiceController extends BaseController public function store(StoreInvoiceRequest $request) { - $company = Company::where('company_key', $request->header('X-API-COMPANY_KEY'))->first(); + $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); if(!$company->enable_shop_api) return response()->json(['message' => 'Shop is disabled', 'errors' => []],403); diff --git a/app/Http/Controllers/Shop/ProductController.php b/app/Http/Controllers/Shop/ProductController.php index 77ad20530799..9489976d6f99 100644 --- a/app/Http/Controllers/Shop/ProductController.php +++ b/app/Http/Controllers/Shop/ProductController.php @@ -34,7 +34,7 @@ class ProductController extends BaseController */ public function index(Request $request) { - $company = Company::where('company_key', $request->header('X-API-COMPANY_KEY'))->first(); + $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); if(!$company->enable_shop_api) return response()->json(['message' => 'Shop is disabled', 'errors' => []],403); @@ -46,7 +46,7 @@ class ProductController extends BaseController public function show(Request $request, string $product_key) { - $company = Company::where('company_key', $request->header('X-API-COMPANY_KEY'))->first(); + $company = Company::where('company_key', $request->header('X-API-COMPANY-KEY'))->first(); if(!$company->enable_shop_api) return response()->json(['message' => 'Shop is disabled', 'errors' => []],403); diff --git a/app/Http/Middleware/Cors.php b/app/Http/Middleware/Cors.php index 56ff06fcb3b2..09586788e635 100644 --- a/app/Http/Middleware/Cors.php +++ b/app/Http/Middleware/Cors.php @@ -16,7 +16,7 @@ class Cors // ALLOW OPTIONS METHOD $headers = [ 'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE', - 'Access-Control-Allow-Headers'=> 'X-API-COMPANY_KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' + 'Access-Control-Allow-Headers'=> 'X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' ]; return Response::make('OK', 200, $headers); @@ -36,7 +36,7 @@ class Cors $response->headers->set('Access-Control-Allow-Origin', '*'); $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); - $response->headers->set('Access-Control-Allow-Headers', 'X-API-COMPANY_KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'); + $response->headers->set('Access-Control-Allow-Headers', 'X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'); $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION,X-MINIMUM-CLIENT-VERSION'); $response->headers->set('X-APP-VERSION', config('ninja.app_version')); $response->headers->set('X-MINIMUM-CLIENT-VERSION', config('ninja.minimum_client_version')); diff --git a/app/Http/Middleware/SetDbByCompanyKey.php b/app/Http/Middleware/SetDbByCompanyKey.php index 74c995127244..e2abfe9bc4e3 100644 --- a/app/Http/Middleware/SetDbByCompanyKey.php +++ b/app/Http/Middleware/SetDbByCompanyKey.php @@ -33,8 +33,8 @@ class SetDbByCompanyKey ]; - if ($request->header('X-API-COMPANY_KEY') && config('ninja.db.multi_db_enabled')) { - if (! MultiDB::findAndSetDbByCompanyKey($request->header('X-API-COMPANY_KEY'))) { + if ($request->header('X-API-COMPANY-KEY') && config('ninja.db.multi_db_enabled')) { + if (! MultiDB::findAndSetDbByCompanyKey($request->header('X-API-COMPANY-KEY'))) { return response()->json($error, 403); } } elseif (!config('ninja.db.multi_db_enabled')) { diff --git a/routes/shop.php b/routes/shop.php index aee2d2f75669..9187fdf2be8a 100644 --- a/routes/shop.php +++ b/routes/shop.php @@ -5,8 +5,8 @@ use Illuminate\Support\Facades\Route; Route::group(['middleware' => ['company_key_db','locale'], 'prefix' => 'api/v1'], function () { Route::get('shop/products', 'Shop\ProductController@index'); - Route::get('shop/clients', 'Shop\ClientController@index'); - Route::get('shop/invoices', 'Shop\InvoiceController@index'); + Route::post('shop/clients', 'Shop\ClientController@store'); + Route::post('shop/invoices', 'Shop\InvoiceController@store'); Route::get('shop/client/{contact_key}', 'Shop\ClientController@show'); Route::get('shop/invoice/{invitation_key}', 'Shop\InvoiceController@show'); Route::get('shop/product/{product_key}', 'Shop\ProductController@show'); diff --git a/tests/Feature/Shop/ShopInvoiceTest.php b/tests/Feature/Shop/ShopInvoiceTest.php index 26657dc6be0d..e921185ff1be 100644 --- a/tests/Feature/Shop/ShopInvoiceTest.php +++ b/tests/Feature/Shop/ShopInvoiceTest.php @@ -42,7 +42,7 @@ class ShopInvoiceTest extends TestCase $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), - 'X-API-COMPANY_KEY' => $this->company->company_key + 'X-API-COMPANY-KEY' => $this->company->company_key ])->get('/api/v1/shop/products'); @@ -54,7 +54,7 @@ class ShopInvoiceTest extends TestCase $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), - 'X-API-COMPANY_KEY' => $this->company->company_key + 'X-API-COMPANY-KEY' => $this->company->company_key ])->get('/api/v1/products'); @@ -72,7 +72,7 @@ class ShopInvoiceTest extends TestCase $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), - 'X-API-COMPANY_KEY' => $this->company->company_key + 'X-API-COMPANY-KEY' => $this->company->company_key ])->get('/api/v1/shop/product/'.$product->product_key); @@ -88,7 +88,7 @@ class ShopInvoiceTest extends TestCase $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), - 'X-API-COMPANY_KEY' => $this->company->company_key + 'X-API-COMPANY-KEY' => $this->company->company_key ])->get('/api/v1/shop/client/'.$this->client->contacts->first()->contact_key);