diff --git a/src/Entity/UserSystem/PermissionData.php b/src/Entity/UserSystem/PermissionData.php index 38f4b774..01bb2416 100644 --- a/src/Entity/UserSystem/PermissionData.php +++ b/src/Entity/UserSystem/PermissionData.php @@ -43,7 +43,7 @@ final class PermissionData implements \JsonSerializable /** * The current schema version of the permission data */ - public const CURRENT_SCHEMA_VERSION = 3; + public const CURRENT_SCHEMA_VERSION = 2; /** * Creates a new Permission Data Instance using the given data. diff --git a/src/Services/UserSystem/PermissionSchemaUpdater.php b/src/Services/UserSystem/PermissionSchemaUpdater.php index e716bcc9..5fb08182 100644 --- a/src/Services/UserSystem/PermissionSchemaUpdater.php +++ b/src/Services/UserSystem/PermissionSchemaUpdater.php @@ -138,13 +138,4 @@ class PermissionSchemaUpdater $holder->getPermissions()->removePermission('devices'); } } - - private function upgradeSchemaToVersion3(HasPermissionsInterface $holder): void //@phpstan-ignore-line This is called via reflection - { - //If the info_providers permissions are not defined yet, set it if the user can create parts - if (!$holder->getPermissions()->isAnyOperationOfPermissionSet('info_providers')) { - $user_can_create_parts = $holder->getPermissions()->getPermissionValue('parts', 'create'); - $holder->getPermissions()->setPermissionValue('info_providers', 'create_parts', $user_can_create_parts); - } - } } diff --git a/tests/Services/UserSystem/PermissionSchemaUpdaterTest.php b/tests/Services/UserSystem/PermissionSchemaUpdaterTest.php index b1a0e150..1acadd14 100644 --- a/tests/Services/UserSystem/PermissionSchemaUpdaterTest.php +++ b/tests/Services/UserSystem/PermissionSchemaUpdaterTest.php @@ -110,17 +110,4 @@ class PermissionSchemaUpdaterTest extends WebTestCase self::assertEquals(PermissionData::INHERIT, $user->getPermissions()->getPermissionValue('projects', 'edit')); self::assertEquals(PermissionData::DISALLOW, $user->getPermissions()->getPermissionValue('projects', 'delete')); } - - public function testUpgradeSchemaToVersion3(): void - { - $perm_data = new PermissionData(); - $perm_data->setSchemaVersion(2); - $perm_data->setPermissionValue('parts', 'create', PermissionData::ALLOW); - $user = new TestPermissionHolder($perm_data); - - //After the upgrade the user should be allowed to create parts from info providers - self::assertTrue($this->service->upgradeSchema($user, 3)); - - self::assertEquals(PermissionData::ALLOW, $user->getPermissions()->getPermissionValue('info_providers', 'create_parts')); - } }