Merge branch '0.6'

Author: codedmonkey

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+* 0.6.1 (2026-03-30)
+  * Fixed loading of encryption module in dashboard pages which prevented changes to existing credentials
+  * Disabled autocomplete on credentials information
+
 * 0.6.0 (2026-03-23)
   * Added configuration option to fetch mirrored packages from their VCS repositories by default when possible 
   * Improved the `packages:update` command with clearer arguments

phpstan.dist.neon

@@ -34,8 +34,3 @@ parameters:
             identifier: booleanOr.rightAlwaysFalse
             count: 1
             path: src/Encryption/Encryption.php
-        -
-            message: '#^Property CodedMonkey\\Dirigent\\EventListener\\EncryptionListener\:\:\$connection is never read, only written\.$#'
-            identifier: property.onlyWritten
-            count: 1
-            path: src/EventListener/EncryptionListener.php

src/Composer/ConfigFactory.php

@@ -69,8 +69,8 @@ private static function buildCredentialsConfig(string $domain, ?Credentials $cre
             CredentialsType::GitlabPersonalAccessToken => [
                 'gitlab-token' => [
                     $domain => [
-                        'username' => $credentials->getToken(),
-                        'token' => 'private-token',
+                        'username' => 'private-token',
+                        'token' => $credentials->getToken(),
                     ],
                 ],
             ],

src/Controller/Dashboard/DashboardCredentialsController.php

@@ -42,12 +42,15 @@ public function configureFields(string $pageName): iterable
             ->renderExpanded();
         yield TextField::new('username')
             ->setFormTypeOption('row_attr', ['data-credentials-field' => 'username'])
+            ->setFormTypeOption('attr', ['autocomplete' => 'off'])
             ->onlyOnForms();
         yield TextField::new('password')
             ->setFormTypeOption('row_attr', ['data-credentials-field' => 'password'])
+            ->setFormTypeOption('attr', ['autocomplete' => 'off'])
             ->onlyOnForms();
         yield TextField::new('token')
             ->setFormTypeOption('row_attr', ['data-credentials-field' => 'token'])
+            ->setFormTypeOption('attr', ['autocomplete' => 'off'])
             ->onlyOnForms();
     }
 }

src/DependencyInjection/Compiler/EncryptionPass.php

@@ -22,6 +22,7 @@ public function process(ContainerBuilder $container): void
         $rotatedKeyPaths = $parameterBag->get('dirigent.encryption.rotated_key_paths');
 
         $container->getDefinition(Encryption::class)
