nextcloud / server

apps/settings/lib/Settings/Personal/Security/WebAuthn.php

Indentation +35 added lines, -35 removed lines

@@ -33,48 +33,48 @@
 
 class WebAuthn implements ISettings {
 
-	/** @var PublicKeyCredentialMapper */
-	private $mapper;
+    /** @var PublicKeyCredentialMapper */
+    private $mapper;
 
-	/** @var string */
-	private $uid;
+    /** @var string */
+    private $uid;
 
-	/** @var IInitialStateService */
-	private $initialStateService;
+    /** @var IInitialStateService */
+    private $initialStateService;
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	public function __construct(PublicKeyCredentialMapper $mapper,
-								string $UserId,
-								IInitialStateService $initialStateService,
-								Manager $manager) {
-		$this->mapper = $mapper;
-		$this->uid = $UserId;
-		$this->initialStateService = $initialStateService;
-		$this->manager = $manager;
-	}
+    public function __construct(PublicKeyCredentialMapper $mapper,
+                                string $UserId,
+                                IInitialStateService $initialStateService,
+                                Manager $manager) {
+        $this->mapper = $mapper;
+        $this->uid = $UserId;
+        $this->initialStateService = $initialStateService;
+        $this->manager = $manager;
+    }
 
-	public function getForm() {
-		$this->initialStateService->provideInitialState(
-			Application::APP_ID,
-			'webauthn-devices',
-			$this->mapper->findAllForUid($this->uid)
-		);
+    public function getForm() {
+        $this->initialStateService->provideInitialState(
+            Application::APP_ID,
+            'webauthn-devices',
+            $this->mapper->findAllForUid($this->uid)
+        );
 
-		return new TemplateResponse('settings', 'settings/personal/security/webauthn', [
-		]);
-	}
+        return new TemplateResponse('settings', 'settings/personal/security/webauthn', [
+        ]);
+    }
 
-	public function getSection(): ?string {
-		if (!$this->manager->isWebAuthnAvailable()) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->manager->isWebAuthnAvailable()) {
+            return null;
+        }
 
-		return 'security';
-	}
+        return 'security';
+    }
 
-	public function getPriority(): int {
-		return 20;
-	}
+    public function getPriority(): int {
+        return 20;
+    }
 }

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 +57 added lines, -57 removed lines

@@ -35,61 +35,61 @@
 
 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): 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);
-
-		if ($oldEntity) {
-			$entity->setId($oldEntity->getId());
-			if ($defaultName) {
-				$entity->setName($oldEntity->getName());
-			}
-		}
-
-		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): 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);
+
+        if ($oldEntity) {
+            $entity->setId($oldEntity->getId());
+            if ($defaultName) {
+                $entity->setName($oldEntity->getName());
+            }
+        }
+
+        return $this->credentialMapper->insertOrUpdate($entity);
+    }
+
+    public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, string $name = null): void {
+        $this->saveAndReturnCredentialSource($publicKeyCredentialSource, $name);
+    }
 }

lib/private/Authentication/Login/WebAuthnChain.php

Indentation +56 added lines, -56 removed lines

