#42647 fix(file settings): Unnecessary 2FA UI message (updated)

[jadjoud]

• Resolves: Unnecessary 2FA UI message in Files settings #42647

Summary

Added a conditional statement for the message rendering

@kesselb this is the fixed PR

TODO

• ...

Checklist

• Code is properly formatted
• Sign-off message is added to all commits
• Tests (unit, integration, api and/or acceptance) are included
• Screenshots before/after for front-end changes
• Documentation (manuals or wiki) has been updated or is not required
• Backports requested where applicable (ex: critical bugfixes)

[kesselb]

Thank you, always great to see new contributors 👍

Here is a brief explanation of how to set up a local dev environment https://github.com/nextcloud/server?tab=readme-ov-file#join-the-team-

A good start to wrap a v-if template block. To make that actually work, you also need to add the actual variable isTwoFactorEnabled to the data function also gather the information "is 2fa enabled for the given user" from the backend.

The patch below should provide the necessary data from the backend and use it in the vue component.

Index: apps/files/lib/Controller/ViewController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
--- a/apps/files/lib/Controller/ViewController.php	(revision 28ee87b4c4cb3f82af1fb2caaa0218b635750e90)
+++ b/apps/files/lib/Controller/ViewController.php	(date 1712064072302)
@@ -35,6 +35,7 @@
  */
 namespace OCA\Files\Controller;
 
+use OC\Authentication\TwoFactorAuth\Registry;
 use OCA\Files\Activity\Helper;
 use OCA\Files\AppInfo\Application;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
@@ -98,7 +99,8 @@
 		ITemplateManager $templateManager,
 		IManager $shareManager,
 		UserConfig $userConfig,
-		ViewConfig $viewConfig
+		ViewConfig $viewConfig,
+		private Registry $twoFactorRegistry,
 	) {
 		parent::__construct($appName, $request);
 		$this->urlGenerator = $urlGenerator;
@@ -203,7 +205,8 @@
 		\OCP\Util::addStyle('files', 'merged');
 		\OCP\Util::addScript('files', 'main');
 
-		$userId = $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
+		$userId = $user->getUID();
 
 		// Get all the user favorites to create a submenu
 		try {
@@ -270,6 +273,15 @@
 		$this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);
 		$this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
 
+		$isTwoFactorEnabled = false;
+		foreach ($this->twoFactorRegistry->getProviderStates($user) as $providerId => $providerState) {
+			if ($providerId !== 'backup_codes' && $providerState === true) {
+				$isTwoFactorEnabled = true;
+			}
+		}
+
+		$this->initialState->provideInitialState('isTwoFactorEnabled', $isTwoFactorEnabled);
+
 		$response = new TemplateResponse(
 			Application::APP_ID,
 			'index',
Index: apps/files/src/views/Settings.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/apps/files/src/views/Settings.vue b/apps/files/src/views/Settings.vue
--- a/apps/files/src/views/Settings.vue	(revision 28ee87b4c4cb3f82af1fb2caaa0218b635750e90)
+++ b/apps/files/src/views/Settings.vue	(date 1712064510627)
@@ -152,6 +152,7 @@
 			appPasswordUrl: generateUrl('/settings/user/security#generate-app-token-section'),
 			webdavUrlCopied: false,
 			enableGridView: (loadState('core', 'config', [])['enable_non-accessible_features'] ?? true),
+			isTwoFactorEnabled: (loadState('files', 'isTwoFactorEnabled', false))
 		}
 	},
 

[kesselb]

Removing myself as reviewer because I'm not familiar enough with 2fa and the files settings component.

[jadjoud]

@kesselb
Thank you so much for your help!

I will try to make the necessary changes ASAP

[pboguslawski]

When message is rendered only with 2FA enabled, should not contain If you have enabled 2FA any more probably.

Removing myself as reviewer because we're not using 2FA with nc so cannot test it.

[github-actions]

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!