WIP fixing stan

Author: chav170

composer.json

@@ -36,12 +36,14 @@
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.5",
+        "google/recaptcha": "@stable",
         "league/flysystem-vfs": "^1.0",
         "laminas/laminas-diactoros": "^3.0",
         "phpunit/phpunit": "^10.0",
         "phpstan/phpstan": "^1.8",
         "robthree/twofactorauth": "^1.6",
-        "vlucas/phpdotenv": "^3.3"
+        "vlucas/phpdotenv": "^3.3",
+        "web-auth/webauthn-lib": "^5.0"
     },
     "autoload": {
         "psr-4": {

phpstan-baseline.neon

@@ -17,11 +17,6 @@ parameters:
 			count: 1
 			path: src\Service\Action\Auth\ResetPasswordAction.php
 
-		-
-			message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:validationPasswordConfirm\\(\\)\\.$#"
-			count: 1
-			path: src\Service\Action\Auth\ResetPasswordAction.php
-
 		-
 			message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:changePassword\\(\\)\\.$#"
 			count: 1
@@ -46,5 +41,3 @@ parameters:
 			message: "#^Call to an undefined method Cake\\\\ORM\\\\Table\\:\\:resetToken\\(\\)\\.$#"
 			count: 1
 			path: src\Service\Action\Auth\ValidateAccountRequestAction.php
-
-

src/Model/Entity/AuthStore.php

@@ -24,7 +24,7 @@ class AuthStore extends Entity
      *
      * @var array<string, bool>
      */
-    protected $_accessible = [
+    protected array $_accessible = [
         'id' => true,
         'store' => true,
         'created' => true,

src/Rbac/Rules/TwoFactorPassedScope.php

@@ -22,13 +22,13 @@
  */
 class TwoFactorPassedScope extends AbstractRule
 {
-    protected $_defaultConfig = [
+    protected array $_defaultConfig = [
     ];
 
     /**
      * @inheritDoc
      */
-    public function allowed($user, $role, ServerRequestInterface $request)
+    public function allowed(array|\ArrayAccess $user, string $role, ServerRequestInterface $request): bool
     {
         $authentication = $request->getAttribute('authentication');
         if ($authentication === null) {

src/Rbac/Rules/TwoFactorScope.php

@@ -22,13 +22,13 @@
  */
 class TwoFactorScope extends AbstractRule
 {
-    protected $_defaultConfig = [
+    protected array $_defaultConfig = [
     ];
 
     /**
      * @inheritDoc
      */
-    public function allowed($user, $role, ServerRequestInterface $request)
+    public function allowed(array|\ArrayAccess $user, string $role, ServerRequestInterface $request): bool
     {
         $authentication = $request->getAttribute('authentication');
         if ($authentication === null) {

src/Service/Action/Auth/OtpVerifyCheckAction.php

@@ -48,7 +48,7 @@ public function execute()
         unset($user['secret']);
 
         if (!$user['secret_verified']) {
-            $this->getUsersTable()->query()->update()
+            $this->getUsersTable()->updateQuery()
                 ->set(['secret_verified' => true])
                 ->where(['id' => $user['id']])
                 ->execute();

src/Service/Action/Auth/OtpVerifyGetAction.php

@@ -67,8 +67,8 @@ protected function onVerifyGetSecret($user)
 
         $secret = $this->createSecret();
         try {
-            $query = $this->getUsersTable()->query();
-            $query->update()
+            $query = $this->getUsersTable()->updateQuery();
+            $query
                 ->set(['secret' => $secret])
                 ->where(['id' => $user['id']]);
             $query->execute();

src/Service/Action/Auth/ResetPasswordAction.php

@@ -118,6 +118,7 @@ public function execute()
      */
     protected function _changePassword($userId)
     {
+        /** @var \CakeDC\Users\Model\Entity\User $user */
         $user = $this->getUsersTable()->newEntity([], ['validate' => false]);
         $user->id = $userId;
         try {

src/Service/Action/Auth/Webauthn2faAuthAction.php

@@ -13,6 +13,7 @@
 
 namespace CakeDC\Api\Service\Action\Auth;
 
+use Cake\Log\Log;
 use CakeDC\Api\Service\Action\Action;
 use CakeDC\Api\Webauthn\AuthenticateAdapter;
 use CakeDC\Users\Controller\Traits\CustomUsersTableTrait;
@@ -31,6 +32,7 @@ class Webauthn2faAuthAction extends Action
      * Execute action.
      *
      * @return mixed
+     * @throws \Throwable
      */
     public function execute()
     {

src/Service/Action/Auth/Webauthn2faRegisterAction.php

@@ -13,6 +13,7 @@
 
 namespace CakeDC\Api\Service\Action\Auth;
 
+use Cake\Http\Exception\BadRequestException;
 use CakeDC\Api\Service\Action\Action;
 use CakeDC\Api\Webauthn\RegisterAdapter;
 use CakeDC\Users\Controller\Traits\CustomUsersTableTrait;