nextcloud / server

apps/contactsinteraction/lib/Migration/Version010000Date20200304152605.php

Indentation +54 added lines, -54 removed lines

@@ -33,61 +33,61 @@
 
 class Version010000Date20200304152605 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     *
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable(RecentContactMapper::TABLE_NAME);
-		$table->addColumn('id', 'integer', [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->addColumn('actor_uid', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('uid', 'string', [
-			'notnull' => false,
-			'length' => 64,
-		]);
-		$table->addColumn('email', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('federated_cloud_id', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('card', 'blob', [
-			'notnull' => true,
-		]);
-		$table->addColumn('last_contact', 'integer', [
-			'notnull' => true,
-			'length' => 4,
-		]);
-		$table->setPrimaryKey(['id']);
-		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
-		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
-		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
-		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
-		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
-		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+        $table = $schema->createTable(RecentContactMapper::TABLE_NAME);
+        $table->addColumn('id', 'integer', [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->addColumn('actor_uid', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('uid', 'string', [
+            'notnull' => false,
+            'length' => 64,
+        ]);
+        $table->addColumn('email', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('federated_cloud_id', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('card', 'blob', [
+            'notnull' => true,
+        ]);
+        $table->addColumn('last_contact', 'integer', [
+            'notnull' => true,
+            'length' => 4,
+        ]);
+        $table->setPrimaryKey(['id']);
+        // To find all recent entries
+        $table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+        // To find a specific entry
+        $table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+        // To find all recent entries with a given UID
+        $table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+        // To find all recent entries with a given email address
+        $table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+        // To find all recent entries with a give federated cloud id
+        $table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+        // For the cleanup
+        $table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
 
-		return $schema;
-	}
+        return $schema;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -75,17 +75,17 @@
 		]);
 		$table->setPrimaryKey(['id']);
 		// To find all recent entries
-		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME . '_actor_uid');
+		$table->addIndex(['actor_uid'], RecentContactMapper::TABLE_NAME.'_actor_uid');
 		// To find a specific entry
-		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME . '_id_uid');
+		$table->addIndex(['id', 'actor_uid'], RecentContactMapper::TABLE_NAME.'_id_uid');
 		// To find all recent entries with a given UID
-		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME . '_uid');
+		$table->addIndex(['uid'], RecentContactMapper::TABLE_NAME.'_uid');
 		// To find all recent entries with a given email address
-		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME . '_email');
+		$table->addIndex(['email'], RecentContactMapper::TABLE_NAME.'_email');
 		// To find all recent entries with a give federated cloud id
-		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME . '_fed_id');
+		$table->addIndex(['federated_cloud_id'], RecentContactMapper::TABLE_NAME.'_fed_id');
 		// For the cleanup
-		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME . '_last_contact');
+		$table->addIndex(['last_contact'], RecentContactMapper::TABLE_NAME.'_last_contact');
 
 		return $schema;
 	}

apps/contactsinteraction/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\ContactsInteraction\\' => array($baseDir . '/../lib'),
+    'OCA\\ContactsInteraction\\' => array($baseDir.'/../lib'),
 );

apps/contactsinteraction/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/user_ldap/ajax/getConfiguration.php

Indentation +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
 $configuration = $connection->getConfiguration();
 if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
-	// hide password
-	$configuration['ldap_agent_password'] = '**PASSWORD SET**';
+    // hide password
+    $configuration['ldap_agent_password'] = '**PASSWORD SET**';
 }
 \OC_JSON::success(['configuration' => $configuration]);

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 \OC_JSON::checkAppEnabled('user_ldap');
 \OC_JSON::callCheck();
 
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
 $ldapWrapper = new LDAP();
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
 $configuration = $connection->getConfiguration();

lib/private/Files/Type/TemplateManager.php

Indentation +33 added lines, -33 removed lines

