Make forget command idempotent

OpenConext · Jan 16, 2025 · c9a1f10 · c9a1f10
1 parent 33aa8cd
commit c9a1f10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Surfnet/Stepup/Identity/Identity.php b/src/Surfnet/Stepup/Identity/Identity.php
@@ -1003,8 +1003,6 @@ public function expressPreferredLocale(Locale $preferredLocale): void
 
     public function forget(): void
     {
-        $this->assertNotForgotten();
-
         if ($this->registrationAuthorities->count() !== 0) {
             throw new DomainException('Cannot forget an identity that is currently accredited as an RA(A)');
         }

diff --git a/...mandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php b/...mandHandlingBundle/Tests/Identity/CommandHandler/RightToBeForgottenCommandHandlerTest.php
@@ -160,11 +160,8 @@ public function an_identity_can_be_forgotten(): void
      * @group command-handler
      * @group sensitive-data
      */
-    public function an_identity_may_not_be_forgotten_twice(): void
+    public function an_identity_may_be_forgotten_twice(): void
     {
-        $this->expectExceptionMessage("Operation on this Identity is not allowed: it has been forgotten");
-        $this->expectException(DomainException::class);
-
         $identityId = new IdentityId('A');
         $institution = new Institution('Helsingin Yliopisto');
         $nameId = new NameId('urn:eeva-kuopio');
@@ -178,6 +175,11 @@ public function an_identity_may_not_be_forgotten_twice(): void
             ->with(new IsEqual($nameId), new IsEqual($institution))
             ->andReturn($this->createIdentity($identityId->getIdentityId()));
 
+        $this->sensitiveDataService
+            ->shouldReceive('forgetSensitiveData')
+            ->once()
+            ->with(new IsEqual($identityId));
+
         $this->sraaRepository->shouldReceive('contains')->once()->with(new IsEqual($nameId))->andReturn(false);
 
         $command = new ForgetIdentityCommand();
@@ -207,7 +209,10 @@ public function an_identity_may_not_be_forgotten_twice(): void
                 ),
                 new IdentityForgottenEvent($identityId, $institution),
             ])
-            ->when($command);
+            ->when($command)
+            ->then([
+                new IdentityForgottenEvent($identityId, $institution),
+            ]);
     }
 
     /**