Bugfixes for 2.0 port

Author: thijskh

src/Auth/Process/SFO.php

@@ -58,6 +58,7 @@ public function __construct(array $config, $reserved)
         $this->idpMetadata = $this->getIdPMetadata($config['idpEntityid']);
 
         $config['AuthnContextClassRef'] = $config['loa'];
+        $config['entityid'] = $config['entityID'];
         $this->metadata = Configuration::loadFromArray($config);
     }
 

src/Controller/SFO.php

@@ -69,7 +69,7 @@ public function acs(): Template
             throw new Error\BadRequest('Invalid message received to SFO AssertionConsumerService endpoint.');
         }
 
-        $issuer = $response->getIssuer();
+        $issuer = $response->getIssuer()->getValue();
         $relaystate = $response->getRelayState();
         $inResponseTo = $response->getInResponseTo();
 
@@ -110,7 +110,7 @@ public function acs(): Template
             // the status of the response wasn't "success"
             Logger::debug('SFO - status response received, showing error page.');
 
-            $t = new Template($this->config, 'stepupsfo:handlestatus.php');
+            $t = new Template($this->config, 'stepupsfo:handlestatus.twig');
             $t->data['status'] = $e->getStatus();
             $t->data['subStatus'] = $e->getSubStatus();
             $t->data['statusMessage'] = $e->getStatusMessage();

templates/handlestatus.twig

@@ -6,30 +6,33 @@
 
 {% if status == "urn:oasis:names:tc:SAML:2.0:status:Responder" and subStatus == "urn:oasis:names:tc:SAML:2.0:status:AuthnFailed" %}
 
-	<p>{{ 'Authentication not successful:' | trans }}<br/><br/>
+    <p>{{ 'Authentication not successful:' | trans }}<br/><br/>
 
-	<strong>
-	    {{ statusMessage }}
-	</strong></p>
+    <strong>
+        {{ statusMessage }}
+    </strong></p>
 
 {% elseif status == "urn:oasis:names:tc:SAML:2.0:status:Responder" and subStatus == "urn:oasis:names:tc:SAML:2.0:status:NoAuthnContext" %}
 
-	<p>{{ 'You could not be authenticated at the requested level.' | trans }}<br/>
+    <p>{{ 'You could not be authenticated at the requested level.' | trans }}<br/>
 
-	{{ statusMessage }}</p>
+    {{ statusMessage }}</p>
 
-	<p>{{ 'Do you have a token registered with the required level?' | trans }}<br/><br/>
-	{% trans %}Please go to the <a href="{{ selfserviceUrl }}">Selfservice Registration Portal</a>
-	to review or enroll your token.{% endtrans %}</p>
+    <p>{{ 'Do you have a token registered with the required level?' | trans }}<br/><br/>
+
+    {% if selfserviceUrl %}
+        {{ 'Please go to the <a href="%URL%">Selfservice Registration Portal</a>
+        to review or enroll your token.' | trans({'%URL%': selfserviceUrl })|raw }}</p>
+    {% endif %}
 
 {% else %}
 
-	<p>Unexpected error occurred while performing second factor authentication.<br/><br/>
-	{{ status }}<br/>
-	{{ subStatus }}<br/>
-	{{ statusMessage }}</p>
+    <p>{{ 'Unexpected error occurred while performing second factor authentication.' | trans }}<br/><br/>
+    {{ status }}<br/>
+    {{ subStatus }}<br/>
+    {{ statusMessage }}</p>
 
-	<p>Please try again or contact your support desk.</p>
+    <p>{{ 'Please try again or contact your support desk.' | trans }}</p>
 
 {% endif %}