fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(theme): stabilize tenant switch theme propagation and toggle race handling

Browse Source 
Task: REVIEW-USER-THEME-001
This commit is contained in:
Felix Schneider
2026-03-07 20:14:29 +01:00
parent e3a0c0eb37
commit fb6f87374f
10 changed files with 596 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/Service/Auth/AuthSessionTenantContextServiceTest.php
View File

@@ -73,4 +73,36 @@ class AuthSessionTenantContextServiceTest extends TestCase
$this->assertFalse((bool) $_SESSION['no_active_tenant']);
$this->assertSame(7, (int) ($_SESSION['current_tenant']['id'] ?? 0));
}
public function testHydratePreservesThemeAndPolicyFieldsInSession(): void
{
$availableTenants = [
[
'id' => 3,
'uuid' => 'tenant-3',
'default_theme' => 'dark',
'allow_user_theme' => '0',
],
];
$userTenantContextService = $this->createMock(UserTenantContextService::class);
$userTenantContextService->method('getAvailableTenants')->willReturn($availableTenants);
$userTenantContextService->method('getAvailableDepartmentsByTenant')->willReturn([]);
$userTenantContextService->method('getCurrentTenant')->willReturn($availableTenants[0]);
$savedFilterGateway = $this->createMock(AuthSavedFilterGateway::class);
$savedFilterGateway->method('listAddressBookFilters')->willReturn([]);
$service = new AuthSessionTenantContextService(
$userTenantContextService,
$savedFilterGateway,
new SessionStore()
);
$service->hydrateForUser(10);
$tenant = $_SESSION['current_tenant'] ?? [];
$this->assertSame('dark', $tenant['default_theme'] ?? null);
$this->assertSame('0', $tenant['allow_user_theme'] ?? null);
}
}

178
tests/Support/ThemeResolutionTest.php Normal file
View File

@@ -0,0 +1,178 @@
<?php
namespace MintyPHP\Tests\Support;
use MintyPHP\App\AppContainer;
use MintyPHP\Service\Settings\SettingCacheService;
use MintyPHP\Service\Settings\ThemeConfigService;
use PHPUnit\Framework\TestCase;
class ThemeResolutionTest extends TestCase
{
private AppContainer $container;
protected function setUp(): void
{
$_SESSION = [];
$this->container = new AppContainer();
$themeConfig = $this->createMock(ThemeConfigService::class);
$themeConfig->method('all')->willReturn(['light' => 'Light', 'dark' => 'Dark']);
$this->container->set(ThemeConfigService::class, fn () => $themeConfig);
$this->setAppSettings([]);
$GLOBALS['minty_app_container'] = $this->container;
}
protected function tearDown(): void
{
$_SESSION = [];
}
// -- appDefaultTheme priority chain --
public function testDefaultThemeFallsBackToLight(): void
{
$this->assertSame('light', appDefaultTheme());
}
public function testDefaultThemeReadsAppSetting(): void
{
$this->setAppSettings(['app_theme' => 'dark']);
$this->assertSame('dark', appDefaultTheme());
}
public function testDefaultThemeTenantOverridesAppSetting(): void
{
$this->setAppSettings(['app_theme' => 'light']);
$_SESSION['current_tenant'] = ['default_theme' => 'dark'];
$this->assertSame('dark', appDefaultTheme());
}
public function testDefaultThemeIgnoresInvalidTenantTheme(): void
{
$_SESSION['current_tenant'] = ['default_theme' => 'nonexistent'];
$this->assertSame('light', appDefaultTheme());
}
public function testDefaultThemeIgnoresEmptyTenantTheme(): void
{
$this->setAppSettings(['app_theme' => 'dark']);
$_SESSION['current_tenant'] = ['default_theme' => ''];
$this->assertSame('dark', appDefaultTheme());
}
// -- currentTheme with user override --
public function testCurrentThemeReturnsDefaultWhenUserThemeDisabled(): void
{
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'dark'];
$_SESSION['user'] = ['theme' => 'light'];
$this->assertSame('dark', currentTheme());
}
public function testCurrentThemeReturnsUserThemeWhenAllowed(): void
{
$_SESSION['current_tenant'] = ['allow_user_theme' => '1', 'default_theme' => 'light'];
$_SESSION['user'] = ['theme' => 'dark'];
$this->assertSame('dark', currentTheme());
}
public function testCurrentThemeFallsBackToDefaultForEmptyUserTheme(): void
{
$_SESSION['current_tenant'] = ['allow_user_theme' => '1', 'default_theme' => 'dark'];
$_SESSION['user'] = ['theme' => ''];
$this->assertSame('dark', currentTheme());
}
public function testCurrentThemeFallsBackToDefaultForInvalidUserTheme(): void
{
$_SESSION['current_tenant'] = ['allow_user_theme' => '1'];
$_SESSION['user'] = ['theme' => 'nonexistent'];
$this->assertSame('light', currentTheme());
}
// -- allowUserTheme feature flag --
public function testAllowUserThemeDefaultsToTrue(): void
{
$this->assertTrue(allowUserTheme());
}
public function testAllowUserThemeTenantExplicitlyEnabled(): void
{
$_SESSION['current_tenant'] = ['allow_user_theme' => '1'];
$this->assertTrue(allowUserTheme());
}
public function testAllowUserThemeTenantExplicitlyDisabled(): void
{
$_SESSION['current_tenant'] = ['allow_user_theme' => '0'];
$this->assertFalse(allowUserTheme());
}
public function testAllowUserThemeTenantOverridesAppSetting(): void
{
$this->setAppSettings(['app_theme_user' => '1']);
$_SESSION['current_tenant'] = ['allow_user_theme' => '0'];
$this->assertFalse(allowUserTheme());
}
public function testAllowUserThemeFallsBackToAppSettingWhenTenantNull(): void
{
$this->setAppSettings(['app_theme_user' => '0']);
$this->assertFalse(allowUserTheme());
}
// -- Tenant switch scenarios --
public function testThemeResolvesCorrectlyAfterTenantSwitch(): void
{
$_SESSION['user'] = ['theme' => 'dark'];
$_SESSION['current_tenant'] = ['allow_user_theme' => '1', 'default_theme' => 'light'];
$this->assertSame('dark', currentTheme());
// Simulate tenant switch: new tenant disallows user theme
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'light'];
$this->assertSame('light', currentTheme());
}
public function testThemeResolvesNewDefaultAfterTenantSwitch(): void
{
$_SESSION['user'] = ['theme' => 'light'];
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'light'];
$this->assertSame('light', currentTheme());
// Switch to tenant with dark default
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'dark'];
$this->assertSame('dark', currentTheme());
}
/**
* @param array<string, string|null> $settings
*/
private function setAppSettings(array $settings): void
{
$cache = $this->createMock(SettingCacheService::class);
$cache->method('get')->willReturnCallback(fn (string $key) => $settings[$key] ?? null);
$this->container->set(SettingCacheService::class, fn () => $cache);
}
}