You have been given a cookie to allow you to test beta-enabled IDPs.
"; -echo "To remove the cookie, just close your browser.
"; diff --git a/modules/sildisco/src/IdPDisco.php b/modules/sildisco/src/IdPDisco.php index eefdd9f..770cc12 100644 --- a/modules/sildisco/src/IdPDisco.php +++ b/modules/sildisco/src/IdPDisco.php @@ -7,7 +7,6 @@ use Sil\SspUtils\Metadata; use SimpleSAML\Auth; use SimpleSAML\Logger; -use SimpleSAML\Session; use SimpleSAML\Utils\HTTP; use SimpleSAML\XHTML\IdPDisco as SSPIdPDisco; use SimpleSAML\XHTML\Template; @@ -26,12 +25,6 @@ class IdPDisco extends SSPIdPDisco /* The session type for this class */ public static string $sessionType = 'sildisco:authentication'; - /* The session key for checking if the current user has the beta_tester cookie */ - public static string $betaTesterSessionKey = 'beta_tester'; - - /* The idp metadata key that says whether an IDP is betaEnabled */ - public static string $betaEnabledMdKey = 'betaEnabled'; - /* The idp metadata key that says whether an IDP is enabled */ public static string $enabledMdKey = 'enabled'; @@ -74,7 +67,7 @@ private function getSPEntityIDAndReducedIdpList(): array ); } - return array($spEntityId, self::enableBetaEnabled($idpList)); + return array($spEntityId, $idpList); } /** @@ -135,40 +128,6 @@ public function handleRequest(): void $t->send(); } - /** - * @param array $idpList the IDPs with their metadata - * @param bool|null $isBetaTester optional (default=null) just for unit testing - * @return array $idpList - * - * If the current user has the beta_tester cookie, then for each IDP in - * the idpList that has 'betaEnabled' => true, give it 'enabled' => true - * - */ - public static function enableBetaEnabled(array $idpList, ?bool $isBetaTester = null): array - { - - if ($isBetaTester === null) { - $session = Session::getSessionFromRequest(); - $isBetaTester = $session->getData( - self::$sessionType, - self::$betaTesterSessionKey - ); - } - - if (!$isBetaTester) { - return $idpList; - } - - foreach ($idpList as $idp => $idpMetadata) { - if (!empty($idpMetadata[self::$betaEnabledMdKey])) { - $idpMetadata[self::$enabledMdKey] = true; - $idpList[$idp] = $idpMetadata; - } - } - - return $idpList; - } - /** * @inheritDoc */ diff --git a/tests/IdpDiscoTest.php b/tests/IdpDiscoTest.php deleted file mode 100644 index 4d6fa5f..0000000 --- a/tests/IdpDiscoTest.php +++ /dev/null @@ -1,52 +0,0 @@ -assertEquals($expected, $results); -// } -// -// public function testEnableBetaEnabledNoChange() -// { -// $isBetaEnabled = 1; -// $enabledKey = IdPDisco::$enabledMdKey; -// $idpList = [ -// 'idp1' => [$enabledKey => false], -// 'idp2' => [$enabledKey => true], -// ]; -// $expected = $idpList; -// -// $results = IdPDisco::enableBetaEnabled($idpList, $isBetaEnabled); -// $this->assertEquals($expected, $results); -// } -// -// public function testEnableBetaEnabledChange() -// { -// $isBetaEnabled = 1; -// $enabledKey = IdPDisco::$enabledMdKey; -// $betaEnabledKey = IdPDisco::$betaEnabledMdKey; -// $idpList = [ -// 'idp1' => [$enabledKey => false], -// 'idp2' => [$enabledKey => true, $betaEnabledKey => true], -// 'idp3' => [$enabledKey => false, $betaEnabledKey => true], -// 'idp4' => [$enabledKey => false, $betaEnabledKey => false], -// ]; -// $expected = $idpList; -// $expected['idp3'][$enabledKey] = true; -// -// $results = IdPDisco::enableBetaEnabled($idpList, $isBetaEnabled); -// $this->assertEquals($expected, $results); -// } - -} From eb7d4edbcc0f53e154653e69b7f9765319f64797 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:46:06 -0600 Subject: [PATCH 2/2] remove beta-test tests --- behat.yml | 1 - dockerbuild/run-tests.sh | 1 - docs/the_hub.md | 7 ------- features/ZSp1Idp1BetaSp1Idp3.feature | 13 ------------- 4 files changed, 22 deletions(-) delete mode 100644 features/ZSp1Idp1BetaSp1Idp3.feature diff --git a/behat.yml b/behat.yml index 4ef546f..0fd106f 100644 --- a/behat.yml +++ b/behat.yml @@ -27,7 +27,6 @@ default: # - '%paths.base%//features//Sp2Idp2Sp1Idp2Sp3.feature' # - '%paths.base%//features//Sp3Idp1Sp1Idp1Sp2Idp2.feature' # - '%paths.base%//features//WwwMetadataCept.feature' -# - '%paths.base%//features//ZSp1Idp1BetaSp1Idp3.feature' status_features: paths: [ '%paths.base%//features//status.feature' ] contexts: [ 'StatusContext' ] diff --git a/dockerbuild/run-tests.sh b/dockerbuild/run-tests.sh index 37c21ec..77f9735 100755 --- a/dockerbuild/run-tests.sh +++ b/dockerbuild/run-tests.sh @@ -9,6 +9,5 @@ set -e /data/run-metadata-tests.sh ./vendor/bin/phpunit -v tests/AnnouncementTest.php -./vendor/bin/phpunit -v tests/IdpDiscoTest.php /data/run-integration-tests.sh diff --git a/docs/the_hub.md b/docs/the_hub.md index e366f45..e9bab58 100644 --- a/docs/the_hub.md +++ b/docs/the_hub.md @@ -21,13 +21,6 @@ It is also used by the `TagGroup.php` Auth Proc to convert group names into the `idp|