Misc fixes for shift

// TODO - re-fix the exception handler

Signed-off-by: snipe <snipe@snipe.net>

app/Exceptions/Handler.php

@@ -2,120 +2,40 @@
 
 namespace App\Exceptions;
 
-use App\Helpers\Helper;
-use Exception;
-use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Validation\ValidationException;
+use Throwable;
-use Log;
 
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of the exception types that should not be reported.
+     * A list of the exception types that are not reported.
      *
      * @var array
      */
     protected $dontReport = [
-        \Illuminate\Auth\AuthenticationException::class,
+        //
-        \Illuminate\Auth\Access\AuthorizationException::class,
-        \Symfony\Component\HttpKernel\Exception\HttpException::class,
-        \Illuminate\Database\Eloquent\ModelNotFoundException::class,
-        \Illuminate\Session\TokenMismatchException::class,
-        \Illuminate\Validation\ValidationException::class,
-        \Intervention\Image\Exception\NotSupportedException::class,
-        \League\OAuth2\Server\Exception\OAuthServerException::class,
     ];
 
     /**
-     * Report or log an exception.
+     * A list of the inputs that are never flashed for validation exceptions.
      *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     * @var array
+     */
+    protected $dontFlash = [
+        'current_password',
+        'password',
+        'password_confirmation',
+    ];
+
+    /**
+     * Register the exception handling callbacks for the application.
      *
-     * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function register()
     {
-        if ($this->shouldReport($exception)) {
+        $this->reportable(function (Throwable $e) {
-            \Log::error($exception);
+            //
-
+        });
-            return parent::report($exception);
-        }
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $e
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $e)
-    {
-
-        // CSRF token mismatch error
-        if ($e instanceof \Illuminate\Session\TokenMismatchException) {
-            return redirect()->back()->with('error', trans('general.token_expired'));
-        }
-
-        // Handle Ajax requests that fail because the model doesn't exist
-        if ($request->ajax() || $request->wantsJson()) {
-            if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
-                $className = last(explode('\\', $e->getModel()));
-
-                return response()->json(Helper::formatStandardApiResponse('error', null, $className.' not found'), 200);
-            }
-
-            if ($this->isHttpException($e)) {
-                $statusCode = $e->getStatusCode();
-
-                switch ($e->getStatusCode()) {
-                    case '404':
-                       return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode.' endpoint not found'), 404);
-                    case '405':
-                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
-                    default:
-                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), 405);
-
-                }
-            }
-        }
-
-        if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404')) {
-            return response()->view('layouts/basic', [
-                'content' => view('errors/404'),
-            ], $statusCode);
-        }
-
-        return parent::render($request, $e);
-    }
-
-    /**
-     * Convert an authentication exception into an unauthenticated response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Auth\AuthenticationException  $exception
-     * @return \Illuminate\Http\Response
-     */
-    protected function unauthenticated($request, AuthenticationException $exception)
-    {
-        if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthorized or unauthenticated.'], 401);
-        }
-
-        return redirect()->guest('login');
-    }
-
-    /**
-     * Convert a validation exception into a JSON response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Validation\ValidationException  $exception
-     * @return \Illuminate\Http\JsonResponse
-     */
-    protected function invalidJson($request, ValidationException $exception)
-    {
-        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors(), 400));
     }
 }

app/Providers/AppServiceProvider.php

@@ -42,6 +42,9 @@ class AppServiceProvider extends ServiceProvider
                 \Log::warning("'APP_FORCE_TLS' is set to true, but 'APP_URL' does not start with 'https://'. Will not force TLS on connections.");
             }
         }
+
+        \Illuminate\Pagination\Paginator::useBootstrap();
+
         Schema::defaultStringLength(191);
         Asset::observe(AssetObserver::class);
         Accessory::observe(AccessoryObserver::class);

composer.json

@@ -31,6 +31,7 @@
         "enshrined/svg-sanitize": "^0.13.3",
         "erusev/parsedown": "^1.7",
         "fideloper/proxy": "^4.4",
+        "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "intervention/image": "^2.5",
         "javiereguiluz/easyslugger": "^1.0",
@@ -39,13 +40,14 @@
         "laravel/passport": "^10.0",
         "laravel/slack-notification-channel": "^2.3",
         "laravel/tinker": "^2.5",
+        "laravel/ui": "^3.3",
         "laravelcollective/html": "^6.2",
         "league/csv": "^9.7",
         "league/flysystem-aws-s3-v3": "^1.0",
         "league/flysystem-cached-adapter": "^1.1",
         "neitanod/forceutf8": "^2.0",
         "nesbot/carbon": "^2.32",
