From 481a260680260653663eb572bc04e9bc7c98224c Mon Sep 17 00:00:00 2001 From: Max Larkin Date: Wed, 19 Jul 2023 13:36:37 +0100 Subject: [PATCH] MDL-78337 tool_brickfield: Attempt immediate validation --- admin/tool/brickfield/classes/registration.php | 7 +++++++ admin/tool/brickfield/tests/registration_test.php | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/admin/tool/brickfield/classes/registration.php b/admin/tool/brickfield/classes/registration.php index 4b4ee63c1adfe..553e67c42ef0f 100644 --- a/admin/tool/brickfield/classes/registration.php +++ b/admin/tool/brickfield/classes/registration.php @@ -140,6 +140,13 @@ public function set_keys_for_registration(string $apikey, string $secretkey): bo $this->set_api_key($apikey); $this->set_secret_key($secretkey); $this->set_not_validated(); + // Attempt to validate the registration. + $this->validate(); + if (!$this->status_is_validated()) { + // If the validation failed here, start the grace period. + $this->set_not_validated(); + $this->set_summary_time(); + } if ($this->summarytime <= 0) { $this->set_summary_time(); } diff --git a/admin/tool/brickfield/tests/registration_test.php b/admin/tool/brickfield/tests/registration_test.php index 6015eba03bf72..1c99a647ac7e9 100644 --- a/admin/tool/brickfield/tests/registration_test.php +++ b/admin/tool/brickfield/tests/registration_test.php @@ -70,7 +70,8 @@ public function test_set_keys_for_registration() { // State when valid format keys are sent. $this->assertTrue($regobj->set_keys_for_registration(mock_brickfieldconnect::VALIDAPIKEY, mock_brickfieldconnect::VALIDSECRETKEY)); - $this->assertTrue($regobj->validation_pending()); + $this->assertTrue($regobj->toolkit_is_active()); + $this->assertFalse($regobj->validation_pending()); $this->assertEquals($regobj->get_api_key(), mock_brickfieldconnect::VALIDAPIKEY); $this->assertEquals($regobj->get_secret_key(), mock_brickfieldconnect::VALIDSECRETKEY); }