From d8197f2b971f8ed0fb2e4ed0ad7bf498e5bfb66c Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 8 Aug 2018 20:28:21 +0200 Subject: [PATCH] Rename providerset method to get primary providers Signed-off-by: Christoph Wurst --- core/Controller/LoginController.php | 2 +- lib/private/Authentication/TwoFactorAuth/ProviderSet.php | 2 +- tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 9d6f8aed88e..5db650c4c47 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -334,7 +334,7 @@ class LoginController extends Controller { if ($this->twoFactorManager->isTwoFactorAuthenticated($loginResult)) { $this->twoFactorManager->prepareTwoFactorLogin($loginResult, $remember_login); - $providers = $this->twoFactorManager->getProviderSet($loginResult)->get3rdPartyProviders(); + $providers = $this->twoFactorManager->getProviderSet($loginResult)->getPrimaryProviders(); if (count($providers) === 1) { // Single provider, hence we can redirect to that provider's challenge page directly /* @var $provider IProvider */ diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderSet.php b/lib/private/Authentication/TwoFactorAuth/ProviderSet.php index 63012d9ab55..91a00a0bf8e 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderSet.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderSet.php @@ -70,7 +70,7 @@ class ProviderSet { /** * @return IProvider[] */ - public function get3rdPartyProviders(): array { + public function getPrimaryProviders(): array { return array_filter($this->providers, function(IProvider $provider) { return !($provider instanceof BackupCodesProvider); }); diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php index 3587204aba9..f294e40111d 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php @@ -64,7 +64,7 @@ class ProviderSetTest extends TestCase { $set = new ProviderSet([$p2, $p1], false); - $this->assertEquals($expected, $set->get3rdPartyProviders()); + $this->assertEquals($expected, $set->getPrimaryProviders()); } public function testGetProvider() { -- 2.39.5