D3Public/webauthn
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

replace redirect call to fnc call return parameter

Browse Source
This commit is contained in:
Daniel Seifert 2022-11-04 08:38:08 +01:00
parent 8aff5c8008
commit 51e97bae62
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Application/Controller/Admin/d3webauthnadminlogin.php
View File

@ -125,10 +125,9 @@ class d3webauthnadminlogin extends AdminController
Registry::getLogger()->error($e->getDetailedErrorMessage(), ['UserId' => $userId]); Registry::getLogger()->error($e->getDetailedErrorMessage(), ['UserId' => $userId]);
Registry::getLogger()->debug($e->getTraceAsString()); Registry::getLogger()->debug($e->getTraceAsString());
$user->logout(); $user->logout();
$this->getUtils()->redirect('index.php?cl=login');
} }
return null; return 'login';
} }
/** /**

3
src/Application/Controller/d3webauthnlogin.php
View File

@ -85,6 +85,7 @@ class d3webauthnlogin extends FrontendController
$webauthn = oxNew(Webauthn::class); $webauthn = oxNew(Webauthn::class);
$publicKeyCredentialRequestOptions = $webauthn->getRequestOptions($userId); $publicKeyCredentialRequestOptions = $webauthn->getRequestOptions($userId);
$this->addTplParam('webauthn_publickey_login', $publicKeyCredentialRequestOptions); $this->addTplParam('webauthn_publickey_login', $publicKeyCredentialRequestOptions);
$this->addTplParam('isAdmin', isAdmin());
} catch (WebauthnException $e) { } catch (WebauthnException $e) {
Registry::getSession()->setVariable(WebauthnConf::GLOBAL_SWITCH, true); Registry::getSession()->setVariable(WebauthnConf::GLOBAL_SWITCH, true);
Registry::getLogger()->error($e->getDetailedErrorMessage(), ['UserId' => $userId]); Registry::getLogger()->error($e->getDetailedErrorMessage(), ['UserId' => $userId]);
@ -92,8 +93,6 @@ class d3webauthnlogin extends FrontendController
Registry::getUtilsView()->addErrorToDisplay($e); Registry::getUtilsView()->addErrorToDisplay($e);
$this->getUtils()->redirect('index.php?cl=start'); $this->getUtils()->redirect('index.php?cl=start');
} }
$this->addTplParam('isAdmin', isAdmin());
} }
/** /**