From 7c03fc1954da83fd314c94a357141357d2539e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Thu, 29 Apr 2021 10:46:46 +0200 Subject: [PATCH] Fix the wiki FPCA requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/mediawiki/files/OpenIDConnect.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/roles/mediawiki/files/OpenIDConnect.php b/roles/mediawiki/files/OpenIDConnect.php index 7e6f012e3f..4798f23698 100644 --- a/roles/mediawiki/files/OpenIDConnect.php +++ b/roles/mediawiki/files/OpenIDConnect.php @@ -166,14 +166,18 @@ class OpenIDConnect extends PluggableAuth { wfDebugLog( 'OpenID Connect', 'Redirect URL: ' . $redirectURL ); if ( $oidc->authenticate() ) { - if(in_array($oidc->requestUserInfo('agreements'), "FPCA")) { + if(!in_array("signed_fpca", $oidc->requestUserInfo('groups'))) { $errorMessage = 'You need to have signed the FPCA'; return false; } - if(count($oidc->requestUserInfo('groups')) < 1) { - $errorMessage = 'You need to have signed the FPCA+1 group'; + /* + * Enable the following block to require the equivalent of CLA+1 + * + if(!in_array("fedora-contributor", $oidc->requestUserInfo('groups'))) { + $errorMessage = 'You need to be in at least one group'; return false; } + */ $realname = $oidc->requestUserInfo( 'name' ); $email = $oidc->requestUserInfo( 'email' );