From 8de820f8b281ce3c20d0b716692a4aa439abe4f8 Mon Sep 17 00:00:00 2001 From: Oldrich Date: Fri, 25 Nov 2022 10:41:20 +0100 Subject: [PATCH] changes --- src/Admin/AdministratorPresenter.php | 2 +- src/Bridges/AdminDI.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Admin/AdministratorPresenter.php b/src/Admin/AdministratorPresenter.php index 37e7b4c..fc30f90 100644 --- 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 index a93546e..c90d778 100644 --- 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']), - ])), + ]), ]); }