Add SHO and EPPN to SBS authz call

Author: mrvanes

library/EngineBlock/Corto/Filter/Command/SRAMInterruptFilter.php

@@ -91,14 +91,17 @@ private function buildRequest(): AuthzRequest
         $attributes = $this->getResponseAttributes();
         $id = $this->_request->getId();
 
-        // $user_id = $attributes['urn:mace:dir:attribute-def:uid'][0];
         $user_id = $this->_collabPersonId;
+        $sho = $attributes['urn:mace:terena.org:attribute-def:schacHomeOrganization'][0] ?? "";
+        $eppn = $attributes['urn:mace:dir:attribute-def:eduPersonPrincipalName'][0] ?? "";
         $continue_url = $this->_server->getUrl('SRAMInterruptService', '') . "?ID=$id";
         $service_id = $this->_serviceProvider->entityId;
         $issuer_id = $this->_identityProvider->entityId;
 
         return AuthzRequest::create(
             $user_id,
+            $sho,
+            $eppn,
             $continue_url,
             $service_id,
             $issuer_id

src/OpenConext/EngineBlockBundle/Sbs/Dto/AuthzRequest.php

@@ -28,6 +28,16 @@ class AuthzRequest implements JsonSerializable
      */
     public $userId;
 
+    /**
+     * @var string
+     */
+    public $schacHomeOrganization;
+
+    /**
+     * @var string
+     */
+    public $eduPersonPrincipalName;
+
     /**
      * @var string
      */
@@ -45,17 +55,23 @@ class AuthzRequest implements JsonSerializable
 
     public static function create(
         string $userId,
+        string $sho,
+        string $eppn,
         string $continueUrl,
         string $serviceId,
         string $issuerId
     ) : AuthzRequest {
         Assertion::string($userId, 'The userId must be a string.');
+        Assertion::string($sho, 'The schacHomeOrganization must be a string.');
+        Assertion::string($eppn, 'The eduPersonPrincipalName must be a string.');
         Assertion::string($continueUrl, 'The continueUrl must be a string.');
         Assertion::string($serviceId, 'The serviceId must be a string.');
         Assertion::string($issuerId, 'The issuerId must be a string.');
 
         $request = new self();
         $request->userId = $userId;
+        $request->schacHomeOrganization = $sho;
+        $request->eduPersonPrincipalName = $eppn;
         $request->continueUrl = $continueUrl;
         $request->serviceId = $serviceId;
         $request->issuerId = $issuerId;
@@ -67,6 +83,8 @@ public function jsonSerialize() : array
     {
         return [
             'user_id' => $this->userId,
+            'sho' => $this->schacHomeOrganization,
+            'eppn' => $this->eduPersonPrincipalName,
             'continue_url' => $this->continueUrl,
             'service_id' => $this->serviceId,
             'issuer_id' => $this->issuerId