From 72398f0ac9ba32e4e24c0027d34cbd18809e8b48 Mon Sep 17 00:00:00 2001
From: jayvirsinh_gohil <gohiljsyvirsinh02@gmail.com>
Date: Sat, 4 Dec 2021 15:42:45 +0530
Subject: [PATCH] rename cron job issue

---
 .../{CronJobOrgController.php => CronJobController.php}       | 2 +-
 app/Http/Kernel.php                                           | 2 +-
 .../{CronJobOrgMiddleware.php => CronJobMiddleware.php}       | 4 ++--
 config/services.php                                           | 2 +-
 routes/api.php                                                | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename app/Http/Controllers/V1/Webhook/{CronJobOrgController.php => CronJobController.php} (91%)
 rename app/Http/Middleware/{CronJobOrgMiddleware.php => CronJobMiddleware.php} (71%)

diff --git a/app/Http/Controllers/V1/Webhook/CronJobOrgController.php b/app/Http/Controllers/V1/Webhook/CronJobController.php
similarity index 91%
rename from app/Http/Controllers/V1/Webhook/CronJobOrgController.php
rename to app/Http/Controllers/V1/Webhook/CronJobController.php
index dcc922ae..7acd8e68 100644
--- a/app/Http/Controllers/V1/Webhook/CronJobOrgController.php
+++ b/app/Http/Controllers/V1/Webhook/CronJobController.php
@@ -6,7 +6,7 @@ use Crater\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 
-class CronJobOrgController extends Controller
+class CronJobController extends Controller
 {
     /**
      * Handle the incoming request.
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index af98bef2..def40b1f 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -69,7 +69,7 @@ class Kernel extends HttpKernel
         'redirect-if-unauthenticated' => \Crater\Http\Middleware\RedirectIfUnauthorized::class,
         'customer-guest' => \Crater\Http\Middleware\CustomerGuest::class,
         'company' => \Crater\Http\Middleware\CompanyMiddleware::class,
-        'cron-job-org' => \Crater\Http\Middleware\CronJobOrgMiddleware::class,
+        'cron-job' => \Crater\Http\Middleware\CronJobMiddleware::class,
     ];
 
     /**
diff --git a/app/Http/Middleware/CronJobOrgMiddleware.php b/app/Http/Middleware/CronJobMiddleware.php
similarity index 71%
rename from app/Http/Middleware/CronJobOrgMiddleware.php
rename to app/Http/Middleware/CronJobMiddleware.php
index 74250c82..379b3ab7 100644
--- a/app/Http/Middleware/CronJobOrgMiddleware.php
+++ b/app/Http/Middleware/CronJobMiddleware.php
@@ -5,7 +5,7 @@ namespace Crater\Http\Middleware;
 use Closure;
 use Illuminate\Http\Request;
 
-class CronJobOrgMiddleware
+class CronJobMiddleware
 {
     /**
      * Handle an incoming request.
@@ -16,7 +16,7 @@ class CronJobOrgMiddleware
      */
     public function handle(Request $request, Closure $next)
     {
-        if ($request->header('Authorization-token')) {
+        if ($request->header('x-authorization-token') && $request->header('x-authorization-token') == config('services.cron_job.auth_token')) {
             return $next($request);
         }
 
diff --git a/config/services.php b/config/services.php
index e14d6063..c9254a8b 100644
--- a/config/services.php
+++ b/config/services.php
@@ -62,7 +62,7 @@ return [
         'redirect' => env('GITHUB_REDIRECT_URL'),
     ],
 
-    'cron_job_org' => [
+    'cron_job' => [
         'auth_token' => env('CRON_JOB_AUTH_TOKEN', 0)
     ],
 ];
diff --git a/routes/api.php b/routes/api.php
index 5b75c8eb..bd69ad47 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -80,7 +80,7 @@ use Crater\Http\Controllers\V1\Installation\FinishController;
 use Crater\Http\Controllers\V1\Installation\LoginController;
 use Crater\Http\Controllers\V1\Installation\OnboardingWizardController;
 use Crater\Http\Controllers\V1\Installation\RequirementsController;
-use Crater\Http\Controllers\V1\Webhook\CronJobOrgController;
+use Crater\Http\Controllers\V1\Webhook\CronJobController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -439,4 +439,4 @@ Route::prefix('/v1')->group(function () {
     });
 });
 
-Route::get('/cron', CronJobOrgController::class)->middleware('cron-job-org');
+Route::get('/cron', CronJobController::class)->middleware('cron-job');