FOUR-24651: Enable and disable custom packages / enterprise packages per tenant

ProcessMaker/Application.php

@@ -11,6 +11,31 @@
  */
 class Application extends IlluminateApplication
 {
+    /**
+     * Get the path to the cached packages.php file.
+     *
+     * @return string
+     */
+    public function getCachedPackagesPath()
+    {
+        // Get tenant domain name from domain
+        if (!app()->runningInConsole()) {
+            $domain = request()->getHost();
+            if (str_contains($domain, '.')) {
+                $tenantDomain = explode('.', $domain)[0];
+            } else {
+                $tenantDomain = $domain;
+            }
+            // check if there is a storage_path('tenant_' . $tenantDomain . '/framework/cache/packages.php')
+            if ($tenantDomain && file_exists(storage_path('tenant_' . $tenantDomain . '/framework/cache/packages.php'))) {
+                return storage_path('tenant_' . $tenantDomain . '/framework/cache/packages.php');
+            }
+        }
+
+        // if not, return the default path
+        return $this->normalizeCachePath('APP_PACKAGES_CACHE', 'cache/packages.php');
+    }
+
     /**
      * Sets the timezone for the application and for php with the specified timezone.
      *

ProcessMaker/Cache/CacheManagerBase.php

@@ -50,7 +50,8 @@ public function getPrefix(string $connection): string
         }
 
         $tenant = app()->bound('currentTenant') ? app('currentTenant') : null;
-        $tenantId = $tenant ? $tenant->id : null;
+        $tenantDomain = $tenant ? $tenant->domain : null;
+        $tenantId = $tenantDomain ? explode('.', $tenantDomain)[0] : null;
 
         if ($tenantId) {
             if (strpos($prefix, self::TENANT_PREFIX) === false) {

ProcessMaker/Console/Commands/TenantStorageLink.php

@@ -34,7 +34,9 @@ public function handle()
             return 1;
         }
 
-        $this->createStorageLink($tenant->id);
+        $tenantDomain = explode('.', $tenant->domain)[0];
+
+        $this->createStorageLink($tenantDomain);
     }
 
     /**
@@ -43,13 +45,13 @@ public function handle()
      * @param int $tenantId
      * @return void
      */
-    protected function createStorageLink($tenantId)
+    protected function createStorageLink($tenantDomain)
     {
-        $this->info('Creating storage link for tenant ' . $tenantId . '...');
+        $this->info('Creating storage link for tenant ' . $tenantDomain . '...');
 
         // Define paths
         $tenantStoragePath = storage_path('/app/public');
-        $publicPath = public_path('storage/tenant_' . $tenantId);
+        $publicPath = public_path('storage/tenant_' . $tenantDomain);
 
         // Create tenant storage directory if it doesn't exist
         if (!File::exists($tenantStoragePath)) {

ProcessMaker/Console/Commands/TenantsCreate.php

@@ -73,7 +73,8 @@ public function handle()
         ]);
 
         // Setup storage
-        $tenantStoragePath = base_path('storage/tenant_' . $tenant->id);
+        $tenantName = explode('.', $tenant->domain)[0];
+        $tenantStoragePath = base_path('storage/tenant_' . $tenantName);
         if (!File::isDirectory($tenantStoragePath)) {
             mkdir($tenantStoragePath, 0755, true);
         }

ProcessMaker/Console/Commands/TenantsDisable.php

@@ -16,7 +16,7 @@ class TenantsDisable extends Command
      *
      * @var string
      */
-    protected $signature = 'tenants:disable {--default-tenant-id=}';
+    protected $signature = 'tenants:disable {--default-tenant-domain=}';
 
     /**
      * The console command description.
@@ -34,11 +34,13 @@ public function handle()
         $domain = parse_url(Env::get('APP_URL'), PHP_URL_HOST);
 
         $tenant = null;
-        if ($this->option('default-tenant-id')) {
-            $tenantId = $this->option('default-tenant-id');
+        if ($this->option('default-tenant-domain')) {
+            $tenantDomain = $this->option('default-tenant-domain');
+            $tenantId = explode('.', $tenantDomain)[0];
         } else {
             $tenant = Tenant::where('domain', $domain)->firstOrFail();
-            $tenantId = $tenant->id;
+            $tenantDomain = explode('.', $tenant->domain)[0];
+            $tenantId = $tenantDomain;
         }
 
         $this->recursiveDelete(base_path('storage/framework'));

ProcessMaker/Http/Controllers/StorageController.php

@@ -38,7 +38,9 @@ public function serve(Request $request, string $path): BinaryFileResponse
                 $tenantId = $tenant->id;
 
                 // Handle tenant path
-                $path = $this->handleTenantPath($path, $tenantId);
+                $tenantDomain = explode('.', $tenant->domain)[0];
+
+                $path = $this->handleTenantPath($path, $tenantDomain);
             }
 
             // Get storage disk
@@ -98,13 +100,13 @@ private function validateAndSanitizePath(string $path): string
      *
      * @return string
      */
-    private function handleTenantPath(string $path, int $tenantId): string
+    private function handleTenantPath(string $path, string $tenantDomain): string
     {
         if (preg_match('/^tenant_\d+\//', $path)) {
-            return str_replace('tenant_' . $tenantId . '/', '', $path);
+            return str_replace('tenant_' . $tenantDomain . '/', '', $path);
         }
 
-        return 'tenant_' . $tenantId . '/' . $path;
+        return 'tenant_' . $tenantDomain . '/' . $path;
     }
 
     /**

ProcessMaker/Multitenancy/SwitchTenant.php

@@ -27,11 +27,11 @@ public function makeCurrent(IsTenant $tenant): void
         $this->setTenantDatabaseConnection($tenant);
 
         // Set the tenant-specific storage path
-        $tenantStoragePath = base_path('storage/tenant_' . $tenant->id);
+        $tenantDomain = explode('.', $tenant->domain)[0];
+        $tenantStoragePath = base_path('storage/tenant_' . $tenantDomain);
 
         $app = app();
         $app->setStoragePath($tenantStoragePath);
-
         // Create the tenant storage directory if it doesn't exist
         // TODO: Move these to somewhere else - should not be run on every request
         if (!file_exists($tenantStoragePath)) {

composer.json

@@ -49,6 +49,7 @@
         "processmaker/docker-executor-php": "1.4.0",
         "processmaker/laravel-i18next": "dev-master",
         "processmaker/nayra": "1.12.1",
+        "processmaker/package-dynamic-ui": "^1.28",
         "processmaker/pmql": "1.13.1",
         "promphp/prometheus_client_php": "^2.12",
         "psr/http-message": "^1.1",
@@ -215,7 +216,84 @@
         {
             "type": "vcs",
             "url": "https://github.com/ProcessMaker/SocialiteProviders"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/packages"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-collections"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-data-sources"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-savedsearch"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-dynamic-ui"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-decision-engine"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-webentry"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-files"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-analytics-reporting"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-ab-testing"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/connector-send-email"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-testing"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-versions"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-files"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-auth"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-translations"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-advanced-user-manager"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-variable-finder"
+        },
+        {
+            "type": "path",
+            "url": "/Users/rodrigoquelca/dev/package-auth"
         }
+
     ],
     "config": {
         "preferred-install": "dist",