-        "nunomaduro/collision": "^3.2",
+        "nunomaduro/collision": "^v5.4.0",
         "onelogin/php-saml": "^3.4",
         "paragonie/constant_time_encoding": "^2.3",
         "patchwork/utf8": "^1.3",
@@ -57,8 +59,7 @@
         "tecnickcom/tc-lib-barcode": "^1.15",
         "tightenco/ziggy": "^1.2",
         "unicodeveloper/laravel-password": "^1.0",
-        "watson/validating": "^6.1",
+        "watson/validating": "^6.1"
-        "fruitcake/laravel-cors": "^2.0"
     },
     "require-dev": {
         "codeception/codeception": "^4.1",

config/cors.php

@@ -4,7 +4,7 @@ return [
 
     'supportsCredentials' => false,
 
-    'allowedOrigins' => $allowed_origins,
+    'allowedOrigins' => '[*]',
 
     'allowedHeaders' => ['*'],
 

public/index.php

@@ -1,11 +1,24 @@
 <?php
 
-/**
+use Illuminate\Contracts\Http\Kernel;
- * Laravel - A PHP Framework For Web Artisans
+use Illuminate\Http\Request;
- *
+
- * @package  Laravel
+define('LARAVEL_START', microtime(true));
- * @author   Taylor Otwell <taylor@laravel.com>
+
- */
+/*
+|--------------------------------------------------------------------------
+| Check If The Application Is Under Maintenance
+|--------------------------------------------------------------------------
+|
+| If the application is in maintenance / demo mode via the "down" command
+| we will load this file so that any pre-rendered content can be shown
+| instead of starting the framework, which could cause an exception.
+|
+*/
+
+if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) {
+    require __DIR__.'/../storage/framework/maintenance.php';
+}
 
 /*
 |--------------------------------------------------------------------------
@@ -13,51 +26,30 @@
 |--------------------------------------------------------------------------
 |
 | Composer provides a convenient, automatically generated class loader for
-| our application. We just need to utilize it! We'll simply require it
+| this application. We just need to utilize it! We'll simply require it
-| into the script here so that we don't have to worry about manual
+| into the script here so we don't need to manually load our classes.
-| loading any of our classes later on. It feels nice to relax.
 |
 */
 
-require __DIR__.'/../bootstrap/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
-
-/*
-|--------------------------------------------------------------------------
-| Turn On The Lights
-|--------------------------------------------------------------------------
-|
-| We need to illuminate PHP development, so let us turn on the lights.
-| This bootstraps the framework and gets it ready for use, then it
-| will load up this application so that we can run it and send
-| the responses back to the browser and delight our users.
-|
-*/
-
-$app = require_once __DIR__.'/../bootstrap/app.php';
-
-// set the public path to this directory
-$app->bind('path.public', function() {
-    return __DIR__;
-});
 
 /*
 |--------------------------------------------------------------------------
 | Run The Application
 |--------------------------------------------------------------------------
 |
-| Once we have the application, we can handle the incoming request
+| Once we have the application, we can handle the incoming request using
-| through the kernel, and send the associated response back to
+| the application's HTTP kernel. Then, we will send the response back
-| the client's browser allowing them to enjoy the creative
+| to this client's browser, allowing them to enjoy our application.
-| and wonderful application we have prepared for them.
 |
 */
 
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
+$app = require_once __DIR__.'/../bootstrap/app.php';
 
-$response = $kernel->handle(
+$kernel = $app->make(Kernel::class);
-    $request = Illuminate\Http\Request::capture()
-);
 
-$response->send();
+$response = tap($kernel->handle(
+    $request = Request::capture()
+))->send();
 
 $kernel->terminate($request, $response);

routes/web.php

@@ -2,7 +2,6 @@
 
 use App\Http\Controllers\Account;
 use App\Http\Controllers\ActionlogController;
-use App\Http\Controllers\Auth;
 use App\Http\Controllers\CategoriesController;
 use App\Http\Controllers\CompaniesController;
 use App\Http\Controllers\DashboardController;
@@ -21,6 +20,7 @@ use App\Http\Controllers\StatuslabelsController;
 use App\Http\Controllers\SuppliersController;
 use App\Http\Controllers\ViewAssetsController;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Auth;
 
 Route::group(['middleware' => 'auth'], function () {
     /*