Merge pull request #8599 from ProcessMaker/bugfix/FOUR-27846-develop

FOUR-27846 Multitenancy - Set the global container instance when switching

Author: nolanpro

ProcessMaker/Application.php

@@ -3,6 +3,7 @@
 namespace ProcessMaker;
 
 use Igaster\LaravelTheme\Facades\Theme;
+use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application as IlluminateApplication;
 use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
@@ -12,6 +13,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
+use ProcessMaker\Console\Kernel;
 use ProcessMaker\Multitenancy\Tenant;
 use ProcessMaker\Multitenancy\TenantBootstrapper;
 
@@ -112,4 +114,11 @@ public function bootstrapWith(array $bootstrappers)
 
         return parent::bootstrapWith($bootstrappers);
     }
+
+    public function reactivateConsoleApp()
+    {
+        Container::setInstance($this);
+        $this->hasBeenBootstrapped = false;
+        $this->make(Kernel::class)->bootstrap();
+    }
 }

ProcessMaker/Multitenancy/TenantBootstrapper.php

@@ -26,21 +26,6 @@ class TenantBootstrapper
 
     private $app = null;
 
-    public static $landlordKeysToSave = [
-        'APP_URL',
-        'APP_KEY',
-        'LOG_PATH',
-        'DB_USERNAME',
-        'DB_PASSWORD',
-        'DB_HOSTNAME',
-        'DB_PORT',
-        'LANDLORD_DB_DATABASE',
-        'REDIS_PREFIX',
-        'CACHE_SETTING_PREFIX',
-        'SCRIPT_MICROSERVICE_CALLBACK',
-        'CACHE_PREFIX',
-    ];
-
     public function bootstrap(Application $app)
     {
         try {
@@ -116,6 +101,14 @@ private function setTenantEnvironmentVariables($tenantData)
         $this->set('LOG_PATH', $this->app->storagePath('logs/processmaker.log'));
     }
 
+    // Used for debugging
+    public static function log($message)
+    {
+        $message = '[TenantBootstrapper] ' . $message;
+        $today = date('Y-m-d');
+        file_put_contents(base_path('storage/logs/processmaker-' . $today . '.log'), date('Y-m-d H:i:s') . ' ' . $message . PHP_EOL, FILE_APPEND);
+    }
+
     private function getOriginalValue($key, $default = '')
     {
         if (self::$landlordValues === []) {

ProcessMaker/Providers/ProcessMakerServiceProvider.php

@@ -258,51 +258,19 @@ private static function bootstrapTenantApp(JobProcessing|JobRetryRequested $even
                 return;
             }
 
-            // Save the landlord's config values so we can reset them later
-            if (self::$landlordValues === null) {
-                foreach (TenantBootstrapper::$landlordKeysToSave as $key) {
-                    self::$landlordValues[$key] = $_SERVER[$key] ?? '';
-                }
-            }
-
             // Create a new tenant app instance
             $_SERVER['TENANT'] = $tenantId;
-            $_ENV['TENANT'] = $tenantId;
 
             if (!isset(self::$tenantAppContainers[$tenantId])) {
-                $tenantApp = require app()->bootstrapPath('app.php');
-                $tenantApp->instance('landlordValues', self::$landlordValues);
-                $tenantApp->make(\Illuminate\Contracts\Console\Kernel::class)->bootstrap();
-                self::$tenantAppContainers[$tenantId] = $tenantApp;
+                self::$tenantAppContainers[$tenantId] = require base_path('bootstrap/app.php');
             }
+            self::$tenantAppContainers[$tenantId]->reactivateConsoleApp();
 
             // Change the job's app service container to the tenant app
             $event->job->getRedisQueue()->setContainer(self::$tenantAppContainers[$tenantId]);
         }
     }
 
-    private static function resetTenantApp($event): void
-    {
-        if (!method_exists($event->job, 'getRedisQueue')) {
-            // Not a redis job
-            return;
-        }
-
-        unset($_SERVER['TENANT']);
-        unset($_ENV['TENANT']);
-
-        if (!self::$landlordValues) {
-            return;
-        }
-
-        // Restore the original values since the tenant boostrapper modified them
-        foreach (self::$landlordValues as $key => $value) {
-            $_SERVER[$key] = $value;
-            $_ENV[$key] = $value;
-            putenv("$key=$value");
-        }
-    }
-
     /**
      * Register app-level events.
      */
@@ -316,10 +284,6 @@ protected static function registerEvents(): void
             self::bootstrapTenantApp($event);
         });
 
-        Facades\Event::listen(JobAttempted::class, function (JobAttempted $event) {
-            self::resetTenantApp($event);
-        });
-
         // Listen to the events for our core screen
         // types and add our javascript
         Facades\Event::listen(ScreenBuilderStarting::class, function ($event) {