Merge pull request #330 from minvws/fixes-v0.1

Fixes for NVI and PRS v0.1

Author: ricklambrechts

.env.example

@@ -23,6 +23,7 @@ HMAC_KEY=
 GF_OAUTH_URL=
 GF_PRS_URL=
 GF_NVI_URL=
+GF_NVI_CUSTODIAN_IDENTIFIER_VALUE=
 
 GF_CLIENT_CERT=
 GF_CLIENT_KEY=

app/Http/Controllers/IndexController.php

@@ -19,9 +19,11 @@
 
 class IndexController extends Controller
 {
+    public const REGISTERED_TEST_BSN = '999990007';
+
     public function index(DemoService $demoService): View
     {
-        $demoService->createNVIDataReference('999990007');
+        $demoService->createNVIDataReference(self::REGISTERED_TEST_BSN);
 
         return view('index', [
             'datadomains' => DATA_DOMAINS,

app/Services/DemoService.php

@@ -5,25 +5,23 @@
 namespace App\Services;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 
 class DemoService
 {
     /**
      * The paths to the mTLS certificate and key. These are used to authenticate with the PRS and NVI.
-     * @var string
      */
     protected string $mtls_cert;
+
     /***
      * The paths to the mTLS certificate and key. These are used to authenticate with the PRS and NVI.
-     * @var string
      */
     protected string $mtls_key;
 
     /**
      * The verify option for Guzzle. This can be set to false to disable SSL verification, or it can
      * be set to a path to a CA bundle.
-     *
-     * @var string|bool
      */
     protected string|bool $verify;
 
@@ -36,9 +34,8 @@ public function __construct(string $mtls_cert, string $mtls_key, string|bool $ve
 
     /**
      * Retrieves an OAuth token for the given URL (audience)
-     * @param string $url
-     * @return string
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     *
+     * @throws GuzzleException
      */
     public function getOauthToken(string $url): string
     {
@@ -49,26 +46,24 @@ public function getOauthToken(string $url): string
             'verify' => $this->verify,
         ]);
 
-        $response = $client->post('/oauth/token', [
+        $response = $client->post('oauth/token', [
             'form_params' => [
-                'target_audience' => $url,
+                'target_audience' => rtrim($url, '/'),
                 'grant_type' => 'client_credentials',
                 'scope' => 'epd:read',
             ],
         ]);
 
         $data = json_decode((string) $response->getBody(), true);
+
         return $data['access_token'];
     }
 
     /**
      * This creates a blinded input for a given hashed BSN. We do this by calling a test endpoint on the PRS, since PHP
      * does not have the necessary cryptographic libraries to do this locally.
      *
-     * @param string $token
-     * @param string $hashed_bsn
-     * @return array
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      */
     public function createPrsInput(string $token, string $hashed_bsn): array
     {
@@ -79,7 +74,7 @@ public function createPrsInput(string $token, string $hashed_bsn): array
             'verify' => $this->verify,
         ]);
 
-        $response = $client->post('/test/oprf/client', [
+        $response = $client->post('test/oprf/client', [
             'headers' => [
                 'Authorization' => "Bearer $token",
             ],
@@ -88,16 +83,13 @@ public function createPrsInput(string $token, string $hashed_bsn): array
             ],
         ]);
 
-        return json_decode((string)$response->getBody(), true);
+        return json_decode((string) $response->getBody(), true);
     }
 
     /**
      * Evaluate the blinded input with the PRS and return the result.
      *
-     * @param string $token
-     * @param string $input
-     * @return array
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      */
     public function prsEvaluate(string $token, string $input): array
     {
@@ -108,7 +100,7 @@ public function prsEvaluate(string $token, string $input): array
             'verify' => $this->verify,
         ]);
 
-        $response = $client->post('/oprf/eval', [
+        $response = $client->post('oprf/eval', [
             'headers' => [
                 'Authorization' => "Bearer $token",
             ],
@@ -119,17 +111,13 @@ public function prsEvaluate(string $token, string $input): array
             ],
         ]);
 
-        return json_decode((string)$response->getBody(), true);
+        return json_decode((string) $response->getBody(), true);
     }
 
     /**
      * Retrieves data from the NVI for a given token, eval_input and blind_factor.
      *
-     * @param string $token
-     * @param string $eval_input
-     * @param string $blind_factor
-     * @return array
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      */
     public function retrieveFromNVI(string $token, string $eval_input, string $blind_factor): array
     {
@@ -140,7 +128,7 @@ public function retrieveFromNVI(string $token, string $eval_input, string $blind
             'verify' => $this->verify,
         ]);
 
-        $response = $client->post('/Organization/$localize', [
+        $response = $client->post('Organization/$localize', [
             'headers' => [
                 'Authorization' => "Bearer $token",
             ],
@@ -162,21 +150,18 @@ public function retrieveFromNVI(string $token, string $eval_input, string $blind
                             'code' => 'LaboratoryTestResult',
                         ],
                     ],
-                ]
+                ],
             ],
         ]);
 
-        return json_decode((string)$response->getBody(), true);
+        return json_decode((string) $response->getBody(), true);
     }
 
-
     /**
      * Creates a NVIDataReference for the given BSN. This is used to demonstrate the full flow of creating a reference
      * in the NVI and then retrieving it.
      *
-     * @param string $bsn
-     * @return void
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      */
     public function createNVIDataReference(string $bsn): void
     {
@@ -197,15 +182,15 @@ public function createNVIDataReference(string $bsn): void
             'verify' => $this->verify,
         ]);
 
-        $client->post('/NVIDataReference', [
+        $client->post('NVIDataReference', [
             'headers' => [
                 'Authorization' => "Bearer $token",
             ],
             'json' => [
                 'resourceType' => 'NVIDataReference',
                 'source' => [
-                    'system' => "urn:oid:2.16.528.1.1007.3.3",
-                    'value' => "90000206"
+                    'system' => 'urn:oid:2.16.528.1.1007.3.3',
+                    'value' => config('gfmodules.nvi.custodian_identifier_value'),
                 ],
                 'sourceType' => [
                     'coding' => [

config/gfmodules.php

@@ -14,6 +14,7 @@
     ],
     'nvi' => [
         'url' => env('GF_NVI_URL'),
+        'custodian_identifier_value' => env('GF_NVI_CUSTODIAN_IDENTIFIER_VALUE', '90000206'),
     ],
     'client_cert' => env('GF_CLIENT_CERT'),
     'client_key' => env('GF_CLIENT_KEY'),

resources/views/index.blade.php

@@ -27,7 +27,7 @@
         @csrf
         <div class="form-group">
             <label class="required">Vindt patient</label>
-            <input name="bsn" type="text" maxlength="9" placeholder="BSN nummer">
+            <input name="bsn" type="text" maxlength="9" placeholder="BSN nummer" value="{{ \App\Http\Controllers\IndexController::REGISTERED_TEST_BSN }}">
         </div>
 
         <div class="form-group">