Merge pull request #42 from CESNET/fix

Dominik František Bučík · web-flow · commit 1d74e5b919b1 · 2020-12-01T09:31:52.000+01:00
Allow to get SP name from UIInfo&gt;DisplayName if isset
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Fixed
+- Allow to get SP name from UIInfo>DisplayName if isset
 
 ## [v4.2.1]
 #### Fixed
diff --git a/lib/DatabaseCommand.php b/lib/DatabaseCommand.php
@@ -227,7 +227,11 @@ private function getEntities($request)
         }
         if ($this->mode !== Config::MODE_SP) {
             $entities[Config::MODE_SP]['id'] = $request['Destination']['entityid'];
-            $entities[Config::MODE_SP]['name'] = $request['Destination']['name']['en'] ?? '';
+            if (isset($request['Destination']['UIInfo']['DisplayName']['en'])) {
+                $entities[Config::MODE_SP]['name'] = $request['Destination']['UIInfo']['DisplayName']['en'];
+            } else {
+                $entities[Config::MODE_SP]['name'] = $request['Destination']['name']['en'] ?? '';
+            }
         }
 
         if ($this->mode !== Config::MODE_PROXY && $this->mode !== Config::MODE_MULTI_IDP) {

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,11 @@ private function getEntities($request)`
`227`	`227`	`}`
`228`	`228`	`if ($this->mode !== Config::MODE_SP) {`
`229`	`229`	`$entities[Config::MODE_SP]['id'] = $request['Destination']['entityid'];`
`230`		`- $entities[Config::MODE_SP]['name'] = $request['Destination']['name']['en'] ?? '';`
	`230`	`+ if (isset($request['Destination']['UIInfo']['DisplayName']['en'])) {`
	`231`	`+ $entities[Config::MODE_SP]['name'] = $request['Destination']['UIInfo']['DisplayName']['en'];`
	`232`	`+ } else {`
	`233`	`+ $entities[Config::MODE_SP]['name'] = $request['Destination']['name']['en'] ?? '';`
	`234`	`+ }`
`231`	`235`	`}`
`232`	`236`
`233`	`237`	`if ($this->mode !== Config::MODE_PROXY && $this->mode !== Config::MODE_MULTI_IDP) {`