@@ -25,72 +25,72 @@
 namespace OC\Authentication\Login;
 
 class WebAuthnChain {
-	/** @var UserDisabledCheckCommand */
-	private $userDisabledCheckCommand;
+    /** @var UserDisabledCheckCommand */
+    private $userDisabledCheckCommand;
 
-	/** @var LoggedInCheckCommand */
-	private $loggedInCheckCommand;
+    /** @var LoggedInCheckCommand */
+    private $loggedInCheckCommand;
 
-	/** @var CompleteLoginCommand */
-	private $completeLoginCommand;
+    /** @var CompleteLoginCommand */
+    private $completeLoginCommand;
 
-	/** @var CreateSessionTokenCommand */
-	private $createSessionTokenCommand;
+    /** @var CreateSessionTokenCommand */
+    private $createSessionTokenCommand;
 
-	/** @var ClearLostPasswordTokensCommand */
-	private $clearLostPasswordTokensCommand;
+    /** @var ClearLostPasswordTokensCommand */
+    private $clearLostPasswordTokensCommand;
 
-	/** @var UpdateLastPasswordConfirmCommand */
-	private $updateLastPasswordConfirmCommand;
+    /** @var UpdateLastPasswordConfirmCommand */
+    private $updateLastPasswordConfirmCommand;
 
-	/** @var SetUserTimezoneCommand */
-	private $setUserTimezoneCommand;
+    /** @var SetUserTimezoneCommand */
+    private $setUserTimezoneCommand;
 
-	/** @var TwoFactorCommand */
-	private $twoFactorCommand;
+    /** @var TwoFactorCommand */
+    private $twoFactorCommand;
 
-	/** @var FinishRememberedLoginCommand */
-	private $finishRememberedLoginCommand;
+    /** @var FinishRememberedLoginCommand */
+    private $finishRememberedLoginCommand;
 
-	/** @var WebAuthnLoginCommand */
-	private $webAuthnLoginCommand;
+    /** @var WebAuthnLoginCommand */
+    private $webAuthnLoginCommand;
 
-	public function __construct(UserDisabledCheckCommand $userDisabledCheckCommand,
-								WebAuthnLoginCommand $webAuthnLoginCommand,
-								LoggedInCheckCommand $loggedInCheckCommand,
-								CompleteLoginCommand $completeLoginCommand,
-								CreateSessionTokenCommand $createSessionTokenCommand,
-								ClearLostPasswordTokensCommand $clearLostPasswordTokensCommand,
-								UpdateLastPasswordConfirmCommand $updateLastPasswordConfirmCommand,
-								SetUserTimezoneCommand $setUserTimezoneCommand,
-								TwoFactorCommand $twoFactorCommand,
-								FinishRememberedLoginCommand $finishRememberedLoginCommand
-	) {
-		$this->userDisabledCheckCommand = $userDisabledCheckCommand;
-		$this->webAuthnLoginCommand = $webAuthnLoginCommand;
-		$this->loggedInCheckCommand = $loggedInCheckCommand;
-		$this->completeLoginCommand = $completeLoginCommand;
-		$this->createSessionTokenCommand = $createSessionTokenCommand;
-		$this->clearLostPasswordTokensCommand = $clearLostPasswordTokensCommand;
-		$this->updateLastPasswordConfirmCommand = $updateLastPasswordConfirmCommand;
-		$this->setUserTimezoneCommand = $setUserTimezoneCommand;
-		$this->twoFactorCommand = $twoFactorCommand;
-		$this->finishRememberedLoginCommand = $finishRememberedLoginCommand;
-	}
+    public function __construct(UserDisabledCheckCommand $userDisabledCheckCommand,
+                                WebAuthnLoginCommand $webAuthnLoginCommand,
+                                LoggedInCheckCommand $loggedInCheckCommand,
+                                CompleteLoginCommand $completeLoginCommand,
+                                CreateSessionTokenCommand $createSessionTokenCommand,
+                                ClearLostPasswordTokensCommand $clearLostPasswordTokensCommand,
+                                UpdateLastPasswordConfirmCommand $updateLastPasswordConfirmCommand,
+                                SetUserTimezoneCommand $setUserTimezoneCommand,
+                                TwoFactorCommand $twoFactorCommand,
+                                FinishRememberedLoginCommand $finishRememberedLoginCommand
+    ) {
+        $this->userDisabledCheckCommand = $userDisabledCheckCommand;
+        $this->webAuthnLoginCommand = $webAuthnLoginCommand;
+        $this->loggedInCheckCommand = $loggedInCheckCommand;
+        $this->completeLoginCommand = $completeLoginCommand;
+        $this->createSessionTokenCommand = $createSessionTokenCommand;
+        $this->clearLostPasswordTokensCommand = $clearLostPasswordTokensCommand;
+        $this->updateLastPasswordConfirmCommand = $updateLastPasswordConfirmCommand;
+        $this->setUserTimezoneCommand = $setUserTimezoneCommand;
+        $this->twoFactorCommand = $twoFactorCommand;
+        $this->finishRememberedLoginCommand = $finishRememberedLoginCommand;
+    }
 
-	public function process(LoginData $loginData): LoginResult {
-		$chain = $this->userDisabledCheckCommand;
-		$chain
-			->setNext($this->webAuthnLoginCommand)
-			->setNext($this->loggedInCheckCommand)
-			->setNext($this->completeLoginCommand)
-			->setNext($this->createSessionTokenCommand)
-			->setNext($this->clearLostPasswordTokensCommand)
-			->setNext($this->updateLastPasswordConfirmCommand)
-			->setNext($this->setUserTimezoneCommand)
-			->setNext($this->twoFactorCommand)
-			->setNext($this->finishRememberedLoginCommand);
+    public function process(LoginData $loginData): LoginResult {
+        $chain = $this->userDisabledCheckCommand;
+        $chain
+            ->setNext($this->webAuthnLoginCommand)
+            ->setNext($this->loggedInCheckCommand)
+            ->setNext($this->completeLoginCommand)
+            ->setNext($this->createSessionTokenCommand)
+            ->setNext($this->clearLostPasswordTokensCommand)
+            ->setNext($this->updateLastPasswordConfirmCommand)
+            ->setNext($this->setUserTimezoneCommand)
+            ->setNext($this->twoFactorCommand)
+            ->setNext($this->finishRememberedLoginCommand);
 
-		return $chain->process($loginData);
-	}
+        return $chain->process($loginData);
+    }
 }