+            ->setLazy(true)
             ->setFactory([Encryption::class, 'create'])
             ->setArguments([
                 $privateKey,

src/Doctrine/Middleware/EncryptionMiddleware.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace CodedMonkey\Dirigent\Doctrine\Middleware;
+
+use CodedMonkey\Dirigent\Doctrine\Type\EncryptedTextType;
+use CodedMonkey\Dirigent\Encryption\Encryption;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsMiddleware;
+use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Driver\Connection;
+use Doctrine\DBAL\Driver\Middleware;
+use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Configures EncryptedTextType by manually injecting the encryption utility after initializing Doctrine.
+ */
+#[AsMiddleware]
+readonly class EncryptionMiddleware implements Middleware
+{
+    public function __construct(private Encryption $encryption)
+    {
+    }
+
+    public function wrap(Driver $driver): Driver
+    {
+        return new class($driver, $this->encryption) extends AbstractDriverMiddleware {
+            public function __construct(Driver $driver, private readonly Encryption $encryption)
+            {
+                parent::__construct($driver);
+            }
+
+            public function connect(array $params): Connection
+            {
+                /** @var EncryptedTextType $doctrineType */
+                $doctrineType = Type::getType(EncryptedTextType::TYPE);
+                $doctrineType->setEncryptionUtility($this->encryption);
+
+                return parent::connect($params);
+            }
+        };
+    }
+}

src/EventListener/EncryptionListener.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
+
+use CodedMonkey\Dirigent\Controller\Dashboard\DashboardCredentialsController;
+use CodedMonkey\Dirigent\Doctrine\Entity\Credentials;
+use CodedMonkey\Dirigent\Doctrine\Entity\CredentialsType;
+use CodedMonkey\Dirigent\Tests\Helper\MockEntityFactoryTrait;
+use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Response;
+
+#[CoversClass(DashboardCredentialsController::class)]
+class DashboardCredentialsControllerTest extends WebTestCase
+{
+    use MockEntityFactoryTrait;
+    use WebTestCaseTrait;
+
+    public function testCreate(): void
+    {
+        $client = static::createClient();
+        $this->loginUser('admin');
+
+        $client->request('GET', '/credentials/new');
+
+        $this->assertResponseStatusCodeSame(Response::HTTP_OK);
+
+        $client->submitForm('Create', [
+            'Credentials[name]' => 'Test credentials',
+            'Credentials[type]' => CredentialsType::HttpBasic->value,
+            'Credentials[username]' => 'testuser',
+            'Credentials[password]' => 'testpassword',
+        ]);
+
+        $this->assertResponseStatusCodeSame(Response::HTTP_FOUND);
+
+        $credentials = $this->findEntity(Credentials::class, ['name' => 'Test credentials']);
+
+        self::assertNotNull($credentials, 'A credentials entry was created.');
+        self::assertSame(CredentialsType::HttpBasic, $credentials->getType());
+        self::assertSame('testuser', $credentials->getUsername());
+    }
+
+    public function testEdit(): void
+    {
+        $client = static::createClient();
+        $this->loginUser('admin');
+
+        $credentials = new Credentials();
+        $credentials->setName('Original name');
+        $credentials->setType(CredentialsType::HttpBasic);
+        $credentials->setUsername('originaluser');
+        $credentials->setPassword('originalpassword');
+
+        $this->persistEntities($credentials);
+
+        $credentialsId = $credentials->getId();
+
+        $client->request('GET', "/credentials/{$credentialsId}/edit");
+
+        $this->assertResponseStatusCodeSame(Response::HTTP_OK);
+
+        $client->submitForm('Save changes', [
+            'Credentials[name]' => 'Updated name',
+            'Credentials[type]' => CredentialsType::HttpBasic->value,
+            'Credentials[username]' => 'updateduser',
+            'Credentials[password]' => 'updatedpassword',
+        ]);
+
+        $this->assertResponseStatusCodeSame(Response::HTTP_FOUND);
+
+        $this->clearEntities();
+        $credentials = $this->findEntity(Credentials::class, $credentialsId);
+
+        self::assertNotNull($credentials);
+        self::assertSame('Updated name', $credentials->getName());
+        self::assertSame('updateduser', $credentials->getUsername());
+    }
+}

tests/FunctionalTests/Controller/Dashboard/DashboardCredentialsControllerTest.php

@@ -49,6 +49,24 @@ protected function createMockVersion(Package $package, string $versionName = '1.
         return $version;
     }
 
+    /**
+     * Find a single entity by its ID or an array of criteria.
+     *
+     * @template T of object
+     *
+     * @param class-string<T> $className
+     *
+     * @return T|null
+     */
+    protected function findEntity(string $className, array|int $criteria): ?object
+    {
+        if (is_array($criteria)) {
+            return $this->getService(EntityManagerInterface::class)->getRepository($className)->findOneBy($criteria);
+        }
+
+        return $this->getService(EntityManagerInterface::class)->find($className, $criteria);
+    }
+
     /**
      * Persist and flush all given entities.
      *
@@ -67,8 +85,6 @@ protected function persistEntities(...$entities): void
 
     protected function clearEntities(): void
     {
-        $entityManager = $this->getService(EntityManagerInterface::class);
-
-        $entityManager->clear();
+        $this->getService(EntityManagerInterface::class)->clear();
     }
 }