Provide initial state

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 12 insertions, 13 deletions

diff --git a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
index 807371907db..8910665f321 100644
--- a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
+++ b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
@@ -29,6 +29,7 @@ use OCA\TwoFactorBackupCodes\Settings\Personal;
 use OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings;
+use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IUser;
 use OCP\Template;
@@ -46,6 +47,8 @@ class BackupCodesProvider implements IProvider, IProvidesPersonalSettings {
 
 	/** @var AppManager */
 	private $appManager;
+	/** @var IInitialStateService */
+	private $initialStateService;
 
 	/**
 	 * @param string $appName
@@ -53,11 +56,16 @@ class BackupCodesProvider implements IProvider, IProvidesPersonalSettings {
 	 * @param IL10N $l10n
 	 * @param AppManager $appManager
 	 */
-	public function __construct(string $appName, BackupCodeStorage $storage, IL10N $l10n, AppManager $appManager) {
+	public function __construct(string $appName,
+								BackupCodeStorage $storage,
+								IL10N $l10n,
+								AppManager $appManager,
+								IInitialStateService $initialStateService) {
 		$this->appName = $appName;
 		$this->l10n = $l10n;
 		$this->storage = $storage;
 		$this->appManager = $appManager;
+		$this->initialStateService = $initialStateService;
 	}
 
 	/**
@@ -149,7 +157,8 @@ class BackupCodesProvider implements IProvider, IProvidesPersonalSettings {
 	 */
 	public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
 		$state = $this->storage->getBackupCodesState($user);
-		return new Personal(base64_encode(json_encode($state)));
+		$this->initialStateService->provideInitialState($this->appName, $state);
+		return new Personal();
 	}
 
 }
diff --git a/apps/twofactor_backupcodes/lib/Settings/Personal.php b/apps/twofactor_backupcodes/lib/Settings/Personal.php
index 426336e1a56..1b342c19c48 100644
--- a/apps/twofactor_backupcodes/lib/Settings/Personal.php
+++ b/apps/twofactor_backupcodes/lib/Settings/Personal.php
@@ -28,18 +28,8 @@ use OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings;
 use OCP\Template;
 
 class Personal implements IPersonalProviderSettings {
-
-	/** @var string */
-	private $state;
-
-	public function __construct(string $state) {
-		$this->state = $state;
-	}
-
 	public function getBody(): Template {
-		$template = new Template('twofactor_backupcodes', 'personal');
-		$template->assign('state', $this->state);
-		return $template;
+		return new Template('twofactor_backupcodes', 'personal');
 	}
 
 }