89 - Allow string url for verify action

Author: ajibarra

src/Authentication/TwoFactorProcessor/OneTimePasswordProcessor.php

@@ -92,9 +92,9 @@ public function proceed(ServerRequestInterface $request, ResultInterface $result
      * Generates 2fa url, if enable.
      *
      * @param string $type Processor type.
-     * @return array|null
+     * @return array|string|null
      */
-    public function getUrlByType(string $type): ?array
+    public function getUrlByType(string $type): array|string|null
     {
         if ($type == $this->getType()) {
             return Configure::read('OneTimePasswordAuthenticator.verifyAction');

src/Authentication/TwoFactorProcessor/Webauthn2faProcessor.php

@@ -92,9 +92,9 @@ public function proceed(ServerRequestInterface $request, ResultInterface $result
      * Generates 2fa url, if enable.
      *
      * @param string $type Processor type.
-     * @return array|null
+     * @return array|string|null
      */
-    public function getUrlByType(string $type): ?array
+    public function getUrlByType(string $type): array|string|null
     {
         if ($type == $this->getType()) {
             return Configure::read('Webauthn2fa.startAction');

src/Authentication/TwoFactorProcessorInterface.php

@@ -47,7 +47,7 @@ public function proceed(ServerRequestInterface $request, ResultInterface $result
      * Generates 2fa url, if enable.
      *
      * @param string $type Processor type.
-     * @return array|null
+     * @return array|string|null
      */
-    public function getUrlByType(string $type): ?array;
+    public function getUrlByType(string $type): array|string|null;
 }

src/Middleware/TwoFactorMiddleware.php

@@ -52,9 +52,15 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $session->write(CookieAuthenticator::SESSION_DATA_KEY, [
             'remember_me' => $data['remember_me'] ?? null,
         ]);
-        $url = array_merge($url, [
-            '?' => $request->getQueryParams(),
-        ]);
+        $params = $request->getQueryParams();
+        if (is_array($url)) {
+            $url = array_merge($url, [
+                '?' => $params,
+            ]);
+        } else {
+            $url .= '?' . implode('&', array_map(fn ($k, $v) => "$k=$v", array_keys($params), array_values($params)));
+        }
+
         $url = Router::url($url);
 
         return (new Response())