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

move webauthn check to deeper implemented login method

This commit is contained in:
Daniel Seifert 2022-11-08 22:47:11 +01:00
parent 64f974d486
commit 2bf7399aa4
Signed by: DanielS
GPG Key ID: 6A513E13AEE66170
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Modules/Application/Component/d3_webauthn_UserComponent.php
View File

@ -33,13 +33,13 @@ use Psr\Container\NotFoundExceptionInterface;
class d3_webauthn_UserComponent extends d3_webauthn_UserComponent_parent class d3_webauthn_UserComponent extends d3_webauthn_UserComponent_parent
{ {
/** /**
* @return string|void * @return string
* @throws ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws Exception * @throws Exception
* @throws NotFoundExceptionInterface * @throws NotFoundExceptionInterface
* @throws DoctrineDriverException * @throws DoctrineDriverException
*/ */
public function login_noredirect() public function login()
{ {
$lgn_user = Registry::getRequest()->getRequestParameter('lgn_usr'); $lgn_user = Registry::getRequest()->getRequestParameter('lgn_usr');
$password = Registry::getRequest()->getRequestParameter('lgn_pwd'); $password = Registry::getRequest()->getRequestParameter('lgn_pwd');
@ -70,11 +70,12 @@ class d3_webauthn_UserComponent extends d3_webauthn_UserComponent_parent
$this->getParent()->getViewConfig()->getNavFormParams() $this->getParent()->getViewConfig()->getNavFormParams()
); );
return "d3webauthnlogin"; $sUrl = $this->getConfig()->getShopHomeUrl() . 'cl=d3webauthnlogin';
Registry::getUtils()->redirect($sUrl, true, 302);
} }
} }
parent::login_noredirect(); return parent::login();
} }
/** /**
@ -102,7 +103,7 @@ class d3_webauthn_UserComponent extends d3_webauthn_UserComponent_parent
* @param User $user * @param User $user
* @param $sWebauthn * @param $sWebauthn
*/ */
public function d3WebauthnRelogin(User $user, $sWebauthn): void protected function d3WebauthnRelogin(User $user, $sWebauthn): void
{ {
$setSessionCookie = Registry::getRequest()->getRequestParameter('lgn_cook'); $setSessionCookie = Registry::getRequest()->getRequestParameter('lgn_cook');
$this->d3GetSession()->setVariable(WebauthnConf::WEBAUTHN_SESSION_AUTH, $sWebauthn); $this->d3GetSession()->setVariable(WebauthnConf::WEBAUTHN_SESSION_AUTH, $sWebauthn);

13
src/tests/integration/passwordFrontendAuthTest.php
View File

@ -86,11 +86,10 @@ class passwordFrontendAuthTest extends integrationTestCase
$controller->init(); $controller->init();
/** @var d3_webauthn_UserComponent $component */ /** @var d3_webauthn_UserComponent $component */
$component = $controller->getComponent('oxcmp_user'); $component = $controller->getComponent('oxcmp_user');
$component->login_noredirect();
$this->assertSame( $this->assertSame(
$expected, $expected,
$component->getLoginStatus() $component->login()
); );
$component->logout(); $component->logout();
@ -102,11 +101,11 @@ class passwordFrontendAuthTest extends integrationTestCase
public function loginDataProvider(): array public function loginDataProvider(): array
{ {
return [ return [
'not existing account' => ['unknown@user.localhost', '123456', USER_LOGIN_FAIL], 'not existing account' => ['unknown@user.localhost', '123456', 'user'],
'missing password' => ['noadmin@user.localhost', null, USER_LOGIN_FAIL], 'missing password' => ['noadmin@user.localhost', null, 'user'],
'inactive account' => ['inactive@user.localhost', '123456', USER_LOGIN_FAIL], 'inactive account' => ['inactive@user.localhost', '123456', 'user'],
'wrong shop account' => ['wrongshop@user.localhost', '123456', USER_LOGIN_FAIL], 'wrong shop account' => ['wrongshop@user.localhost', '123456', 'user'],
'account ok' => ['noadmin@user.localhost', '123456', USER_LOGIN_SUCCESS], 'account ok' => ['noadmin@user.localhost', '123456', 'payment'],
]; ];
} }
} }