From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 5 Nov 2020 10:03:31 +0000 (+0100)
Subject: Implement getStatusText() for the `backup` multifactor method
X-Git-Tag: 5.4.0_Alpha_1~555^2~53^2~26
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=276df3933394c3afd49fa6b640de4a954d6060d1;p=GitHub%2FWoltLab%2FWCF.git

Implement getStatusText() for the `backup` multifactor method
---

diff --git a/com.woltlab.wcf/templates/accountSecurity.tpl b/com.woltlab.wcf/templates/accountSecurity.tpl
index 9684b731ae..68eee0901e 100644
--- a/com.woltlab.wcf/templates/accountSecurity.tpl
+++ b/com.woltlab.wcf/templates/accountSecurity.tpl
@@ -24,7 +24,9 @@
 							{/if}
 						</h3>
 						
-						{$method->getProcessor()->getStatusText($__wcf->user)}
+						{if $enabledMultifactorMethods[$method->objectTypeID]|isset}
+							{$method->getProcessor()->getStatusText($enabledMultifactorMethods[$method->objectTypeID])}
+						{/if}
 					</div>
 					
 					<div class="accountSecurityButtons">
diff --git a/wcfsetup/install/files/lib/system/user/multifactor/BackupMultifactorMethod.class.php b/wcfsetup/install/files/lib/system/user/multifactor/BackupMultifactorMethod.class.php
index ac3fd59627..a783a9b9b1 100644
--- a/wcfsetup/install/files/lib/system/user/multifactor/BackupMultifactorMethod.class.php
+++ b/wcfsetup/install/files/lib/system/user/multifactor/BackupMultifactorMethod.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\user\multifactor;
-use wcf\data\user\User;
 use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\field\ButtonFormField;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
@@ -37,9 +36,16 @@ class BackupMultifactorMethod implements IMultifactorMethod {
 	/**
 	 * Returns the number of remaining codes.
 	 */
-	public function getStatusText(User $user): string {
-		// TODO: Return a proper text.
-		return random_int(10000, 99999)." codes remaining";
+	public function getStatusText(int $setupId): string {
+		$sql = "SELECT	COUNT(*)
+			FROM	wcf".WCF_N."_user_multifactor_backup
+			WHERE	setupID = ?
+				AND useTime IS NULL";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		$statement->execute([$setupId]);
+		
+		// TODO: Language item
+		return $statement->fetchSingleColumn()." codes remaining";
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php b/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php
index 22abe11556..b68bebb573 100644
--- a/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php
+++ b/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\user\multifactor;
-use wcf\data\user\User;
 use wcf\system\form\builder\IFormDocument;
 
 /**
@@ -14,11 +13,11 @@ use wcf\system\form\builder\IFormDocument;
  */
 interface IMultifactorMethod {
 	/**
-	 * Returns a human readable status text regarding the set-up status for the given user.
+	 * Returns a human readable status text regarding the set-up status for the given setup.
 	 * 
 	 * An example text could be: "5 backup codes remaining".
 	 */
-	public function getStatusText(User $user): string;
+	public function getStatusText(int $setupId): string;
 	
 	/**
 	 * Populates the form to set-up and manage this method.
diff --git a/wcfsetup/install/files/lib/system/user/multifactor/TotpMultifactorMethod.class.php b/wcfsetup/install/files/lib/system/user/multifactor/TotpMultifactorMethod.class.php
index 7cdafd9886..0d5f5bb3f8 100644
--- a/wcfsetup/install/files/lib/system/user/multifactor/TotpMultifactorMethod.class.php
+++ b/wcfsetup/install/files/lib/system/user/multifactor/TotpMultifactorMethod.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\user\multifactor;
-use wcf\data\user\User;
 use wcf\system\exception\NotImplementedException;
 use wcf\system\form\builder\IFormDocument;
 
@@ -17,7 +16,7 @@ class TotpMultifactorMethod implements IMultifactorMethod {
 	/**
 	 * Returns the number of devices the user set up.
 	 */
-	public function getStatusText(User $user): string {
+	public function getStatusText(int $setupId): string {
 		// TODO: Return a proper text.
 		return random_int(10000, 99999)." devices configured";
 	}