lib/private/Authentication/Login/WebAuthnLoginCommand.php

Indentation +16 added lines, -16 removed lines

@@ -28,21 +28,21 @@
 
 class WebAuthnLoginCommand extends ALoginCommand {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-	}
-
-	public function process(LoginData $loginData): LoginResult {
-		$user = $this->userManager->get($loginData->getUsername());
-		$loginData->setUser($user);
-		if ($user === null) {
-			$loginData->setUser(false);
-		}
-
-		return $this->processNextOrFinishSuccessfully($loginData);
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+    }
+
+    public function process(LoginData $loginData): LoginResult {
+        $user = $this->userManager->get($loginData->getUsername());
+        $loginData->setUser($user);
+        if ($user === null) {
+            $loginData->setUser(false);
+        }
+
+        return $this->processNextOrFinishSuccessfully($loginData);
+    }
 
 }

lib/private/Authentication/Login/LoginData.php

Indentation +87 added lines, -87 removed lines

@@ -30,92 +30,92 @@
 
 class LoginData {
 
-	/** @var IRequest */
-	private $request;
-
-	/** @var string */
-	private $username;
-
-	/** @var string */
-	private $password;
-
-	/** @var string */
-	private $redirectUrl;
-
-	/** @var string */
-	private $timeZone;
-
-	/** @var string */
-	private $timeZoneOffset;
-
-	/** @var IUser|false|null */
-	private $user = null;
-
-	/** @var bool */
-	private $rememberLogin = true;
-
-	public function __construct(IRequest $request,
-								string $username,
-								?string $password,
-								string $redirectUrl = null,
-								string $timeZone = '',
-								string $timeZoneOffset = '') {
-		$this->request = $request;
-		$this->username = $username;
-		$this->password = $password;
-		$this->redirectUrl = $redirectUrl;
-		$this->timeZone = $timeZone;
-		$this->timeZoneOffset = $timeZoneOffset;
-	}
-
-	public function getRequest(): IRequest {
-		return $this->request;
-	}
-
-	public function setUsername(string $username): void {
-		$this->username = $username;
-	}
-
-	public function getUsername(): string {
-		return $this->username;
-	}
-
-	public function getPassword(): ?string {
-		return $this->password;
-	}
-
-	public function getRedirectUrl(): ?string {
-		return $this->redirectUrl;
-	}
-
-	public function getTimeZone(): string {
-		return $this->timeZone;
-	}
-
-	public function getTimeZoneOffset(): string {
-		return $this->timeZoneOffset;
-	}
-
-	/**
-	 * @param IUser|false|null $user
-	 */
-	public function setUser($user) {
-		$this->user = $user;
-	}
-
-	/**
-	 * @return false|IUser|null
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	public function setRememberLogin(bool $rememberLogin): void {
-		$this->rememberLogin = $rememberLogin;
-	}
-
-	public function isRememberLogin(): bool {
-		return $this->rememberLogin;
-	}
+    /** @var IRequest */
+    private $request;
+
+    /** @var string */
+    private $username;
+
+    /** @var string */
+    private $password;
+
+    /** @var string */
+    private $redirectUrl;
+
+    /** @var string */
+    private $timeZone;
+
+    /** @var string */
+    private $timeZoneOffset;
+
+    /** @var IUser|false|null */
+    private $user = null;
+
+    /** @var bool */
+    private $rememberLogin = true;
+
+    public function __construct(IRequest $request,
+                                string $username,
+                                ?string $password,
+                                string $redirectUrl = null,
+                                string $timeZone = '',
+                                string $timeZoneOffset = '') {
+        $this->request = $request;
+        $this->username = $username;
+        $this->password = $password;
+        $this->redirectUrl = $redirectUrl;
+        $this->timeZone = $timeZone;
+        $this->timeZoneOffset = $timeZoneOffset;
+    }
+
+    public function getRequest(): IRequest {
+        return $this->request;
+    }
+
+    public function setUsername(string $username): void {
+        $this->username = $username;
+    }
+
+    public function getUsername(): string {
+        return $this->username;
+    }
+
+    public function getPassword(): ?string {
+        return $this->password;
+    }
+
+    public function getRedirectUrl(): ?string {
+        return $this->redirectUrl;
+    }
+
+    public function getTimeZone(): string {
+        return $this->timeZone;
+    }
+
+    public function getTimeZoneOffset(): string {
+        return $this->timeZoneOffset;
+    }
+
+    /**
+     * @param IUser|false|null $user
+     */
+    public function setUser($user) {
+        $this->user = $user;
+    }
+
+    /**
+     * @return false|IUser|null
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    public function setRememberLogin(bool $rememberLogin): void {
+        $this->rememberLogin = $rememberLogin;
+    }
+
+    public function isRememberLogin(): bool {
+        return $this->rememberLogin;
+    }
 
 }

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;
 
 }

lib/public/User/Events/BeforeUserLoggedInEvent.php

Indentation +26 added lines, -26 removed lines

@@ -34,35 +34,35 @@
  */
 class BeforeUserLoggedInEvent extends Event {
 
-	/** @var string */
-	private $username;
+    /** @var string */
+    private $username;
 
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @since 18.0.0
-	 */
-	public function __construct(string $username, string $password) {
-		parent::__construct();
-		$this->username = $username;
-		$this->password = $password;
-	}
+    /**
+     * @since 18.0.0
+     */
+    public function __construct(string $username, string $password) {
+        parent::__construct();
+        $this->username = $username;
+        $this->password = $password;
+    }
 
-	/**
-	 * returns the login name, which must not necessarily match to a user ID
-	 *
-	 * @since 18.0.0
-	 */
-	public function getUsername(): string {
-		return $this->username;
-	}
+    /**
+     * returns the login name, which must not necessarily match to a user ID
+     *
+     * @since 18.0.0
+     */
+    public function getUsername(): string {
+        return $this->username;
+    }
 
-	/**
-	 * @since 18.0.0
-	 */
-	public function getPassword(): string {
-		return $this->password;
-	}
+    /**
+     * @since 18.0.0
+     */
+    public function getPassword(): string {
+        return $this->password;
+    }
 
 }

lib/private/legacy/OC_User.php

Spacing +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
 				case 'database':
 				case 'mysql':
 				case 'sqlite':
-					\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
+					\OCP\Util::writeLog('core', 'Adding user backend '.$backend.'.', ILogger::DEBUG);
 					self::$_usedBackends[$backend] = new \OC\User\Database();
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
@@ -100,8 +100,8 @@ 
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 				default:
-					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
-					$className = 'OC_USER_' . strtoupper($backend);
+					\OCP\Util::writeLog('core', 'Adding default user backend '.$backend.'.', ILogger::DEBUG);
+					$className = 'OC_USER_'.strtoupper($backend);
 					self::$_usedBackends[$backend] = new $className();
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
@@ -145,10 +145,10 @@ 
 					self::useBackend($backend);
 					self::$_setupedBackends[] = $i;
 				} else {
-					\OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', ILogger::DEBUG);
+					\OCP\Util::writeLog('core', 'User backend '.$class.' already initialized.', ILogger::DEBUG);
 				}
 			} else {
-				\OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'User backend '.$class.' not found.', ILogger::ERROR);
 			}
 		}
 	}
