Disable broken plugins on start and add last login in user edit

Azuriom · Aug 27, 2020 · 4c93cd3 · 4c93cd3
1 parent d5cef20
commit 4c93cd3
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 # Azuriom
 
 [![Build Status](https://img.shields.io/travis/Azuriom/Azuriom/master?style=flat-square)](https://travis-ci.org/Azuriom/Azuriom)
+[![Code Quality](https://img.shields.io/scrutinizer/quality/g/Azuriom/Azuriom?style=flat-square)](https://scrutinizer-ci.com/g/Azuriom/Azuriom/)
 [![Style](https://github.styleci.io/repos/237486333/shield)](https://github.styleci.io/repos/237486333)
 [![Latest release](https://img.shields.io/github/v/release/Azuriom/Azuriom?style=flat-square&include_prereleases)](http://github.com/Azuriom/Azuriom/releases)
 [![Chat](https://img.shields.io/discord/625774284823986183?color=7289da&label=Discord&logo=discord&logoColor=fff&style=flat-square)](https://azuriom.com/discord)

diff --git a/app/Console/Commands/ThemeCreateCommand.php b/app/Console/Commands/ThemeCreateCommand.php
@@ -62,7 +62,7 @@ public function handle()
         if ($this->files->exists($path)) {
             $this->error('The theme '.$path.' already exists!');
 
-            return false;
+            return 1;
         }
 
         $this->files->makeDirectory($path);

diff --git a/app/Extensions/Plugin/PluginManager.php b/app/Extensions/Plugin/PluginManager.php
@@ -96,17 +96,25 @@ public function loadPlugins(Application $app)
 
                 $this->autoloadPlugin($pluginId, $composer, $plugin->composer);
 
-                foreach ($plugin->providers ?? [] as $pluginProvider) {
-                    $provider = new $pluginProvider($app);
+                $providers = array_map(function ($provider) use ($app) {
+                    return new $provider($app);
+                }, $plugin->providers ?? []);
 
+                foreach ($providers as $provider) {
                     if (method_exists($provider, 'bindPlugin')) {
                         $provider->bindPlugin($plugin);
                     }
 
                     $app->register($provider);
                 }
             } catch (Throwable $t) {
+                if (! $app->isProduction()) {
+                    throw $t;
+                }
+
                 report($t);
+
+                $this->disable($pluginId);
             }
         }
     }
@@ -137,8 +145,8 @@ public function pluginsPublicPath(string $path = '')
      * Get the path of the specified plugin.
      *
      * @param  string  $path
-     * @param  string|null  $plugin
-     * @return string|null
+     * @param  string  $plugin
+     * @return string
      */
     public function path(string $plugin, string $path = '')
     {
@@ -194,10 +202,6 @@ public function findDescription(string $plugin)
     {
         $path = $this->path($plugin, 'plugin.json');
 
-        if ($path === null) {
-            return null;
-        }
-
         $json = $this->getJson($path);
 
         if ($json === null) {
@@ -427,7 +431,7 @@ protected function getPlugins()
 
             return $this->plugins;
         } catch (FileNotFoundException $e) {
-            $this->plugins = $this->cachePlugins();
+            $this->plugins = $this->cachePlugins()->all();
 
             return $this->plugins;
         }

diff --git a/app/Extensions/Theme/ThemeManager.php b/app/Extensions/Theme/ThemeManager.php
@@ -189,10 +189,6 @@ public function findDescription(string $theme)
     {
         $path = $this->path('theme.json', $theme);
 
-        if ($path === null) {
-            return null;
-        }
-
         $json = $this->getJson($path);
 
         if ($json === null) {

diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
@@ -70,7 +70,7 @@ class SettingsController extends Controller
     /**
      * The application cache.
      *
-     * @var \Illuminate\Cache\Repository
+     * @var \Illuminate\Contracts\Cache\Repository
      */
     private $cache;
 

diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php
@@ -329,6 +329,7 @@
 
         'fields' => [
             'register-date' => 'Register at',
+            'last-login' => 'Last login at',
             'email-verified' => 'Email Address verified',
             '2fa' => 'Two Factor Authentication',
             'ip' => 'IP Address',

diff --git a/resources/lang/fr/admin.php b/resources/lang/fr/admin.php
@@ -329,6 +329,7 @@
         'fields' => [
             'register-date' => 'Inscrit le',
             'email-verified' => 'Adresse Email vérifiée',
+            'last-login' => 'Dernière connexion',
             '2fa' => 'Authentification à deux facteurs',
             'ip' => 'Adresse IP',
         ],

diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
@@ -124,6 +124,13 @@
                         <input type="text" class="form-control" id="registerInput" value="{{ format_date_compact($user->created_at) }}" disabled>
                     </div>
 
+                    @if($user->last_login_at)
+                        <div class="form-group">
+                            <label for="lastLoginInput">{{ trans('admin.users.fields.last-login') }}</label>
+                            <input type="text" class="form-control" id="lastLoginInput" value="{{ format_date_compact($user->last_login_at) }}" disabled>
+                        </div>
+                    @endif
+
                     <form action="{{ route('admin.users.verify', $user) }}" method="POST">
                         @csrf