Review + Fix Exception Mail

maxdestors · maxdestors · commit 35a55019e79b · 2023-04-05T19:43:59.000+02:00
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -5,11 +5,11 @@
 use App\Mail\ExceptionOccured;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
-use Symfony\Component\Debug\ExceptionHandler as SymfonyExceptionHandler;
+use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -117,14 +117,11 @@ protected function unauthenticated($request, AuthenticationException $exception)
     public function sendEmail(Throwable $exception): void
     {
         try {
-            $content['message'] = $exception->getMessage();
-            $content['file'] = $exception->getFile();
-            $content['line'] = $exception->getLine();
-            $content['trace'] = $exception->getTrace();
-            $content['url'] = request()->url();
-            $content['body'] = request()->all();
-            $content['ip'] = request()->ip();
-            Mail::send(new ExceptionOccured($content));
+            $e = FlattenException::createFromThrowable($exception);
+            $handler = new HtmlErrorRenderer(true);
+            $css = $handler->getStylesheet();
+            $content = $handler->getBody($e);
+            Mail::send(new ExceptionOccured($content, $css));
         } catch (Throwable $exception) {
             Log::error($exception);
         }
diff --git a/app/Http/Middleware/CheckCurrentUser.php b/app/Http/Middleware/CheckCurrentUser.php
@@ -4,20 +4,18 @@
 
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
+use Symfony\Component\HttpFoundation\Response;
 
 class CheckCurrentUser
 {
     /**
      * Handle an incoming request.
      *
      * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     * 
-     * @return \Illuminate\Http\Response
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         if (! $request->user()) {
             abort(403, 'Unauthorized action.');
diff --git a/app/Http/Middleware/CheckIsUserActivated.php b/app/Http/Middleware/CheckIsUserActivated.php
@@ -6,21 +6,19 @@
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
+use Symfony\Component\HttpFoundation\Response;
 
 class CheckIsUserActivated
 {
     /**
      * Handle an incoming request.
      *
      * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     * 
-     * @return \Illuminate\Http\Response
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         if (config('settings.activation')) {
             $user = Auth::user();
diff --git a/app/Mail/ExceptionOccured.php b/app/Mail/ExceptionOccured.php
@@ -11,15 +11,17 @@ class ExceptionOccured extends Mailable
     use Queueable, SerializesModels;
 
     private $content;
+    private $css;
 
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($content)
+    public function __construct($content, $css)
     {
         $this->content = $content;
+        $this->css = $css;
     }
 
     /**
@@ -61,6 +63,7 @@ public function build()
                     ->bcc($bccEmails)
                     ->subject($subject)
                     ->view(config('exceptions.emailExceptionView'))
+                    ->with('css', $this->css)
                     ->with('content', $this->content);
     }
 }
diff --git a/resources/views/emails/exception.blade.php b/resources/views/emails/exception.blade.php
@@ -1 +1,15 @@
-{!! $content !!}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8" />
+    <style>
+        {!! $css ?? '' !!}
+    </style>
+</head>
+
+<body>
+    {!! $content ?? '' !!}
+</body>
+
+</html>
diff --git a/vite.config.js b/vite.config.js
@@ -15,9 +15,9 @@ import viteImagemin from "vite-plugin-imagemin";
 import vue from "@vitejs/plugin-vue";
 import Pages from "vite-plugin-pages";
 import generateSitemap from "vite-plugin-pages-sitemap";
-// import "jquery";
-// import $ from " jquery";
-// import jQuery from "jquery";
+import "jquery";
+import $ from "jquery";
+import jQuery from "jquery";
 
 export default ({ mode }) => {
   process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,17 @@ class ExceptionOccured extends Mailable`
`11`	`11`	`use Queueable, SerializesModels;`
`12`	`12`
`13`	`13`	`private $content;`
	`14`	`+ private $css;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* Create a new message instance.`
`17`	`18`	`*`
`18`	`19`	`* @return void`
`19`	`20`	`*/`
`20`		`- public function __construct($content)`
	`21`	`+ public function __construct($content, $css)`
`21`	`22`	`{`
`22`	`23`	`$this->content = $content;`
	`24`	`+ $this->css = $css;`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`/**`
`@@ -61,6 +63,7 @@ public function build()`
`61`	`63`	`->bcc($bccEmails)`
`62`	`64`	`->subject($subject)`
`63`	`65`	`->view(config('exceptions.emailExceptionView'))`
	`66`	`+ ->with('css', $this->css)`
`64`	`67`	`->with('content', $this->content);`
`65`	`68`	`}`
`66`	`69`	`}`