@@ -29,40 +29,40 @@
  * @deprecated 18.0.0
  */
 class TemplateManager {
-	protected $templates = [];
+    protected $templates = [];
 
-	public function registerTemplate($mimetype, $path) {
-		$this->templates[$mimetype] = $path;
-	}
+    public function registerTemplate($mimetype, $path) {
+        $this->templates[$mimetype] = $path;
+    }
 
-	/**
-	 * get the path of the template for a mimetype
-	 *
-	 * @deprecated 18.0.0
-	 * @param string $mimetype
-	 * @return string|null
-	 */
-	public function getTemplatePath($mimetype) {
-		if (isset($this->templates[$mimetype])) {
-			return $this->templates[$mimetype];
-		} else {
-			return null;
-		}
-	}
+    /**
+     * get the path of the template for a mimetype
+     *
+     * @deprecated 18.0.0
+     * @param string $mimetype
+     * @return string|null
+     */
+    public function getTemplatePath($mimetype) {
+        if (isset($this->templates[$mimetype])) {
+            return $this->templates[$mimetype];
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * get the template content for a mimetype
-	 *
-	 * @deprecated 18.0.0
-	 * @param string $mimetype
-	 * @return string
-	 */
-	public function getTemplate($mimetype) {
-		$path = $this->getTemplatePath($mimetype);
-		if ($path) {
-			return file_get_contents($path);
-		} else {
-			return '';
-		}
-	}
+    /**
+     * get the template content for a mimetype
+     *
+     * @deprecated 18.0.0
+     * @param string $mimetype
+     * @return string
+     */
+    public function getTemplate($mimetype) {
+        $path = $this->getTemplatePath($mimetype);
+        if ($path) {
+            return file_get_contents($path);
+        } else {
+            return '';
+        }
+    }
 }

lib/private/Authentication/WebAuthn/CredentialRepository.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 		$uid = $publicKeyCredentialUserEntity->getId();
 		$entities = $this->credentialMapper->findAllForUid($uid);
 
-		return array_map(function (PublicKeyCredentialEntity $entity) {
+		return array_map(function(PublicKeyCredentialEntity $entity) {
 			return $entity->toPublicKeyCredentialSource();
 		}, $entities);
 	}

Indentation +62 added lines, -62 removed lines

@@ -16,66 +16,66 @@
 use Webauthn\PublicKeyCredentialUserEntity;
 
 class CredentialRepository implements PublicKeyCredentialSourceRepository {
-	/** @var PublicKeyCredentialMapper */
-	private $credentialMapper;
-
-	public function __construct(PublicKeyCredentialMapper $credentialMapper) {
-		$this->credentialMapper = $credentialMapper;
-	}
-
-	public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKeyCredentialSource {
-		try {
-			$entity = $this->credentialMapper->findOneByCredentialId($publicKeyCredentialId);
-			return $entity->toPublicKeyCredentialSource();
-		} catch (IMapperException $e) {
-			return  null;
-		}
-	}
-
-	/**
-	 * @return PublicKeyCredentialSource[]
-	 */
-	public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCredentialUserEntity): array {
-		$uid = $publicKeyCredentialUserEntity->getId();
-		$entities = $this->credentialMapper->findAllForUid($uid);
-
-		return array_map(function (PublicKeyCredentialEntity $entity) {
-			return $entity->toPublicKeyCredentialSource();
-		}, $entities);
-	}
-
-	public function saveAndReturnCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null, bool $userVerification = false): PublicKeyCredentialEntity {
-		$oldEntity = null;
-
-		try {
-			$oldEntity = $this->credentialMapper->findOneByCredentialId($publicKeyCredentialSource->getPublicKeyCredentialId());
-		} catch (IMapperException $e) {
-		}
-
-		$defaultName = false;
-		if ($name === null) {
-			$defaultName = true;
-			$name = 'default';
-		}
-
-		$entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource($name, $publicKeyCredentialSource, $userVerification);
-
-		if ($oldEntity) {
-			$entity->setId($oldEntity->getId());
-			if ($defaultName) {
-				$entity->setName($oldEntity->getName());
-			}
-
-			// Don't downgrade UV just because it was skipped during a login due to another key
-			if ($oldEntity->getUserVerification()) {
-				$entity->setUserVerification(true);
-			}
-		}
-
-		return $this->credentialMapper->insertOrUpdate($entity);
-	}
-
-	public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null): void {
-		$this->saveAndReturnCredentialSource($publicKeyCredentialSource, $name);
-	}
+    /** @var PublicKeyCredentialMapper */
+    private $credentialMapper;
+
+    public function __construct(PublicKeyCredentialMapper $credentialMapper) {
+        $this->credentialMapper = $credentialMapper;
+    }
+
+    public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKeyCredentialSource {
+        try {
+            $entity = $this->credentialMapper->findOneByCredentialId($publicKeyCredentialId);
+            return $entity->toPublicKeyCredentialSource();
+        } catch (IMapperException $e) {
+            return  null;
+        }
+    }
+
+    /**
+     * @return PublicKeyCredentialSource[]
+     */
+    public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCredentialUserEntity): array {
+        $uid = $publicKeyCredentialUserEntity->getId();
+        $entities = $this->credentialMapper->findAllForUid($uid);
+
+        return array_map(function (PublicKeyCredentialEntity $entity) {
+            return $entity->toPublicKeyCredentialSource();
+        }, $entities);
+    }
+
+    public function saveAndReturnCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null, bool $userVerification = false): PublicKeyCredentialEntity {
+        $oldEntity = null;
+
+        try {
+            $oldEntity = $this->credentialMapper->findOneByCredentialId($publicKeyCredentialSource->getPublicKeyCredentialId());
+        } catch (IMapperException $e) {
+        }
+
+        $defaultName = false;
+        if ($name === null) {
+            $defaultName = true;
+            $name = 'default';
+        }
+
+        $entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource($name, $publicKeyCredentialSource, $userVerification);
+
+        if ($oldEntity) {
+            $entity->setId($oldEntity->getId());
+            if ($defaultName) {
+                $entity->setName($oldEntity->getName());
+            }
+
+            // Don't downgrade UV just because it was skipped during a login due to another key
+            if ($oldEntity->getUserVerification()) {
+                $entity->setUserVerification(true);
+            }
+        }
+
+        return $this->credentialMapper->insertOrUpdate($entity);
+    }
+
+    public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null): void {
+        $this->saveAndReturnCredentialSource($publicKeyCredentialSource, $name);
+    }
 }

apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php

Indentation +35 added lines, -35 removed lines

@@ -31,43 +31,43 @@
  */
 interface IAddressBookProvider {
 
-	/**
-	 * Provides the appId of the plugin
-	 *
-	 * @since 19.0.0
-	 * @return string AppId
-	 */
-	public function getAppId(): string;
+    /**
+     * Provides the appId of the plugin
+     *
+     * @since 19.0.0
+     * @return string AppId
+     */
+    public function getAppId(): string;
 
-	/**
-	 * Fetches all address books for a given principal uri
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @return ExternalAddressBook[] Array of all address books
-	 */
-	public function fetchAllForAddressBookHome(string $principalUri): array;
+    /**
+     * Fetches all address books for a given principal uri
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @return ExternalAddressBook[] Array of all address books
+     */
+    public function fetchAllForAddressBookHome(string $principalUri): array;
 
-	/**
-	 * Checks whether plugin has an address book for a given principalUri and URI
-	 *
-	 * @since 19.0.0
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $uri E.g. personal
-	 * @return bool True if address book for principalUri and URI exists, false otherwise
-	 */
-	public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool;
+    /**
+     * Checks whether plugin has an address book for a given principalUri and URI
+     *
+     * @since 19.0.0
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $uri E.g. personal
+     * @return bool True if address book for principalUri and URI exists, false otherwise
+     */
+    public function hasAddressBookInAddressBookHome(string $principalUri, string $uri): bool;
 
-	/**
-	 * Fetches an address book for a given principalUri and URI
-	 * Returns null if address book does not exist
-	 *
-	 * @param string $principalUri E.g. principals/users/user1
-	 * @param string $uri E.g. personal
-	 *
-	 * @return ExternalAddressBook|null address book if it exists, null otherwise
-	 *@since 19.0.0
-	 */
-	public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook;
+    /**
+     * Fetches an address book for a given principalUri and URI
+     * Returns null if address book does not exist
+     *
+     * @param string $principalUri E.g. principals/users/user1
+     * @param string $uri E.g. personal
+     *
+     * @return ExternalAddressBook|null address book if it exists, null otherwise
+     *@since 19.0.0
+     */
+    public function getAddressBookInAddressBookHome(string $principalUri, string $uri): ?ExternalAddressBook;
 
 }

core/Controller/WebAuthnController.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 			'preLoginNameUsedAsUserName',
 			['uid' => &$uid]
 		);
-		$this->logger->debug('Got UID: ' . $uid);
+		$this->logger->debug('Got UID: '.$uid);
 
 		$publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
 		$this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));

Indentation +55 added lines, -55 removed lines

