Adapt to new login design; fixes https://github.com/owncloud/core/iss…

…ues/39053

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+- Adapt to new login design - [#39053](https://github.com/owncloud/twofactor_totp/issues/237)
 
 ## [0.7.2] - 2021-05-26
 

README.md

@@ -11,7 +11,7 @@ Tested with the following apps:
 
 ## Enabling TOTP 2FA for your account
 ![](https://raw.githubusercontent.com/owncloud/twofactor_totp/stable9.1/screenshots/settings.png)
-![](https://raw.githubusercontent.com/owncloud/twofactor_totp/stable9.1/screenshots/verify.png)
+![](https://raw.githubusercontent.com/owncloud/twofactor_totp/stable9.2/screenshots/verify.jpg)
 
 ## Running tests
 You can use the provided Makefile to run all tests by using:

templates/challenge.php

@@ -1,4 +1,13 @@
-<form method="POST">
+<?php
+script('core', 'login');
+?>
+
+<form method="POST" name="login">
     <input type="text" name="challenge" required="required" autofocus autocomplete="off" autocapitalize="off">
-    <input type="submit" class="button" value="<?php p($l->t('Verify')); ?>">
+    <div class="submit-wrap">
+        <button type="submit" id="submit" class="login-button">
+            <span><?php p($l->t('Verify')); ?></span>
+			<div class="loading-spinner"><div></div><div></div><div></div><div></div></div>
+        </button>
+    </div>
 </form>

tests/acceptance/features/lib/VerificationPage.php

@@ -32,7 +32,7 @@
  */
 class VerificationPage extends OwncloudPage {
 	private $verificationFieldXpath = '//form/input[@name="challenge"]';
-	private $verifySubmissionBtnXpath = '//form/input[@type="submit"]';
+	private $verifySubmissionBtnXpath = '//form//button[@type="submit"]';
 	private $errorTokenMessageXpath = '//div/span[contains(text(),"verifying the token")]';
 	private $cancelOrLoginButtonXpath = '//a[@class="two-factor-cancel"]';