Merge pull request #31 from melanger/patch-5

* Limit copy-paste in DatabaseCommand.php
* read spName only if present

Author: vyskocilpavel

CHANGELOG.md

@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - Update README.md
     - describe setup for modes PROXY/SP/IDP
     - change array notation from `array()` to `[]`
+- Read spName from $request only if present
 
 ## [v3.1.0]
 #### Added

lib/Auth/Process/DatabaseCommand.php

@@ -20,23 +20,25 @@ public static function insertLogin(&$request, &$date)
         $identityProvidersMapTableName = $databaseConnector->getIdentityProvidersMapTableName();
         $serviceProvidersMapTableName = $databaseConnector->getServiceProvidersMapTableName();
 
+        if (!in_array($databaseConnector->getMode(), ['PROXY', 'IDP', 'SP'])) {
+            throw new Exception('Unknown mode is set. Mode has to be one of the following: PROXY, IDP, SP.');
+        }
+
+        if ($databaseConnector->getMode() !== 'IDP') {
+            $idpName = $request['Attributes']['sourceIdPName'][0];
+            $idpEntityID = $request['saml:sp:IdP'];
+        }
+        if ($databaseConnector->getMode() !== 'SP') {
+            $spEntityId = $request['Destination']['entityid'];
+            $spName = isset($request['Destination']['name']) ? $request['Destination']['name']['en'] : '';
+        }
+
         if ($databaseConnector->getMode() === 'IDP') {
             $idpName = $databaseConnector->getIdpName();
             $idpEntityID = $databaseConnector->getIdpEntityId();
-            $spEntityId = $request['Destination']['entityid'];
-            $spName = $request['Destination']['name']['en'];
         } elseif ($databaseConnector->getMode() === 'SP') {
-            $idpName = $request['Attributes']['sourceIdPName'][0];
-            $idpEntityID = $request['saml:sp:IdP'];
             $spEntityId = $databaseConnector->getSpEntityId();
             $spName = $databaseConnector->getSpName();
-        } elseif ($databaseConnector->getMode() === 'PROXY') {
-            $idpName = $request['Attributes']['sourceIdPName'][0];
-            $idpEntityID = $request['saml:sp:IdP'];
-            $spEntityId = $request['Destination']['entityid'];
-            $spName = $request['Destination']['name']['en'];
-        } else {
-            throw new Exception('Unknown mode is set. Mode has to be one of the following: PROXY, IDP, SP.');
         }
 
         $year = $date->format('Y');