Fix default redirect on successful WebAuthn login

Signed-off-by: Richard Steinmetz <[email protected]>

core/Controller/WebAuthnController.php

@@ -7,6 +7,7 @@
  *
  * @author Christoph Wurst <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
+ * @author Richard Steinmetz <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,6 +30,7 @@
 use OC\Authentication\Login\LoginData;
 use OC\Authentication\Login\WebAuthnChain;
 use OC\Authentication\WebAuthn\Manager;
+use OC\URLGenerator;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
@@ -46,14 +48,16 @@ class WebAuthnController extends Controller {
 	private ISession $session;
 	private LoggerInterface $logger;
 	private WebAuthnChain $webAuthnChain;
+	private UrlGenerator $urlGenerator;
 
-	public function __construct($appName, IRequest $request, Manager $webAuthnManger, ISession $session, LoggerInterface $logger, WebAuthnChain $webAuthnChain) {
+	public function __construct($appName, IRequest $request, Manager $webAuthnManger, ISession $session, LoggerInterface $logger, WebAuthnChain $webAuthnChain, URLGenerator $urlGenerator) {
 		parent::__construct($appName, $request);
 
 		$this->webAuthnManger = $webAuthnManger;
 		$this->session = $session;
 		$this->logger = $logger;
 		$this->webAuthnChain = $webAuthnChain;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -106,6 +110,8 @@ public function finishAuthentication(string $data): JSONResponse {
 		);
 		$this->webAuthnChain->process($loginData);
 
-		return new JSONResponse([]);
+		return new JSONResponse([
+			'defaultRedirectUrl' => $this->urlGenerator->linkToDefaultPageUrl(),
+		]);
 	}
 }

core/src/components/login/PasswordLessLoginForm.vue

@@ -200,12 +200,13 @@ export default {
 		completeAuthentication(challenge) {
 			console.debug('TIME TO COMPLETE')
 
-			const location = this.redirectUrl
+			const redirectUrl = this.redirectUrl
 
 			return finishAuthentication(JSON.stringify(challenge))
-				.then(data => {
+				.then(({ defaultRedirectUrl }) => {
 					console.debug('Logged in redirecting')
-					window.location.href = location
+					// Redirect url might be false so || should be used instead of ??.
+					window.location.href = redirectUrl || defaultRedirectUrl
 				})
 				.catch(error => {
 					console.debug('GOT AN ERROR WHILE SUBMITTING CHALLENGE!')