From 653ddde69cacf82c9ab0c9642561782aea659696 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 27 Nov 2024 15:07:46 -0500
Subject: [PATCH] run migrations in ServiceManager boot method

---
 modules/backend/ServiceProvider.php | 32 ++++++++++++++++++++++++-----
 modules/backend/models/User.php     | 17 ---------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index c81552de9d..ebd3aa3e93 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -1,13 +1,21 @@
 <?php namespace Backend;
 
-use Backend;
-use BackendMenu;
-use BackendAuth;
-use Backend\Models\UserRole;
 use Backend\Classes\WidgetManager;
-use System\Classes\MailManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
+use Backend\Models\AccessLog;
+use Backend\Models\UserRole;
+use Exception;
+use Illuminate\Support\Facades\Event;
 use System\Classes\CombineAssets;
+use System\Classes\MailManager;
 use System\Classes\SettingsManager;
+use System\Classes\UpdateManager;
+use Winter\Storm\Auth\Models\User as UserBase;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Mail;
 use Winter\Storm\Support\ModuleServiceProvider;
 
 class ServiceProvider extends ModuleServiceProvider
@@ -45,6 +53,20 @@ public function register()
     public function boot()
     {
         parent::boot('backend');
+
+        Event::listen('backend.user.login', function (\Backend\Models\User $user) {
+            $runMigrationsOnLogin = (bool) Config::get('cms.runMigrationsOnLogin', Config::get('app.debug', false));
+            if ($runMigrationsOnLogin) {
+                try {
+                    // Load version updates
+                    UpdateManager::instance()->update();
+                } catch (Exception $e) {
+                    Flash::error($e->getMessage());
+                }
+            }
+            // Log the sign in event
+            AccessLog::add($user);
+        });
     }
 
     /**
diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php
index cc5b24a4b7..37c8892a18 100644
--- a/modules/backend/models/User.php
+++ b/modules/backend/models/User.php
@@ -2,13 +2,8 @@
 
 use Backend\Facades\Backend;
 use Backend\Facades\BackendAuth;
-use Backend\Models\AccessLog;
-use Exception;
 use Illuminate\Support\Facades\Event;
-use System\Classes\UpdateManager;
 use Winter\Storm\Auth\Models\User as UserBase;
-use Winter\Storm\Support\Facades\Config;
-use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\Facades\Mail;
 
 /**
@@ -160,18 +155,6 @@ public function afterLogin()
          *
          */
         Event::fire('backend.user.login', [$this]);
-
-        $runMigrationsOnLogin = (bool) Config::get('cms.runMigrationsOnLogin', Config::get('app.debug', false));
-        if ($runMigrationsOnLogin) {
-            try {
-                // Load version updates
-                UpdateManager::instance()->update();
-            } catch (Exception $e) {
-                Flash::error($e->getMessage());
-            }
-        }
-        // Log the sign in event
-        AccessLog::add($this);
     }
 
     /**