@@ -5,6 +5,7 @@
 /public/css
 /storage/*.key
 /storage/*.index
+/storage/tenant_*
 /vendor
 /.idea
 /.vscode
 
@@ -26,6 +26,7 @@ class Kernel extends HttpKernel
         Middleware\BrowserCache::class,
         ServerTimingMiddleware::class,
         Middleware\FileSizeCheck::class,
+        Middleware\AddTenantHeaders::class,
     ];
 
     /**
 
@@ -0,0 +1,34 @@
+<?php
+
+namespace ProcessMaker\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Spatie\Multitenancy\Models\Tenant;
+
+class AddTenantHeaders
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param  Closure  $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $response = $next($request);
+
+        $tenant = Tenant::current();
+
+        if ($tenant) {
+            $response->headers->set('x-tenant-id', $tenant->id);
+            $response->headers->set('x-tenant-name', $tenant->name);
+        } else {
+            $response->headers->set('x-tenant-id', 'none');
+            $response->headers->set('x-tenant-name', 'No tenant');
+        }
+
+        return $response;
+    }
+}
@@ -0,0 +1,60 @@
+<?php
+
+namespace ProcessMaker\Multitenancy;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Bootstrap\LoadConfiguration;
+use Spatie\Multitenancy\Contracts\IsTenant;
+use Spatie\Multitenancy\Tasks\SwitchTenantTask;
+
+class SwitchTenant implements SwitchTenantTask
+{
+    /**
+     * Make the given tenant current.
+     *
+     * @param IsTenant $tenant
+     * @return void
+     */
+    public function makeCurrent(IsTenant $tenant): void
+    {
+        $app = app();
+
+        // Set the tenant-specific storage path
+        $tenantStoragePath = base_path('storage/tenant_' . $tenant->id);
+
+        $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)) {
+            mkdir($tenantStoragePath, 0755, true);
+        }
+        $tennantCacheFolder = base_path('bootstrap/cache/tenant_' . $tenant->id);
+        if (!file_exists($tennantCacheFolder)) {
+            mkdir($tennantCacheFolder, 0755, true);
+        }
+
+        // Reload the config
+        putenv('APP_CONFIG_CACHE=' . $tennantCacheFolder . '/config.php');
+        (new LoadConfiguration())->bootstrap($app);
+
+        // Set the app.url config
+        $app->config->set('app.url', $app->config->get('app.protocol') . '://' . $tenant->domain);
+
+        if ($tenant->config_overrides) {
+            foreach ($tenant->config_overrides as $key => $value) {
+                $app->config->set($key, $value);
+            }
+        }
+    }
+
+    /**
+     * Forget the current tenant.
+     *
+     * @return void
+     */
+    public function forgetCurrent(): void
+    {
+    }
+}
@@ -0,0 +1,12 @@
+<?php
+
+namespace ProcessMaker\Multitenancy;
+
+use Spatie\Multitenancy\Models\Tenant as SpatieTenant;
+
+class Tenant extends SpatieTenant
+{
+    protected $casts = [
+        'config_overrides' => 'array',
+    ];
+}
@@ -210,6 +210,7 @@
         'Theme' => Igaster\LaravelTheme\Facades\Theme::class,
         'WorkspaceManager' => ProcessMaker\Facades\WorkspaceManager::class,
         'SettingCache' => ProcessMaker\Cache\Settings\SettingCacheFacade::class,
+        'Tenant' => ProcessMaker\Multitenancy\Tenant::class,
     ])->toArray(),
 
     'debug_blacklist' => [
 
@@ -15,6 +15,7 @@ public function up()
             $table->string('name');
             $table->string('domain')->unique();
             $table->string('database')->unique();
+            $table->json('config_overrides')->nullable();
             $table->timestamps();
         });
     }
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public function up()`
`15`	`15`	`$table->string('name');`
`16`	`16`	`$table->string('domain')->unique();`
`17`	`17`	`$table->string('database')->unique();`
	`18`	`+ $table->json('config_overrides')->nullable();`
`18`	`19`	`$table->timestamps();`
`19`	`20`	`});`
`20`	`21`	`}`