SAML cleanup

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_user_login/README.md

@@ -1,6 +1,6 @@
 # OS2Loop user login
 
-Log in via OpenID Connect and SAML.
+Log in via OpenID Connect.
 
 Go to Administration › Configuration › OS2Loop › OS2Loop user login settings
 (`/admin/config/os2loop/os2loop_user_login/settings`) to enable login methods.
@@ -123,27 +123,6 @@ Check your overwrites by running
 vendor/bin/drush config:get --include-overridden openid_connect.settings
 ```
 
-## SAML
-
-The [SAML Authentication](https://www.drupal.org/project/samlauth) module is
-used for SAML authentication (!).
-
-```php
-// web/sites/*/settings.local.php
-$config['samlauth.authentication']['sp_entity_id'] = 'os2loop;
-$config['samlauth.authentication']['wsp_name_id_format'] = '';
-// Folder containing `certs` folder with files `sp.{crt,key}`.
-$config['samlauth.authentication']['sp_cert_folder'] = __DIR__.'/../../..';
-$config['samlauth.authentication']['idp_entity_id'] = …; // Get this from you IdP metadata.
-$config['samlauth.authentication']['idp_single_sign_on_service'] = …; // Get this from you IdP metadata.
-$config['samlauth.authentication']['idp_x509_certificate'] = …; // Get this from you IdP metadata.
-$config['samlauth.authentication']['unique_id_attribute'] = 'upn';
-$config['samlauth.authentication']['create_users'] = TRUE;
-$config['samlauth.authentication']['user_name_attribute'] = 'name';
-$config['samlauth.authentication']['user_mail_attribute'] = 'mail';
-$config['samlauth.authentication']['sp_name_id_format'] = 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress';
-```
-
 ### Translations
 
 On the login form, the OpenID Connect login buttons will show a generic “Log in

web/profiles/custom/os2loop/modules/os2loop_user_login/src/Form/SettingsForm.php

@@ -96,21 +96,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ),
     ];
 
-    $form['show_saml_login'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show SAML login'),
-      '#default_value' => $config->get('show_saml_login'),
-      '#description' => $this->t(
-        'Show SAML login button on user login page. Set up proper <a href="@config_url">SAML configuration</a> before enabling this.',
-        [
-          '@config_url' => Url::fromRoute('samlauth.samlauth_configure_form')->toString(),
-        ]
-      ),
-    ];
-
     $options['oidc'] = $this->t('OpenID Connect');
-    // @todo handle SAML
-    // $options['saml'] = $this->t('SAML');
     $form['default_login_method'] = [
       '#type' => 'select',
       '#title' => $this->t('Default login method'),
@@ -137,7 +123,6 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->configFactory->getEditable(static::SETTINGS_NAME)
       ->set('show_drupal_login', $form_state->getValue('show_drupal_login'))
       ->set('show_oidc_login', $form_state->getValue('show_oidc_login'))
-      ->set('show_saml_login', $form_state->getValue('show_saml_login'))
       ->set('default_login_method', $form_state->getValue('default_login_method'))
       ->set('hide_logout_menu_item', $form_state->getValue('hide_logout_menu_item'))
       ->save();

web/profiles/custom/os2loop/modules/os2loop_user_login/src/Helper/Helper.php

@@ -10,7 +10,6 @@
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Url;
 use Drupal\os2loop_settings\Settings;
 use Drupal\os2loop_user_login\Form\SettingsForm;
 use Drupal\user\UserInterface;
@@ -114,18 +113,6 @@ public function alterForm(&$form, FormStateInterface $form_state, $form_id) {
           '#attributes' => ['id' => 'drupal-login'],
         ];
       }
-
-      if ($this->config->get('show_saml_login')) {
-        $form['saml_login'] = [
-          '#weight' => -100,
-          '#type' => 'link',
-          '#title' => $this->t('Log in with SAML'),
-          '#url' => Url::fromRoute('samlauth.saml_controller_login'),
-          '#attributes' => [
-            'class' => ['btn', 'btn-primary'],
-          ],
-        ];
-      }
     }
   }
 
@@ -156,10 +143,6 @@ public function preprocessBlock(array &$variables) {
         case 'oidc':
           $variables['default_login_form_id'] = 'openid-connect-login-form';
           break;
-
-        case 'saml':
-          // @todo Handle SAML redirect
-          break;
       }
     }
   }