Add controllers & tests

Author: tvdijen

lib/Controller/AuthProcess.php

@@ -183,7 +183,7 @@ public function main(Request $request): Response
             });
         } else {
             if ($state['FIDO2WantsRegister']) {
-                $response = new RedirectResponse(Module::getModuleURL('webauthn.php/webauthn?StateId=' . urlencode($stateId)));
+                $response = new RedirectResponse(Module::getModuleURL('webauthn/webauthn.php?StateId=' . urlencode($stateId)));
             } else {
                 $response = new RunnableResponse([Auth\ProcessingChain::class, 'resumeProcessing'], [$state]);
             }

lib/Controller/WebAuthn.php

@@ -97,8 +97,10 @@ public function main(Request $request): Template
         /** @var array $state */
         $state = $this->authState::loadState($stateId, 'webauthn:request');
 
+        $templateFile = $state['UseInflowRegistration'] ? 'webauthn:webauthn.tpl.php' : 'webauthn:authentication.tpl.php';
+
         // Make, populate and layout consent form
-        $t = new Template($this->config, 'webauthn:authentication.tpl.php');
+        $t = new Template($this->config, $templateFile);
         $t->data['UserID'] = $state['FIDO2Username'];
         $t->data['FIDO2Tokens'] = $state['FIDO2Tokens'];
 
@@ -143,11 +145,11 @@ public function main(Request $request): Template
 
         $t->data['FIDO2AuthSuccessful'] = $state['FIDO2AuthSuccessful'];
         if (
-            count($state['FIDO2Tokens']) == 0 ||
+            count($state['FIDO2Tokens']) === 0 ||
             ($state['FIDO2WantsRegister'] === true && $state['FIDO2AuthSuccessful'] !== false)
         ) {
-            $t->data['regURL'] = Module::getModuleURL('webauthn.php/regprocess?StateId=' . urlencode($stateId));
-            $t->data['delURL'] = Module::getModuleURL('webauthn.php/managetoken?StateId=' . urlencode($stateId));
+            $t->data['regURL'] = Module::getModuleURL('webauthn/regprocess.php?StateId=' . urlencode($stateId));
+            $t->data['delURL'] = Module::getModuleURL('webauthn/managetoken.php?StateId=' . urlencode($stateId));
         }
 
         $t->data['authForm'] = "";

tests/lib/Controller/WebAuthnTest.php

@@ -79,6 +79,7 @@ public function testWebAuthn(): void
             public static function loadState($id, $stage, $allowMissing = false)
             {
                 return [
+                    'UseInflowRegistration' => true,
                     'FIDO2Displayname' => 'Donald Duck',
                     'FIDO2Username' => 'dduck',
                     'FIDO2Scope' => 'Ducktown',