Merge branch 'master' of github.com:humhub/humhub-modules-2fa

humhub · Feb 9, 2021 · 5cd08b6 · 5cd08b6
2 parents 7375d22 + e7fabfd
commit 5cd08b6
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 5 deletions.
diff --git a/tests/codeception/_pages/TwofaAuthPage.php b/tests/codeception/_pages/TwofaAuthPage.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace tests\codeception\_pages;
+
+use tests\codeception\_support\BasePage;
+
+/**
+ * Represents 2FA verifying code page
+ * @property \AcceptanceTester|\FunctionalTester $actor
+ */
+class TwofaAuthPage extends BasePage
+{
+
+    public $route = 'twofa/check';
+
+    /**
+     * @param string $code
+     */
+    public function verify($code)
+    {
+        if(method_exists($this->actor, 'waitForText')) {
+            $this->actor->waitForText('Two-factor authentication');
+        }
+        $this->actor->fillField('CheckCode[code]', $code);
+        $this->actor->click('#verify-button');
+    }
+
+}
diff --git a/tests/codeception/functional/TwofaCest.php b/tests/codeception/functional/TwofaCest.php
@@ -7,12 +7,25 @@
 
 namespace twofa\functional;
 
+use tests\codeception\_pages\LoginPage;
+use tests\codeception\_pages\TwofaAuthPage;
 use twofa\FunctionalTester;
 
 class TwofaCest
 {
 
-    public function testSendVerifyingCode(FunctionalTester $I)
+    public function testCheckWrongVerifyingCode(FunctionalTester $I)
     {
+        $I->wantTo('check wrong verifying code');
+        $loginPage = LoginPage::openBy($I);
+        $I->amGoingTo('try to login with admin credentials');
+        $loginPage->login('Admin', 'test');
+        $I->expectTo('See Two Factor Auth');
+        $I->see('Two-factor authentication');
+
+        $twofaAuthPage = TwofaAuthPage::openBy($I);
+        $twofaAuthPage->verify('test code');
+        $I->expectTo('see wrong verifying code');
+        $I->see('Verifying code is not valid!');
     }
 }
diff --git a/tests/codeception/unit/TwofaTest.php b/tests/codeception/unit/TwofaTest.php
@@ -36,9 +36,12 @@ public function testVerifyCode()
         $this->assertTrue(TwofaHelper::enableVerifying());
         $this->assertTrue(TwofaHelper::isVerifyingRequired());
         $this->assertFalse(TwofaHelper::isValidCode('test'));
+    }
 
-        //$this->becomeUser('User1');
-        //$this->assertFalse(TwofaHelper::isVerifyingRequired());
-        //$this->assertFalse(TwofaHelper::isValidCode('test'));
+    public function testDisableVerifying()
+    {
+        $this->becomeUser('Admin');
+        $this->assertTrue(TwofaHelper::disableVerifying());
+        $this->assertFalse(TwofaHelper::isVerifyingRequired());
     }
 }
diff --git a/views/check/index.php b/views/check/index.php
@@ -39,7 +39,7 @@
 
                 <br/>
 
-                <?= Html::submitButton(Yii::t('TwofaModule.base', 'Verify'), ['class' => 'btn btn-primary', 'data-ui-loader' => ""]); ?>
+                <?= Html::submitButton(Yii::t('TwofaModule.base', 'Verify'), ['id' => 'verify-button', 'class' => 'btn btn-primary', 'data-ui-loader' => ""]); ?>
 
                 <?php ActiveForm::end(); ?>
                 <?= Html::a(Yii::t('TwofaModule.base', 'Log out'), ['/user/auth/logout'], ['class' => 'pull-right', 'data-pjax' => false]) ?>