Merge pull request #189 from BaranekD/addInstitution_whitelisting_disabled

feat: Turn off addInstitution when whitelisting is disabled

Author: vyskocilpavel

config-templates/module_perun.php

@@ -179,7 +179,7 @@
          * specify if disco module should filter out IdPs which are not whitelisted neither committed to CoCo or RaS.
          * default is false.
          */
-        'disable_white_listing' => false,
+        'disable_whitelisting' => false,
         /**
          * Specify translate module
          */
@@ -223,7 +223,12 @@
         'boxed' => true,
         // block of IDPs
         'idp_blocks_config' => [
-            [
+            'preferred_idps' => [
+                'type' => 'tagged',
+                'name' => 'preferred_idps',
+                'tags' => ['preferred'],
+            ],
+            'edugain' => [
                 // type has to be 'inlinesearch' for displaying eduGAIN entries or 'tagged' for custom IDPs
                 'type' => 'inlinesearch',
                 // name that will be used in some classes and translation keys
@@ -246,7 +251,7 @@
                 ],
                  */
             ],
-            [
+            'social_idps' => [
                 'type' => 'tagged',
                 'name' => 'social_idps',
                 'text_enabled' => false,

dictionaries/disco.definition.json

@@ -67,6 +67,10 @@
     "en": "Still can't find your institution? Contact us at",
     "cs": "Stále nemůžete nalézt vaši instituci? Kontaktujte nás na"
   },
+  "cannot_find_institution_disabled_whitelisting": {
+    "en": "Cannot find your institution? Contact us at",
+    "cs": "Nemúžete nalézt vaši organizaci? Kontaktujte nás na"
+  },
   "js_not_loaded_message": {
     "en": "Your browser does not support the required functionality to display this page. Please use a different browser and try again. We apologize for the caused difficulties.",
     "cs": "Váš prohlížeč nepodporuje funkcionalitu potřebnou pro správné zobrazení této stránky. Zkuste, prosím, použít jiný prohlížeč. Omlouváme se za vzniklé problémy."

lib/Disco.php

@@ -473,6 +473,7 @@ public static function showWarning(DiscoTemplate $t, WarningConfiguration $warni
     public static function showInlineSearch(
         DiscoTemplate $t,
         Configuration $blockConfig,
+        bool $disableWhitelisting,
         Configuration $addInstitution = null
     ): string {
         $result = '';
@@ -518,7 +519,11 @@ public static function showInlineSearch(
         $result .= '    </div>' . PHP_EOL;
         # NO ENTRIES BLOCK
         $result .= '    <div id="no-entries" class="no-idp-found alert alert-info entries-warning-block">' . PHP_EOL;
-        if ($isAddInstitutionApp && $addInstitutionEmail !== null) {
+        if ($disableWhitelisting && $addInstitutionEmail !== null) {
+            $result .= '        ' . $t->t('{perun:disco:cannot_find_institution_disabled_whitelisting}') .
+                ' <a href="mailto:' . $addInstitutionEmail . '?subject=Request%20for%20adding%20new%20IdP">' .
+                $addInstitutionEmail . '</a>' . PHP_EOL;
+        } elseif ($isAddInstitutionApp && $addInstitutionEmail !== null) {
             $result .= '        ' . $t->t('{perun:disco:add_institution_no_entries_contact_us}') .
                 ' <a href="mailto:' . $addInstitutionEmail . '?subject=Request%20for%20adding%20new%20IdP">' .
                 $addInstitutionEmail . '</a>' . PHP_EOL;

themes/perun/perun/disco-tpl.php

@@ -82,7 +82,12 @@
         $type = $blockConfig->getString(Disco::IDP_BLOCK_TYPE);
         echo '<div class="row login-option-category">' . PHP_EOL;
         if ($type === Disco::IDP_BLOCK_TYPE_INLINESEARCH) {
-            echo Disco::showInlineSearch($this, $blockConfig, $addInstitutionConfig) . PHP_EOL;
+            echo Disco::showInlineSearch(
+                $this,
+                $blockConfig,
+                $wayfConfig->getBoolean(Disco::DISABLE_WHITELISTING, false),
+                $addInstitutionConfig
+            ) . PHP_EOL;
         }
         echo '</div>' . PHP_EOL;
     }
@@ -120,7 +125,12 @@
         $type = $blockConfig->getString(Disco::IDP_BLOCK_TYPE);
         echo '<div class="row login-option-category">' . PHP_EOL;
         if (strtolower($type) === Disco::IDP_BLOCK_TYPE_INLINESEARCH) {
-            echo Disco::showInlineSearch($this, $blockConfig, $addInstitutionConfig) . PHP_EOL;
+            echo Disco::showInlineSearch(
+                $this,
+                $blockConfig,
+                $wayfConfig->getBoolean(Disco::DISABLE_WHITELISTING, false),
+                $addInstitutionConfig
+            ) . PHP_EOL;
         } elseif (strtolower($type) === Disco::IDP_BLOCK_TYPE_TAGGED) {
             echo Disco::showTaggedIdPs($this, $blockConfig) . PHP_EOL;
         }