Merge pull request #8508 from ProcessMaker/bugfix/FOUR-26131

Clean up LDAP errors and fix provider order

Author: nolanpro

ProcessMaker/Application.php

@@ -3,7 +3,9 @@
 namespace ProcessMaker;
 
 use Igaster\LaravelTheme\Facades\Theme;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application as IlluminateApplication;
+use Illuminate\Foundation\PackageManifest;
 use Illuminate\Support\Facades\Auth;
 
 /**
@@ -78,13 +80,14 @@ public function path($path = '')
         return $this->basePath . DIRECTORY_SEPARATOR . 'ProcessMaker' . ($path ? DIRECTORY_SEPARATOR . $path : $path);
     }
 
-    public function setStoragePath($path)
+    public function registerConfiguredProviders()
     {
-        $this->storagePath = $path;
-    }
+        // Must be rebound before registerConfiguredProviders() runs but after bootstrapping is done
+        // so we can access storage and cache facades.
+        $this->singleton(PackageManifest::class, fn () => new LicensedPackageManifest(
+            new Filesystem, $this->basePath(), $this->getCachedPackagesPath()
+        ));
 
-    public function getStoragePath()
-    {
-        return $this->storagePath;
+        parent::registerConfiguredProviders();
     }
 }

ProcessMaker/Console/Commands/TenantsList.php

@@ -43,6 +43,10 @@ public function handle()
         $formattedTenants = $tenants->map(function ($tenant) {
             $config = $tenant->config;
 
+            if (isset($config['app.key'])) {
+                $config['app.key'] = substr($config['app.key'], 0, 30);
+            }
+
             // Json encode, pretty print without slashes
             $config = json_encode($config, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 

ProcessMaker/LicensedPackageManifest.php

@@ -20,6 +20,20 @@ class LicensedPackageManifest extends PackageManifest
 
     const LAST_PACKAGE_DISCOVERY = 0;
 
+    /**
+     * Consider this the beginning of licenesing refactor for multitenancy.
+     *
+     * For now, this will just move the Spatie MultitenancyServiceProvider to the beginning of the service providers.
+     */
+    protected function getManifest()
+    {
+        $manifest = parent::getManifest();
+        $multitenancyKey = 'spatie/laravel-multitenancy';
+
+        // Make sure the MultitenancyServiceProvider is at the beginning of the manifest
+        return [$multitenancyKey => $manifest[$multitenancyKey]] + $manifest;
+    }
+
     protected function packagesToIgnore()
     {
         $packagesToIgnore = $this->loadPackagesToIgnore()->all();

ProcessMaker/Multitenancy/SwitchTenant.php

@@ -39,7 +39,7 @@ public function makeCurrent(IsTenant $tenant): void
         $tenantStoragePath = base_path('storage/tenant_' . $tenant->id);
 
         $app = app();
-        $app->setStoragePath($tenantStoragePath);
+        $app->useStoragePath($tenantStoragePath);
 
         // Create the tenant storage directory if it doesn't exist
         // TODO: Move these to somewhere else - should not be run on every request

ProcessMaker/Providers/AuthServiceProvider.php

@@ -85,6 +85,12 @@ public function boot()
 
     public function defineGates()
     {
+        // No need to run this in console and it generates
+        // errors in multitenancy mode
+        if (!app()->environment('testing') && app()->runningInConsole()) {
+            return;
+        }
+
         try {
             // Cache the permissions for a day to improve performance
             $permissions = Cache::remember('permissions', 86400, function () {

ProcessMaker/Providers/LicenseServiceProvider.php

@@ -37,11 +37,4 @@ public function boot(): void
             LicensedPackageManifest::discoverPackagesOnce();
         }
     }
-
-    public function register(): void
-    {
-        $this->app->singleton(PackageManifest::class, fn () => new LicensedPackageManifest(
-            new Filesystem, $this->app->basePath(), $this->app->getCachedPackagesPath()
-        ));
-    }
 }

ProcessMaker/Providers/ProcessMakerServiceProvider.php

@@ -259,10 +259,6 @@ public function register(): void
         // Miscellaneous vendor customization
         static::configureVendors();
 
-        $this->app->singleton(PackageManifest::class, fn () => new LicensedPackageManifest(
-            new Filesystem, $this->app->basePath(), $this->app->getCachedPackagesPath()
-        ));
-
         $this->app->extend(MigrateCommand::class, function () {
             return new ExtendedMigrateCommand(
                 app('migrator'),