changes

liquiddesign · Nov 25, 2022 · 8de820f · 8de820f
1 parent 68dce80
commit 8de820f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Admin/AdministratorPresenter.php b/src/Admin/AdministratorPresenter.php
@@ -125,7 +125,7 @@ public function createComponentNewForm(): Form
 			unset($values['account']);
 
 			$administrator = $this->getParameter('administrator');
-			$doNotRedirect = !$administrator->google2faSecret && $values['google2faSecret'];
+			$doNotRedirect = (!$administrator || !$administrator->google2faSecret) && $values['google2faSecret'];
 
 			$values['google2faSecret'] = $values['google2faSecret'] && $this->google2FA->isEnabled() ? $this->google2FA->generateSecretKey() : null;
 

diff --git a/src/Bridges/AdminDI.php b/src/Bridges/AdminDI.php
@@ -39,10 +39,10 @@ public function getConfigSchema(): Schema
 			'prettyPages' => Expect::bool(false),
 			'serviceMode' => Expect::bool(false),
 			'adminGrid' => Expect::array([]),
-			'google2FA' => Expect::arrayOf(Expect::structure([
+			'google2FA' => Expect::structure([
 				'enabled' => Expect::bool(false),
 				'company' => Expect::string(['Admin']),
-			])),
+			]),
 		]);
 	}