Merge pull request #8530 from ProcessMaker/bugfix/FOUR-26610

nolanpro · web-flow · commit cb89e6e93a4e · 2025-09-18T08:16:35.000-07:00
Reset encrypter after setting tenant app key
diff --git a/ProcessMaker/Multitenancy/SwitchTenant.php b/ProcessMaker/Multitenancy/SwitchTenant.php
@@ -113,6 +113,9 @@ public function makeCurrent(IsTenant $tenant): void
         }
         config($config);
 
+        // The previous app key was saved in the singleton, so we need to forget it.
+        $app->forgetInstance('encrypter');
+
         // Extend BroadcastManager to our custom implementation that prefixes the channel names with the tenant id.
         $app->extend(BroadcastManager::class, function ($manager, $app) use ($tenant) {
             return new TenantAwareBroadcastManager($app, $tenant->id);

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ public function makeCurrent(IsTenant $tenant): void`
`113`	`113`	`}`
`114`	`114`	`config($config);`
`115`	`115`
	`116`	`+ // The previous app key was saved in the singleton, so we need to forget it.`
	`117`	`+ $app->forgetInstance('encrypter');`
	`118`	`+`
`116`	`119`	`// Extend BroadcastManager to our custom implementation that prefixes the channel names with the tenant id.`
`117`	`120`	`$app->extend(BroadcastManager::class, function ($manager, $app) use ($tenant) {`
`118`	`121`	`return new TenantAwareBroadcastManager($app, $tenant->id);`