@@ -270,7 +270,7 @@ 
 		}
 
 		$logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
-		$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
+		$logoutUrl .= '?requesttoken='.urlencode(\OCP\Util::callRegister());
 
 		return $logoutUrl;
 	}
@@ -362,7 +362,7 @@ 
 		if ($user) {
 			return $user->getHome();
 		} else {
-			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$uid;
 		}
 	}
 

Indentation +349 added lines, -349 removed lines

@@ -61,353 +61,353 @@
  *   logout()
  */
 class OC_User {
-	private static $_usedBackends = [];
-
-	private static $_setupedBackends = [];
-
-	// bool, stores if a user want to access a resource anonymously, e.g if they open a public link
-	private static $incognitoMode = false;
-
-	/**
-	 * Adds the backend to the list of used backends
-	 *
-	 * @param string|\OCP\UserInterface $backend default: database The backend to use for user management
-	 * @return bool
-	 *
-	 * Set the User Authentication Module
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function useBackend($backend = 'database') {
-		if ($backend instanceof \OCP\UserInterface) {
-			self::$_usedBackends[get_class($backend)] = $backend;
-			\OC::$server->getUserManager()->registerBackend($backend);
-		} else {
-			// You'll never know what happens
-			if (null === $backend or !is_string($backend)) {
-				$backend = 'database';
-			}
-
-			// Load backend
-			switch ($backend) {
-				case 'database':
-				case 'mysql':
-				case 'sqlite':
-					\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
-					self::$_usedBackends[$backend] = new \OC\User\Database();
-					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
-					break;
-				case 'dummy':
-					self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
-					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
-					break;
-				default:
-					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
-					$className = 'OC_USER_' . strtoupper($backend);
-					self::$_usedBackends[$backend] = new $className();
-					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
-					break;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * remove all used backends
-	 */
-	public static function clearBackends() {
-		self::$_usedBackends = [];
-		\OC::$server->getUserManager()->clearBackends();
-	}
-
-	/**
-	 * setup the configured backends in config.php
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function setupBackends() {
-		OC_App::loadApps(['prelogin']);
-		$backends = \OC::$server->getSystemConfig()->getValue('user_backends', []);
-		if (isset($backends['default']) && !$backends['default']) {
-			// clear default backends
-			self::clearBackends();
-		}
-		foreach ($backends as $i => $config) {
-			if (!is_array($config)) {
-				continue;
-			}
-			$class = $config['class'];
-			$arguments = $config['arguments'];
-			if (class_exists($class)) {
-				if (array_search($i, self::$_setupedBackends) === false) {
-					// make a reflection object
-					$reflectionObj = new ReflectionClass($class);
-
-					// use Reflection to create a new instance, using the $args
-					$backend = $reflectionObj->newInstanceArgs($arguments);
-					self::useBackend($backend);
-					self::$_setupedBackends[] = $i;
-				} else {
-					\OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', ILogger::DEBUG);
-				}
-			} else {
-				\OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', ILogger::ERROR);
-			}
-		}
-	}
-
-	/**
-	 * Try to login a user, assuming authentication
-	 * has already happened (e.g. via Single Sign On).
-	 *
-	 * Log in a user and regenerate a new session.
-	 *
-	 * @param \OCP\Authentication\IApacheBackend $backend
-	 * @return bool
-	 */
-	public static function loginWithApache(\OCP\Authentication\IApacheBackend $backend) {
-		$uid = $backend->getCurrentUserId();
-		$run = true;
-		OC_Hook::emit("OC_User", "pre_login", ["run" => &$run, "uid" => $uid, 'backend' => $backend]);
-
-		if ($uid) {
-			if (self::getUser() !== $uid) {
-				self::setUserId($uid);
-				$userSession = \OC::$server->getUserSession();
-				if ($userSession->getUser() && !$userSession->getUser()->isEnabled()) {
-					$message = \OC::$server->getL10N('lib')->t('User disabled');
-					throw new LoginException($message);
-				}
-				$userSession->setLoginName($uid);
-				$request = OC::$server->getRequest();
-				$password = null;
-				if ($backend instanceof \OCP\Authentication\IProvideUserSecretBackend) {
-					$password = $backend->getCurrentUserSecret();
-				}
-				$userSession->createSessionToken($request, $uid, $uid, $password);
-				$userSession->createRememberMeToken($userSession->getUser());
-				// setup the filesystem
-				OC_Util::setupFS($uid);
-				// first call the post_login hooks, the login-process needs to be
-				// completed before we can safely create the users folder.
-				// For example encryption needs to initialize the users keys first
-				// before we can create the user folder with the skeleton files
-				OC_Hook::emit(
-					'OC_User',
-					'post_login',
-					[
-						'uid' => $uid,
-						'password' => $password,
-						'isTokenLogin' => false,
-					]
-				);
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = \OC::$server->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent(
-						\OC::$server->get(IUserManager::class)->get($uid),
-						$uid,
-						null,
-						false)
-				);
-
-				//trigger creation of user home and /files folder
-				\OC::$server->getUserFolder($uid);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Verify with Apache whether user is authenticated.
-	 *
-	 * @return boolean|null
-	 *          true: authenticated
-	 *          false: not authenticated
-	 *          null: not handled / no backend available
-	 */
-	public static function handleApacheAuth() {
-		$backend = self::findFirstActiveUsedBackend();
-		if ($backend) {
-			OC_App::loadApps();
-
-			//setup extra user backends
-			self::setupBackends();
-			\OC::$server->getUserSession()->unsetMagicInCookie();
-
-			return self::loginWithApache($backend);
-		}
-
-		return null;
-	}
-
-
-	/**
-	 * Sets user id for session and triggers emit
-	 *
-	 * @param string $uid
-	 */
-	public static function setUserId($uid) {
-		$userSession = \OC::$server->getUserSession();
-		$userManager = \OC::$server->getUserManager();
-		if ($user = $userManager->get($uid)) {
-			$userSession->setUser($user);
-		} else {
-			\OC::$server->getSession()->set('user_id', $uid);
-		}
-	}
-
-	/**
-	 * Check if the user is logged in, considers also the HTTP basic credentials
-	 *
-	 * @deprecated use \OC::$server->getUserSession()->isLoggedIn()
-	 * @return bool
-	 */
-	public static function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * set incognito mode, e.g. if a user wants to open a public link
-	 *
-	 * @param bool $status
-	 */
-	public static function setIncognitoMode($status) {
-		self::$incognitoMode = $status;
-	}
-
-	/**
-	 * get incognito mode status
-	 *
-	 * @return bool
-	 */
-	public static function isIncognitoMode() {
-		return self::$incognitoMode;
-	}
-
-	/**
-	 * Returns the current logout URL valid for the currently logged-in user
-	 *
-	 * @param \OCP\IURLGenerator $urlGenerator
-	 * @return string
-	 */
-	public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
-		$backend = self::findFirstActiveUsedBackend();
-		if ($backend) {
-			return $backend->getLogoutUrl();
-		}
-
-		$user = \OC::$server->getUserSession()->getUser();
-		if ($user instanceof \OCP\IUser) {
-			$backend = $user->getBackend();
-			if ($backend instanceof \OCP\User\Backend\ICustomLogout) {
-				return $backend->getLogoutUrl();
-			}
-		}
-
-		$logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
-		$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
-
-		return $logoutUrl;
-	}
-
-	/**
-	 * Check if the user is an admin user
-	 *
-	 * @param string $uid uid of the admin
-	 * @return bool
-	 */
-	public static function isAdminUser($uid) {
-		$group = \OC::$server->getGroupManager()->get('admin');
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($group && $user && $group->inGroup($user) && self::$incognitoMode === false) {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * get the user id of the user currently logged in.
-	 *
-	 * @return string|false uid or false
-	 */
-	public static function getUser() {
-		$uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null;
-		if (!is_null($uid) && self::$incognitoMode === false) {
-			return $uid;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Set password
-	 *
-	 * @param string $uid The username
-	 * @param string $password The new password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 *
-	 * Change the password of a user
-	 */
-	public static function setPassword($uid, $password, $recoveryPassword = null) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->setPassword($password, $recoveryPassword);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $uid The username
-	 * @return string
-	 *
-	 * returns the path to the users home directory
-	 * @deprecated Use \OC::$server->getUserManager->getHome()
-	 */
-	public static function getHome($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->getHome();
-		} else {
-			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
-		}
-	}
-
-	/**
-	 * Get a list of all users display name
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array associative array with all display names (value) and corresponding uids (key)
-	 *
-	 * Get a list of all display names and user ids.
-	 * @deprecated Use \OC::$server->getUserManager->searchDisplayName($search, $limit, $offset) instead.
-	 */
-	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$displayNames = [];
-		$users = \OC::$server->getUserManager()->searchDisplayName($search, $limit, $offset);
-		foreach ($users as $user) {
-			$displayNames[$user->getUID()] = $user->getDisplayName();
-		}
-		return $displayNames;
-	}
-
-	/**
-	 * Returns the first active backend from self::$_usedBackends.
-	 *
-	 * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
-	 */
-	private static function findFirstActiveUsedBackend() {
-		foreach (self::$_usedBackends as $backend) {
-			if ($backend instanceof OCP\Authentication\IApacheBackend) {
-				if ($backend->isSessionActive()) {
-					return $backend;
-				}
-			}
-		}
-
-		return null;
-	}
+    private static $_usedBackends = [];
+
+    private static $_setupedBackends = [];
+
+    // bool, stores if a user want to access a resource anonymously, e.g if they open a public link
+    private static $incognitoMode = false;
+
+    /**
+     * Adds the backend to the list of used backends
+     *
+     * @param string|\OCP\UserInterface $backend default: database The backend to use for user management
+     * @return bool
+     *
+     * Set the User Authentication Module
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function useBackend($backend = 'database') {
+        if ($backend instanceof \OCP\UserInterface) {
+            self::$_usedBackends[get_class($backend)] = $backend;
+            \OC::$server->getUserManager()->registerBackend($backend);
+        } else {
+            // You'll never know what happens
+            if (null === $backend or !is_string($backend)) {
+                $backend = 'database';
+            }
+
+            // Load backend
+            switch ($backend) {
+                case 'database':
+                case 'mysql':
+                case 'sqlite':
+                    \OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
+                    self::$_usedBackends[$backend] = new \OC\User\Database();
+                    \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+                    break;
+                case 'dummy':
+                    self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
+                    \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+                    break;
+                default:
+                    \OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
+                    $className = 'OC_USER_' . strtoupper($backend);
+                    self::$_usedBackends[$backend] = new $className();
+                    \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+                    break;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * remove all used backends
+     */
+    public static function clearBackends() {
+        self::$_usedBackends = [];
+        \OC::$server->getUserManager()->clearBackends();
+    }
+
+    /**
+     * setup the configured backends in config.php
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function setupBackends() {
+        OC_App::loadApps(['prelogin']);
+        $backends = \OC::$server->getSystemConfig()->getValue('user_backends', []);
+        if (isset($backends['default']) && !$backends['default']) {
+            // clear default backends
+            self::clearBackends();
+        }
+        foreach ($backends as $i => $config) {
+            if (!is_array($config)) {
+                continue;
+            }
+            $class = $config['class'];
+            $arguments = $config['arguments'];
+            if (class_exists($class)) {
+                if (array_search($i, self::$_setupedBackends) === false) {
+                    // make a reflection object
+                    $reflectionObj = new ReflectionClass($class);
+
+                    // use Reflection to create a new instance, using the $args
+                    $backend = $reflectionObj->newInstanceArgs($arguments);
+                    self::useBackend($backend);
+                    self::$_setupedBackends[] = $i;
+                } else {
+                    \OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', ILogger::DEBUG);
+                }
+            } else {
+                \OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', ILogger::ERROR);
+            }
+        }
+    }
+
+    /**
+     * Try to login a user, assuming authentication
+     * has already happened (e.g. via Single Sign On).
+     *
+     * Log in a user and regenerate a new session.
+     *
+     * @param \OCP\Authentication\IApacheBackend $backend
+     * @return bool
+     */
+    public static function loginWithApache(\OCP\Authentication\IApacheBackend $backend) {
+        $uid = $backend->getCurrentUserId();
+        $run = true;
+        OC_Hook::emit("OC_User", "pre_login", ["run" => &$run, "uid" => $uid, 'backend' => $backend]);
+
+        if ($uid) {
+            if (self::getUser() !== $uid) {
+                self::setUserId($uid);
+                $userSession = \OC::$server->getUserSession();
+                if ($userSession->getUser() && !$userSession->getUser()->isEnabled()) {
+                    $message = \OC::$server->getL10N('lib')->t('User disabled');
+                    throw new LoginException($message);
+                }
+                $userSession->setLoginName($uid);
+                $request = OC::$server->getRequest();
+                $password = null;
+                if ($backend instanceof \OCP\Authentication\IProvideUserSecretBackend) {
+                    $password = $backend->getCurrentUserSecret();
+                }
+                $userSession->createSessionToken($request, $uid, $uid, $password);
+                $userSession->createRememberMeToken($userSession->getUser());
+                // setup the filesystem
+                OC_Util::setupFS($uid);
+                // first call the post_login hooks, the login-process needs to be
+                // completed before we can safely create the users folder.
+                // For example encryption needs to initialize the users keys first
+                // before we can create the user folder with the skeleton files
+                OC_Hook::emit(
+                    'OC_User',
+                    'post_login',
+                    [
+                        'uid' => $uid,
+                        'password' => $password,
+                        'isTokenLogin' => false,
+                    ]
+                );
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = \OC::$server->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent(
+                        \OC::$server->get(IUserManager::class)->get($uid),
+                        $uid,
+                        null,
+                        false)
+                );
+
+                //trigger creation of user home and /files folder
+                \OC::$server->getUserFolder($uid);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Verify with Apache whether user is authenticated.
+     *
+     * @return boolean|null
+     *          true: authenticated
+     *          false: not authenticated
+     *          null: not handled / no backend available
+     */
+    public static function handleApacheAuth() {
+        $backend = self::findFirstActiveUsedBackend();
+        if ($backend) {
+            OC_App::loadApps();
+
+            //setup extra user backends
+            self::setupBackends();
+            \OC::$server->getUserSession()->unsetMagicInCookie();
+
+            return self::loginWithApache($backend);
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Sets user id for session and triggers emit
+     *
+     * @param string $uid
+     */
+    public static function setUserId($uid) {
+        $userSession = \OC::$server->getUserSession();
+        $userManager = \OC::$server->getUserManager();
+        if ($user = $userManager->get($uid)) {
+            $userSession->setUser($user);
+        } else {
+            \OC::$server->getSession()->set('user_id', $uid);
+        }
+    }
+
+    /**
+     * Check if the user is logged in, considers also the HTTP basic credentials
+     *
+     * @deprecated use \OC::$server->getUserSession()->isLoggedIn()
+     * @return bool
+     */
+    public static function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * set incognito mode, e.g. if a user wants to open a public link
+     *
+     * @param bool $status
+     */
+    public static function setIncognitoMode($status) {
+        self::$incognitoMode = $status;
+    }
+
+    /**
+     * get incognito mode status
+     *
+     * @return bool
+     */
+    public static function isIncognitoMode() {
+        return self::$incognitoMode;
+    }
+
+    /**
+     * Returns the current logout URL valid for the currently logged-in user
+     *
+     * @param \OCP\IURLGenerator $urlGenerator
+     * @return string
+     */
+    public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
+        $backend = self::findFirstActiveUsedBackend();
+        if ($backend) {
+            return $backend->getLogoutUrl();
+        }
+
+        $user = \OC::$server->getUserSession()->getUser();
+        if ($user instanceof \OCP\IUser) {
+            $backend = $user->getBackend();
+            if ($backend instanceof \OCP\User\Backend\ICustomLogout) {
+                return $backend->getLogoutUrl();
+            }
+        }
+
+        $logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
+        $logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
+
+        return $logoutUrl;
+    }
+
+    /**
+     * Check if the user is an admin user
+     *
+     * @param string $uid uid of the admin
+     * @return bool
+     */
+    public static function isAdminUser($uid) {
+        $group = \OC::$server->getGroupManager()->get('admin');
+        $user = \OC::$server->getUserManager()->get($uid);
+        if ($group && $user && $group->inGroup($user) && self::$incognitoMode === false) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * get the user id of the user currently logged in.
+     *
+     * @return string|false uid or false
+     */
+    public static function getUser() {
+        $uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null;
+        if (!is_null($uid) && self::$incognitoMode === false) {
+            return $uid;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Set password
+     *
+     * @param string $uid The username
+     * @param string $password The new password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     *
+     * Change the password of a user
+     */
+    public static function setPassword($uid, $password, $recoveryPassword = null) {
+        $user = \OC::$server->getUserManager()->get($uid);
+        if ($user) {
+            return $user->setPassword($password, $recoveryPassword);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $uid The username
+     * @return string
+     *
+     * returns the path to the users home directory
+     * @deprecated Use \OC::$server->getUserManager->getHome()
+     */
+    public static function getHome($uid) {
+        $user = \OC::$server->getUserManager()->get($uid);
+        if ($user) {
+            return $user->getHome();
+        } else {
+            return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+        }
+    }
+
+    /**
+     * Get a list of all users display name
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array associative array with all display names (value) and corresponding uids (key)
+     *
+     * Get a list of all display names and user ids.
+     * @deprecated Use \OC::$server->getUserManager->searchDisplayName($search, $limit, $offset) instead.
+     */
+    public static function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $displayNames = [];
+        $users = \OC::$server->getUserManager()->searchDisplayName($search, $limit, $offset);
+        foreach ($users as $user) {
+            $displayNames[$user->getUID()] = $user->getDisplayName();
+        }
+        return $displayNames;
+    }
+
+    /**
+     * Returns the first active backend from self::$_usedBackends.
+     *
+     * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
+     */
+    private static function findFirstActiveUsedBackend() {
+        foreach (self::$_usedBackends as $backend) {
+            if ($backend instanceof OCP\Authentication\IApacheBackend) {
+                if ($backend->isSessionActive()) {
+                    return $backend;
+                }
+            }
+        }
+
+        return null;
+    }
 }

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 +69 added lines, -69 removed lines

@@ -39,73 +39,73 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 
 class WebAuthnController extends Controller {
-	private const WEBAUTHN_LOGIN = 'webauthn_login';
-	private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
-
-	private Manager $webAuthnManger;
-	private ISession $session;
-	private LoggerInterface $logger;
-	private WebAuthnChain $webAuthnChain;
-
-	public function __construct($appName, IRequest $request, Manager $webAuthnManger, ISession $session, LoggerInterface $logger, WebAuthnChain $webAuthnChain) {
-		parent::__construct($appName, $request);
-
-		$this->webAuthnManger = $webAuthnManger;
-		$this->session = $session;
-		$this->logger = $logger;
-		$this->webAuthnChain = $webAuthnChain;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PublicPage
-	 * @UseSession
-	 */
-	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);
-
-		$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);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PublicPage
-	 * @UseSession
-	 */
-	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);
-		}
-
-		// 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);
-
-		return new JSONResponse([]);
-	}
+    private const WEBAUTHN_LOGIN = 'webauthn_login';
+    private const WEBAUTHN_LOGIN_UID = 'webauthn_login_uid';
+
+    private Manager $webAuthnManger;
+    private ISession $session;
+    private LoggerInterface $logger;
+    private WebAuthnChain $webAuthnChain;
+
+    public function __construct($appName, IRequest $request, Manager $webAuthnManger, ISession $session, LoggerInterface $logger, WebAuthnChain $webAuthnChain) {
+        parent::__construct($appName, $request);
+
+        $this->webAuthnManger = $webAuthnManger;
+        $this->session = $session;
+        $this->logger = $logger;
+        $this->webAuthnChain = $webAuthnChain;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PublicPage
+     * @UseSession
+     */
+    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);
+
+        $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);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PublicPage
+     * @UseSession
+     */
+    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);
+        }
+
+        // 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);
+
+        return new JSONResponse([]);
+    }
 }