refactor state setting

weather-gov · May 7, 2024 · 736fe81 · 736fe81
1 parent 6e702d4
commit 736fe81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/web/modules/weather_login/config/install/weather_login.settings.yml b/web/modules/weather_login/config/install/weather_login.settings.yml
@@ -1,4 +1,4 @@
 sso_login_path: '/saml/login'
 sso_login_text: 'Login via SSO'
 sso_cancel_path: '/'
-sso_cancel_text: 'Cancel and return home'
+sso_cancel_text: 'Cancel and return home'
diff --git a/web/modules/weather_login/weather_login.module b/web/modules/weather_login/weather_login.module
@@ -20,13 +20,10 @@ function weather_login_form_user_login_form_alter(&$form, FormStateInterface $fo
     $cancelText = $config->get('sso_cancel_text');
 
     // Allow override for local login forms via $settings[] in settings.*.php
-    $settings_state = Settings::get('weather_login_local_form', 0);
-    if ($settings_state || $state) {
-        $state = 1;
-    }
+    $basicAuthSetting = Settings::get('weather_login_local_form', false);
 
     if ($loginPath) {
-        if (!$state) {
+        if (!$basicAuthSetting) {
             $form['name']['#access'] = false;
             $form['pass']['#access'] = false;
             $form['actions']['#access'] = false;

diff --git a/web/modules/weather_login/weather_login.services.yml b/web/modules/weather_login/weather_login.services.yml
@@ -2,4 +2,4 @@ services:
   weather_login.user_route_subscriber:
     class: Drupal\weather_login\RouteSubscriber\UserLoginRouteSubscriber
     tags:
-      - { name: event_subscriber }
+      - { name: event_subscriber }