From 3f848587542839c6b45672e76d4797514b477241 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Wed, 26 Apr 2023 13:30:06 -0400 Subject: [PATCH] better debug logs for board process access rules --- lib/Auth/Source/FSFDrupalAuth.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/Auth/Source/FSFDrupalAuth.php b/lib/Auth/Source/FSFDrupalAuth.php index a44f5a8..46ad5d4 100644 --- a/lib/Auth/Source/FSFDrupalAuth.php +++ b/lib/Auth/Source/FSFDrupalAuth.php @@ -485,24 +485,25 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase $adhoc_params = ['adhoc_access_group_id' => intval($this->nomination_process_adhoc_access_group_id)]; if ($this->nomination_process_active != 'true' ) { + Logger::debug('fsfdrupalauth:'.$this->authId.': Nomination board process checks not active'); $attributes['nomination_process'] = ['false']; } elseif ($compare_res($donation_query('query_nomination_process_adhoc', $adhoc_params), 1)) { + Logger::debug('fsfdrupalauth:'.$this->authId.': In adhoc list of contacts for nomination board process'); $attributes['nomination_process'] = ['true']; } elseif ($attributes['is_member'] != ['true']) { - Logger::debug('fsfdrupalauth:'.$this->authId. - ': Not a member / comparable donor during window for board process.'); + Logger::debug('fsfdrupalauth:'.$this->authId.': Not a current member for nomination board process'); $attributes['nomination_process'] = ['false']; } elseif ($nomination_process_analyze_history($donation_query('query_nomination_process_donations', $donation_params)) || $compare_res($donation_query('query_nomination_process_gift_receipt', $gift_member_params), 1)) { + Logger::debug('fsfdrupalauth:'.$this->authId.': Past membership / donations meet threshold for nomination board process'); $attributes['nomination_process'] = ['true']; } else { - Logger::debug('fsfdrupalauth:'.$this->authId. - ': Not a member / comparable donor during window for board process.'); + Logger::debug('fsfdrupalauth:'.$this->authId.': Past membership / donations do not meet threshold for nomination board process'); $attributes['nomination_process'] = ['false']; } @@ -516,32 +517,33 @@ class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase $adhoc_params_no = ['adhoc_access_group_id' => intval($this->discussion_process_adhoc_no_access_group_id)]; if ($this->discussion_process_active != 'true' ) { + Logger::debug('fsfdrupalauth:'.$this->authId.': Discussion board process checks not active'); $attributes['discussion_process'] = ['false']; } elseif ($compare_res($donation_query('query_discussion_process_adhoc', $adhoc_params_no), 1)) { - Logger::debug('fsfdrupalauth:'.$this->authId. - ': Nominee not eligible for board nominee discussion process.'); + Logger::debug('fsfdrupalauth:'.$this->authId.': Nominee not allowed to participate in board discussion process.'); $attributes['discussion_process'] = ['false']; } elseif ($compare_res($donation_query('query_discussion_process_adhoc', $adhoc_params), 1)) { + Logger::debug('fsfdrupalauth:'.$this->authId.': In adhoc list of contacts for discussion board process'); $attributes['discussion_process'] = ['true']; } elseif ($attributes['is_fsf_staff'] == ['true']) { + Logger::debug('fsfdrupalauth:'.$this->authId.': Is staff, so can access discussion board process'); $attributes['discussion_process'] = ['true']; } elseif ($attributes['is_member'] != ['true']) { - Logger::debug('fsfdrupalauth:'.$this->authId. - ': Not eligible for board nominee discussion process.'); + Logger::debug('fsfdrupalauth :'.$this->authId.': Not a member, so not eligible for board nominee discussion process.'); $attributes['discussion_process'] = ['false']; } elseif ($compare_res($old_membership_query('query_discussion_process_old_membership', $old_member_params), 1) || $discussion_process_analyze_history($donation_query('query_discussion_process_donations', $donation_params))) { + Logger::debug('fsfdrupalauth:'.$this->authId.': Past membership / donations meet threshold for discussion board process'); $attributes['discussion_process'] = ['true']; } else { - Logger::debug('fsfdrupalauth:'.$this->authId. - ': Not eligible for board nominee discussion process.'); + Logger::debug('fsfdrupalauth:'.$this->authId.': Past membership / donations do not meet threshold for discussion board process'); $attributes['discussion_process'] = ['false']; } -- 2.25.1