Merge pull request #234 from italia/master

fix dev
italia · Jan 22, 2024 · fe1cec8 · fe1cec8
2 parents 3747474 + 7f3fa45
commit fe1cec8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "config": {
-        "version": "3.18.3",
+        "version": "3.18.4",
         "allow-plugins": {
             "simplesamlphp/composer-module-installer": true
         }

diff --git a/lib/ResponseHandler.php b/lib/ResponseHandler.php
@@ -101,7 +101,7 @@ protected function makeJWS($payload, $exp_time, $iss, $aud, $jwk_pem): string {
             'data' => $payload,                                 // Authentication Data
         ];
 
-        if(array_key_exists('fiscalNumber', $payload)) {        // Subject - fiscalNumber, only if exists
+        if(is_array($payload) && array_key_exists('fiscalNumber', $payload)) {        // Subject - fiscalNumber, only if exists
             $data['sub'] = $payload['fiscalNumber'];
         }
 
@@ -119,4 +119,4 @@ protected function makeJWS($payload, $exp_time, $iss, $aud, $jwk_pem): string {
 
         return $token;
     }
-}
+}
diff --git a/setup/Setup.php b/setup/Setup.php
@@ -658,11 +658,11 @@ public static function setup(Event $event) {
                             "logo"=> "/assets/img/logo.png",
                             "client_id"=> $proxyClientID,
                             "client_secret"=> $proxyClientSecret,
-                            "level": 2,
-                            "atcs_index": 0,
-                            "handler": "Plain",
-                            "response_attributes_prefix": ""
-                            "redirect_uri"=> [$proxyRedirectURI]
+                            "level" => 2,
+                            "atcs_index" => 0,
+                            "handler" => "Plain",
+                            "response_attributes_prefix" => "",
+                            "redirect_uri"=> [$proxyRedirectURI],
                         )
                     ),
                     'signProxyResponse'=> $signProxyResponse,
@@ -1725,7 +1725,7 @@ public static function remove() {
      * @param $config
      * @return array
      */
-    private static function proxyVariables($config): array {
+    private static function proxyVariables($config) {
         return array(
             "{{SDKHOME}}" => $config['installDir'],
             "{{PROXY_CLIENT_CONFIG}}" => var_export($config['proxyConfig'], true),