Merge pull request #7903 from nextcloud/13-7891

[stable13] Fix systemtags/list to be compliant

1 files changed, 17 insertions, 1 deletions

diff --git a/apps/systemtags/list.php b/apps/systemtags/list.php
index 67fdeca93e9..f8cdf715f17 100644
--- a/apps/systemtags/list.php
+++ b/apps/systemtags/list.php
@@ -19,8 +19,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
+// WARNING: this should be moved to proper AppFramework handling
 // Check if we are a user
-OCP\User::checkLoggedIn();
+if (!\OC::$server->getUserSession()->isLoggedIn()) {
+	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+			'core.login.showLoginForm',
+			[
+				'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
+			]
+		)
+	);
+	exit();
+}
+// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
+if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
+	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+	exit();
+}
 
 $tmpl = new OCP\Template('systemtags', 'list', '');
 $tmpl->printPage();