use dedicated denied message for anonymized memberships

wmde · Feb 13, 2018 · 0768071 · 0768071
1 parent b237285
commit 0768071
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/skins/10h16/templates/Access_Denied.twig b/skins/10h16/templates/Access_Denied.twig
@@ -1,5 +1,5 @@
 {% extends 'Base_Layout.html.twig' %}
 
 {% block main %}
-    {$ message|default( 'access_denied' )|trans() $}
-{% endblock %}
+    {$ message | default( 'access_denied' ) | trans | raw $}
+{% endblock %}
diff --git a/skins/cat17/templates/Access_Denied.twig b/skins/cat17/templates/Access_Denied.twig
@@ -9,7 +9,7 @@
                 <h1>{$ 'access_denied_header' | trans $}</h1>
 
                 <p>
-                    {$ message | default( 'access_denied' ) | trans $}
+                    {$ message | default( 'access_denied' ) | trans | raw $}
                 </p>
 
                 <p>

diff --git a/src/Presentation/Presenters/MembershipApplicationConfirmationHtmlPresenter.php b/src/Presentation/Presenters/MembershipApplicationConfirmationHtmlPresenter.php
@@ -121,7 +121,7 @@ private function mapStatus( bool $isConfirmed ): string {
 	}
 
 	public function presentApplicationWasAnonymized(): void {
-		$this->exception = new AccessDeniedException( 'access_denied_membership_confirmation' );
+		$this->exception = new AccessDeniedException( 'access_denied_membership_confirmation_anonymized' );
 	}
 
 	public function presentAccessViolation(): void {

diff --git a/tests/EdgeToEdge/Routes/ShowMembershipConfirmationRouteTest.php b/tests/EdgeToEdge/Routes/ShowMembershipConfirmationRouteTest.php
@@ -75,7 +75,7 @@ public function testCallWithWrongAccessToken_deniedPageIsShown(): void {
 				]
 			);
 
-			$this->assertAccessIsDenied( $client );
+			$this->assertAccessIsDenied( 'access_denied_membership_confirmation', $client );
 		} );
 	}
 
@@ -99,7 +99,7 @@ public function testCallOnAnonymizedRecord_deniedPageIsShown(): void {
 				]
 			);
 
-			$this->assertAccessIsDenied( $client );
+			$this->assertAccessIsDenied( 'access_denied_membership_confirmation_anonymized', $client );
 		} );
 	}
 
@@ -114,7 +114,7 @@ public function testCallOnUnknownApplicationId_deniedPageIsShown(): void {
 				]
 			);
 
-			$this->assertAccessIsDenied( $client );
+			$this->assertAccessIsDenied( 'access_denied_membership_confirmation', $client );
 		} );
 	}
 
@@ -154,8 +154,8 @@ public function testOnDatabaseError_errorPageIsShown(): void {
 		$this->assertTrue( $client->getResponse()->isServerError() );
 	}
 
-	private function assertAccessIsDenied( Client $client ): void {
-		$this->assertContains( 'access_denied_membership_confirmation', $client->getResponse()->getContent() );
+	private function assertAccessIsDenied( string $expectedMessage, Client $client ): void {
+		$this->assertContains( $expectedMessage, $client->getResponse()->getContent() );
 		$this->assertTrue( $client->getResponse()->isForbidden() );
 	}