Merge pull request #263 from dBucik/stats_hide_prot

feat: 🎸 Possibility to hide authN protocol, small fixes

Author: Dominik František Bučík

templates/listOfSps-tpl.php

@@ -110,14 +110,16 @@
                     <thead>
                     <tr>
                         <th><?php echo $this->t('{perun:listOfSps:name}'); ?></th>
-                        <th><?php echo $this->t('{perun:listOfSps:authenticate_protocol}'); ?></th>
                         <?php
+                        if ($this->data['showProtocol']) {
+                            echo '<th>' . $this->t('{perun:listOfSps:authenticate_protocol}') . '</th>' . PHP_EOL;
+                        }
                         foreach ($attributesToShow as $attr) {
                             if (!empty($samlServices)) {
-                                echo "<th class='" . ListOfSps::getClass(
-                                    array_values($samlServices)[0]['facilityAttributes'][$attr]['type']
-                                ) . "'>" . array_values($samlServices)[0]['facilityAttributes'][$attr]['displayName']
-                                . '</th>';
+                                $displayName = array_values(
+                                    $samlServices
+                                )[0]['facilityAttributes'][$attr]['displayName'];
+                                echo '<th>' . $displayName . '</th>';
                             }
                         }
                         ?>
@@ -138,10 +140,12 @@
                                 $service['loginURL']['value'] ?? null
                             )
                             . '</td>';
-                        if (array_key_exists($service['facility']->getID(), $samlServices)) {
-                            echo '<td>' . $this->t('{perun:listOfSps:saml}') . '</td>';
-                        } else {
-                            echo '<td>' . $this->t('{perun:listOfSps:oidc}') . '</td>';
+                        if ($this->data['showProtocol']) {
+                            if (array_key_exists($service['facility']->getID(), $samlServices)) {
+                                echo '<td>' . $this->t('{perun:listOfSps:saml}') . '</td>';
+                            } else {
+                                echo '<td>' . $this->t('{perun:listOfSps:oidc}') . '</td>';
+                            }
                         }
                         foreach ($attributesToShow as $attr) {
                             $type = $service['facilityAttributes'][$attr]['type'];

www/listOfSps.php

@@ -19,6 +19,7 @@
 const PERUN_LOGIN_URL_ATTR_NAME = 'listOfSps.loginURLAttr';
 const PERUN_TEST_SP_ATTR_NAME = 'listOfSps.isTestSpAttr';
 const PERUN_SHOW_ON_SERVICE_LIST_ATTR_NAME = 'listOfSps.showOnServiceListAttr';
+const PERUN_SHOW_PROTOCOL = 'listOfSps.showProtocol';
 const PERUN_SAML2_ENTITY_ID_ATTR_NAME = 'listOfSps.SAML2EntityIdAttr';
 const PERUN_OIDC_CLIENT_ID_ATTR_NAME = 'listOfSps.OIDCClientIdAttr';
 
@@ -72,6 +73,8 @@
 $perunShowOnServiceListAttr
     = $conf->getString(PERUN_SHOW_ON_SERVICE_LIST_ATTR_NAME, null);
 
+$showProtocol = $conf->getBoolean(PERUN_SHOW_PROTOCOL, true);
+
 $rpcAdapter = new AdapterRpc();
 $attributeDefinition = [];
 $attributeDefinition[$perunProxyIdentifierAttr] = $proxyIdentifier;
@@ -192,6 +195,7 @@
     $t->data['statistics'] = $statistics;
     $t->data['attributesToShow'] = $attributesToShow;
     $t->data['multilingualAttributes'] = $multilingualAttributes;
+    $t->data['showProtocol'] = $showProtocol;
     $t->data['isNameMultilingual'] = in_array($perunServiceNameAttr, $multilingualAttributes, true);
     $t->data['samlServices'] = $samlServices;
     $t->data['oidcServices'] = $oidcServices;