D3Public
/
webauthn
8
0
Vork 0
Code Pull-aanvragen Packages Projecten Publicaties Activiteit

rename module methods in extended OXID classes to prevent conflicts with other modules

This commit is contained in:
Daniel Seifert 2022-11-09 12:04:35 +01:00
bovenliggende 4c29245ddb
commit deb598bbe5
Getekend door: DanielS
GPG sleutel-ID: 8A7C4C6ED1915C6F
2 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

4
src/Application/Controller/Traits/checkoutGetUserTrait.php
Bestand weergeven

@ -42,7 +42,7 @@ trait checkoutGetUserTrait
$webauthn = $this->d3GetWebauthnObject();
if ($webauthn->isActive($user->getId())
&& !$this->d3GetSessionObject()->getVariable(WebauthnConf::WEBAUTHN_SESSION_AUTH)
&& !$this->d3WebauthnGetSessionObject()->getVariable(WebauthnConf::WEBAUTHN_SESSION_AUTH)
) {
return false;
}
@ -62,7 +62,7 @@ trait checkoutGetUserTrait
/**
* @return Session
*/
public function d3GetSessionObject(): Session
public function d3WebauthnGetSessionObject(): Session
{
return Registry::getSession();
}

6
src/Modules/Application/Controller/Admin/d3_LoginController_Webauthn.php
Bestand weergeven

@ -49,7 +49,7 @@ class d3_LoginController_Webauthn extends d3_LoginController_Webauthn_parent
$password = Registry::getRequest()->getRequestParameter('pwd');
/** @var d3_User_Webauthn $user */
$user = $this->d3GetUserObject();
$user = $this->d3WebauthnGetUserObject();
$userId = $user->d3GetLoginUserId($lgn_user, 'malladmin');
if ($lgn_user && $userId &&
@ -86,14 +86,14 @@ class d3_LoginController_Webauthn extends d3_LoginController_Webauthn_parent
*/
public function d3WebauthnCancelLogin(): void
{
$oUser = $this->d3GetUserObject();
$oUser = $this->d3WebauthnGetUserObject();
$oUser->logout();
}
/**
* @return User
*/
public function d3GetUserObject(): User
public function d3WebauthnGetUserObject(): User
{
return oxNew(User::class);
}