@@ -25,69 +25,69 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 
 class WebAuthnController extends Controller {
-	private const WEBAUTHN_LOGIN = 'webauthn_login';
-	private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
+    private const WEBAUTHN_LOGIN = 'webauthn_login';
+    private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private Manager $webAuthnManger,
-		private ISession $session,
-		private LoggerInterface $logger,
-		private WebAuthnChain $webAuthnChain,
-		private URLGenerator $urlGenerator,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private Manager $webAuthnManger,
+        private ISession $session,
+        private LoggerInterface $logger,
+        private WebAuthnChain $webAuthnChain,
+        private URLGenerator $urlGenerator,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	#[PublicPage]
-	#[UseSession]
-	#[FrontpageRoute(verb: 'POST', url: 'login/webauthn/start')]
-	public function startAuthentication(string $loginName): JSONResponse {
-		$this->logger->debug('Starting WebAuthn login');
+    #[PublicPage]
+    #[UseSession]
+    #[FrontpageRoute(verb: 'POST', url: 'login/webauthn/start')]
+    public function startAuthentication(string $loginName): JSONResponse {
+        $this->logger->debug('Starting WebAuthn login');
 
-		$this->logger->debug('Converting login name to UID');
-		$uid = $loginName;
-		Util::emitHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			['uid' => &$uid]
-		);
-		$this->logger->debug('Got UID: ' . $uid);
+        $this->logger->debug('Converting login name to UID');
+        $uid = $loginName;
+        Util::emitHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            ['uid' => &$uid]
+        );
+        $this->logger->debug('Got UID: ' . $uid);
 
-		$publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
-		$this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));
-		$this->session->set(self::WEBAUTHN_LOGIN_UID, $uid);
+        $publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
+        $this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));
+        $this->session->set(self::WEBAUTHN_LOGIN_UID, $uid);
 
-		return new JSONResponse($publicKeyCredentialRequestOptions);
-	}
+        return new JSONResponse($publicKeyCredentialRequestOptions);
+    }
 
-	#[PublicPage]
-	#[UseSession]
-	#[FrontpageRoute(verb: 'POST', url: 'login/webauthn/finish')]
-	public function finishAuthentication(string $data): JSONResponse {
-		$this->logger->debug('Validating WebAuthn login');
+    #[PublicPage]
+    #[UseSession]
+    #[FrontpageRoute(verb: 'POST', url: 'login/webauthn/finish')]
+    public function finishAuthentication(string $data): JSONResponse {
+        $this->logger->debug('Validating WebAuthn login');
 
-		if (!$this->session->exists(self::WEBAUTHN_LOGIN) || !$this->session->exists(self::WEBAUTHN_LOGIN_UID)) {
-			$this->logger->debug('Trying to finish WebAuthn login without session data');
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
+        if (!$this->session->exists(self::WEBAUTHN_LOGIN) || !$this->session->exists(self::WEBAUTHN_LOGIN_UID)) {
+            $this->logger->debug('Trying to finish WebAuthn login without session data');
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		// Obtain the publicKeyCredentialOptions from when we started the registration
-		$publicKeyCredentialRequestOptions = PublicKeyCredentialRequestOptions::createFromString($this->session->get(self::WEBAUTHN_LOGIN));
-		$uid = $this->session->get(self::WEBAUTHN_LOGIN_UID);
-		$this->webAuthnManger->finishAuthentication($publicKeyCredentialRequestOptions, $data, $uid);
+        // Obtain the publicKeyCredentialOptions from when we started the registration
+        $publicKeyCredentialRequestOptions = PublicKeyCredentialRequestOptions::createFromString($this->session->get(self::WEBAUTHN_LOGIN));
+        $uid = $this->session->get(self::WEBAUTHN_LOGIN_UID);
+        $this->webAuthnManger->finishAuthentication($publicKeyCredentialRequestOptions, $data, $uid);
 
-		//TODO: add other parameters
-		$loginData = new LoginData(
-			$this->request,
-			$uid,
-			''
-		);
-		$this->webAuthnChain->process($loginData);
+        //TODO: add other parameters
+        $loginData = new LoginData(
+            $this->request,
+            $uid,
+            ''
+        );
+        $this->webAuthnChain->process($loginData);
 
-		return new JSONResponse([
-			'defaultRedirectUrl' => $this->urlGenerator->linkToDefaultPageUrl(),
-		]);
-	}
+        return new JSONResponse([
+            'defaultRedirectUrl' => $this->urlGenerator->linkToDefaultPageUrl(),
+        ]);
+    }
 }

core/templates/loginflowv2/authpicker.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<div class="notecard warning">