IdP availability is now driven by an enabled property

Author: Billy Clark

development/hub/saml20-idp-remote.php

@@ -1,5 +1,6 @@
 <?php
 $metadata['http://ssp-hub-idp1.local:8085'] = [
+    'enabled' => true,
     'metadata-set' => 'saml20-idp-remote',
     'entityid' => 'http://ssp-hub-idp1.local:8085',
     'name' => [
@@ -10,6 +11,7 @@
     'certData' => 'MIIDzzCCAregAwIBAgIJAPlZYTAQSIbHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzEPMA0GA1UEBwwGV2F4aGF3MQwwCgYDVQQKDANTSUwxDTALBgNVBAsMBEdUSVMxDjAMBgNVBAMMBVN0ZXZlMSQwIgYJKoZIhvcNAQkBFhVzdGV2ZV9iYWd3ZWxsQHNpbC5vcmcwHhcNMTYxMDE3MTIzMTQ1WhcNMjYxMDE3MTIzMTQ1WjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTkMxDzANBgNVBAcMBldheGhhdzEMMAoGA1UECgwDU0lMMQ0wCwYDVQQLDARHVElTMQ4wDAYDVQQDDAVTdGV2ZTEkMCIGCSqGSIb3DQEJARYVc3RldmVfYmFnd2VsbEBzaWwub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArssOaeKbdOQFpN6bBolwSJ/6QFBXA73Sotg60anx9v6aYdUTmi+b7SVtvOmHDgsD5X8pN/6Z11QCZfTYg2nW3ZevGZsj8W/R6C8lRLHzWUr7e7DXKfj8GKZptHlUs68kn0ndNVt9r/+irJe9KBdZ+4kAihykomNdeZg06bvkklxVcvpkOfLTQzEqJAmISPPIeOXes6hXORdqLuRNTuIKarcZ9rstLnpgAs2TE4XDOrSuUg3XFnM05eDpFQpUb0RXWcD16mLCPWw+CPrGoCfoftD5ZGfll+W2wZ7d0kQ4TbCpNyxQH35q65RPVyVNPgSNSsFFkmdcqP9DsFqjJ8YC6wIDAQABo1AwTjAdBgNVHQ4EFgQUD6oyJKOPPhvLQpDCC3027QcuQwUwHwYDVR0jBBgwFoAUD6oyJKOPPhvLQpDCC3027QcuQwUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAA6tCLHJQGfXGdFerQ3J0wUu8YDSLb0WJqPtGdIuyeiywR5ooJf8G/jjYMPgZArepLQSSi6t8/cjEdkYWejGnjMG323drQ9M1sKMUhOJF4po9R3t7IyvGAL3fSqjXA8JXH5MuGuGtChWxaqhduA0dBJhFAtAXQ61IuIQF7vSFxhTwCvJnaWdWD49sG5OqjCfgIQdY/mw70e45rLnR/bpfoigL67sTJxy+Kx2ogbvMR6lITByOEQFMt7BYpMtXrwvKUM7k9NOo1jREmJacC8PTx//jRhCWwzUj1RsfIri24BuITrawwqMsYl8DZiiwMpjUf9m4NPaf4E7+QRpzo+MCcg==',
 ];
 $metadata['http://ssp-hub-idp2.local:8086'] = [
+    'enabled' => true,
     'metadata-set' => 'saml20-idp-remote',
     'entityid' => 'http://ssp-hub-idp2.local:8086',
     'name' => [
@@ -19,3 +21,39 @@
     'SingleLogoutService'  => 'http://ssp-hub-idp2.local:8086/saml2/idp/SingleLogoutService.php',
     'certData' => 'MIIDzzCCAregAwIBAgIJALBaUrvz1X5DMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzEPMA0GA1UEBwwGV2F4aGF3MQwwCgYDVQQKDANTSUwxDTALBgNVBAsMBEdUSVMxDjAMBgNVBAMMBVN0ZXZlMSQwIgYJKoZIhvcNAQkBFhVzdGV2ZV9iYWd3ZWxsQHNpbC5vcmcwHhcNMTYxMDE4MTQwMDUxWhcNMjYxMDE4MTQwMDUxWjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTkMxDzANBgNVBAcMBldheGhhdzEMMAoGA1UECgwDU0lMMQ0wCwYDVQQLDARHVElTMQ4wDAYDVQQDDAVTdGV2ZTEkMCIGCSqGSIb3DQEJARYVc3RldmVfYmFnd2VsbEBzaWwub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx5mZNwjEnakJho+5etuFyx+2g9rs96iLX/LDC24aBAsdNxTNuIc1jJ7pxBxGrepEND4LkietLNBlOr1q50nq2+ddTrCfmoJB+9BqBOxcm9qWeqWbp8/arUjaxPzK3DfZrxJxIVFjzqFF7gI91y9yvEW/fqLRMhvnH1ns+N1ne59zr1y6h9mmHfBffGr1YXAfyEAuV1ich4AfTfjqhdwFwxhFLLCVnxA0bDbNw/0eGCSiA13N7a013xTurLeJu0AQaZYssMqvc/17UphH4gWDMEZAwy0EfRSBOsDOYCxeNxVajnWX1834VDpBDfpnZj996Gh8tzRQxQgT9/plHKhGiwIDAQABo1AwTjAdBgNVHQ4EFgQUApxlUQg26GrG3eH8lEG3SkqbH/swHwYDVR0jBBgwFoAUApxlUQg26GrG3eH8lEG3SkqbH/swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEANhbm8WgIqBDlF7DIRVUbq04TEA9nOJG8wdjJYdoKrPX9f/E9slkFuD2StcK99RTcowa8Z2OmW7tksa+onyH611Lq21QXh4aHzQUAm2HbsmPQRZnkByeYoCJ/1tuEho+x+VGanaUICSBVWYiebAQVKHR6miFypRElibNBizm2nqp6Q9B87V8COzyDVngR1DlWDduxYaNOBgvht3Rk9Y2pVHqym42dIfN+pprcsB1PGBkY/BngIuS/aqTENbmoC737vcb06e8uzBsbCpHtqUBjPpL2psQZVJ2Y84JmHafC3B7nFQrjdZBbc9eMHfPo240Rh+pDLwxdxPqRAZdeLaUkCQ==',
 ];
+$metadata['mock-jaars-idp'] = [
+    'enabled' => false,
+    'metadata-set' => 'saml20-idp-remote',
+    'entityid' => 'mock-jaars-idp',
+    'name' => [
+        'en' => 'jaars'
+    ],
+    'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
+];
+$metadata['mock-sil-idp'] = [
+    'enabled' => false,
+    'metadata-set' => 'saml20-idp-remote',
+    'entityid' => 'mock-sil-idp',
+    'name' => [
+        'en' => 'sil'
+    ],
+    'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
+];
+$metadata['mock-usa-idp'] = [
+    'enabled' => false,
+    'metadata-set' => 'saml20-idp-remote',
+    'entityid' => 'mock-usa-idp',
+    'name' => [
+        'en' => 'usa'
+    ],
+    'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
+];
+$metadata['mock-wga-idp'] = [
+    'enabled' => false,
+    'metadata-set' => 'saml20-idp-remote',
+    'entityid' => 'mock-wga-idp',
+    'name' => [
+        'en' => 'wga'
+    ],
+    'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
+];

themes/material/common-head-elements.php

@@ -8,6 +8,6 @@
 $colors = $this->configuration->getValue('theme.color-scheme', 'indigo-purple');
 ?>
 <link rel="stylesheet" href="/module.php/material/material.<?= $colors ?>.1.2.1.min.css">
-<link rel="stylesheet" href="/module.php/material/styles.1.0.1.css">
+<link rel="stylesheet" href="/module.php/material/styles.2.0.0.css">
 
 <script async src="/module.php/material/material.1.2.1.min.js"></script>

themes/material/default/selectidp-links.php

@@ -45,17 +45,23 @@ function setSelectedIdp(id) {
             // might've been added.  It's not meant to be displayed.
             unset($this->data['idplist']['dummy']);
 
+            $enabledIdps = [];
+            $disabledIdps = [];
             foreach ($this->data['idplist'] as $idp) {
+                $idp['enabled'] === true ? array_push($enabledIdps, $idp)
+                                         : array_push($disabledIdps, $idp);
+            }
+
+            foreach ($enabledIdps as $idp) {
                 $name = htmlspecialchars($this->t($idp['name']));
                 $idpId = htmlspecialchars($idp['entityid']);
             ?>
             <div class="mdl-card mdl-shadow--8dp margin">
                 <div class="mdl-card__media white-bg fixed-height">
                     <button class="mdl-button fill-parent no-padding" value="<?= $name ?>"
                             onclick="setSelectedIdp('<?= $idpId ?>')">
-                        <img src="<?= empty($idp['logoURL']) ?
-                                      '/module.php/material/default-logo.png' :
-                                      $idp['logoURL'] ?>">
+                        <img src="<?= empty($idp['logoURL']) ? '/module.php/material/default-logo.png'
+                                                             : $idp['logoURL'] ?>">
                     </button>
                 </div>
                 <div class="mdl-card__actions mdl-card--border">
@@ -80,12 +86,12 @@ function setSelectedIdp(id) {
             ?>
 
             <?php
-            $futureIdps = ['jaars', 'sil', 'usa', 'wga'];
-            foreach ($futureIdps as $futureIdp) {
+            foreach ($disabledIdps as $idp) {
             ?>
             <div class="mdl-card mdl-shadow--2dp margin disabled" title="Planned for a future release.">
                 <div class="mdl-card__media white-bg fixed-height" layout-children="row" child-spacing="center">
-                    <img src="//static.gtis.guru/idp-logo/<?= $futureIdp ?>-logo-disabled.png">
+                    <img src="<?= empty($idp['logoURL']) ? '/module.php/material/default-logo.png'
+                                                         : $idp['logoURL'] ?>">
                 </div>
                 <div class="mdl-card__supporting-text" layout-children="row" child-spacing="center">
                     <?= $this->t('{material:selectidp:button_login_disabled}') ?>

www/styles.1.0.1.css www/styles.2.0.0.csswww/styles.1.0.1.css renamed to www/styles.2.0.0.css

@@ -12,7 +12,7 @@
   flex-direction: row;
   align-items: center;
 
-  /* make sure the children break nicely for different browser widths, e.g., 
+  /* make sure the children break nicely for different browser widths, e.g.,
      tablet, phone, etc. */
   flex-wrap: wrap;
 }
@@ -60,14 +60,18 @@
   cursor: not-allowed;
 }
 
+.mdl-card.disabled img {
+  opacity: 0.3;
+}
+
 .alert {
   max-width: 80%;
   min-width: 30%;
   background-color: tomato;
   border-radius: 0.33em;
   padding: 1em;
-  
-  /* 
+
+  /*
      had to center manually instead of using flex due to ie11 bug that
      was causing idp cards not to wrap when parent container was centered
    */
@@ -79,10 +83,10 @@
   color: blue;
 }
 
-/* The font-size in the mdl-textfield was overriding the one in 
+/* The font-size in the mdl-textfield was overriding the one in
    caption since it was defined later in the CSS but the font-size from
    caption is what was needed here so more specificity required to override
-   it back 
+   it back
 */
 .mdl-textfield.mdl-typography--caption {
   font-size: 12px
@@ -93,8 +97,8 @@
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: local('Material Icons'), 
-       local('MaterialIcons-Regular'), 
+  src: local('Material Icons'),
+       local('MaterialIcons-Regular'),
        url(/module.php/material/material-icons.woff2) format('woff2'),
        url(/module.php/material/material-icons.woff) format('woff');
-}
+}