Merge pull request #8654 from ProcessMaker/bugfix/FOUR-28402

FOUR-28402 Fix email settings in multitenancy

Author: nolanpro

ProcessMaker/Jobs/RefreshArtisanCaches.php

@@ -23,30 +23,7 @@ class RefreshArtisanCaches implements ShouldQueue
      */
     public function handle()
     {
-        // Skip in testing environment because this reconnects the database
-        // meaning we loose transactions, and sets the console output verbosity
-        // to quiet so we loose expectsOutput assertions.
-        if (app()->environment('testing')) {
-            return;
-        }
-
-        $options = [
-            '--no-interaction' => true,
-            '--quiet' => true,
-        ];
-
-        if (app()->configurationIsCached()) {
-            // Run in a separate process to avoid the tenant being set.
-            // We do not use a tenant-specific config cache file.
-            Process::path(base_path())
-                ->env(['TENANT' => false, 'APP_URL' => false])
-                ->run(Application::formatCommandString('config:cache'))->throw();
-        } else {
-            Artisan::call('queue:restart', $options);
-
-            // We call this manually here since this job is dispatched
-            // automatically when the config *is* cached
-            RestartMessageConsumers::dispatchSync();
-        }
+        // Do not rebuild the cache and restart the queue any more.
+        // This is no longer needed.
     }
 }

ProcessMaker/Providers/ProcessMakerServiceProvider.php

@@ -16,6 +16,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -99,6 +100,9 @@ public function boot(): void
         parent::boot();
 
         Route::pushMiddlewareToGroup('api', HandleEtag::class);
+
+        $this->checkConfigCache();
+
         // Hook after service providers boot
         self::$bootTime = (microtime(true) - self::$bootStart) * 1000; // Convert to milliseconds
     }
@@ -577,4 +581,22 @@ private static function actuallyRunningInConsole(): bool
     {
         return PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg';
     }
+
+    /**
+     * Ensure that config:cache is not run for tenant instances.
+     */
+    private function checkConfigCache(): void
+    {
+        // Only if app is running in console
+        if (!app()->runningInConsole()) {
+            return;
+        }
+
+        // Safety check to prevent config:cache from being run for tenant instances.
+        if (config('app.multitenancy') && app('currentTenant')) {
+            Artisan::command('config:cache', function () {
+                throw new \Exception('Cannot cache config for tenant instance. Must be run from landlord instance.');
+            });
+        }
+    }
 }