nextcloud / server

apps/settings/templates/settings/personal/security/webauthn.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  */
 
 script('settings', [
-	'vue-settings-personal-webauthn',
+    'vue-settings-personal-webauthn',
 ]);
 
 ?>

apps/settings/appinfo/routes.php

Indentation +51 added lines, -51 removed lines

@@ -39,60 +39,60 @@
 $application = \OC::$server->query(Application::class);
 $this->useCollection('root');
 $application->registerRoutes($this, [
-	'resources' => [
-		'AuthSettings' => ['url' => '/settings/personal/authtokens'],
-	],
-	'routes' => [
-		['name' => 'AuthSettings#wipe', 'url' => '/settings/personal/authtokens/wipe/{id}', 'verb' => 'POST'],
+    'resources' => [
+        'AuthSettings' => ['url' => '/settings/personal/authtokens'],
+    ],
+    'routes' => [
+        ['name' => 'AuthSettings#wipe', 'url' => '/settings/personal/authtokens/wipe/{id}', 'verb' => 'POST'],
 
-		['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
-		['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
-		['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
-		['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
+        ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
+        ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
+        ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
+        ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
 
-		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
-		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
-		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST'],
-		['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST'],
-		['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST'],
-		['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']],
-		['name' => 'AppSettings#force', 'url' => '/settings/apps/force', 'verb' => 'POST'],
+        ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
+        ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
+        ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST'],
+        ['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST'],
+        ['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST'],
+        ['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']],
+        ['name' => 'AppSettings#force', 'url' => '/settings/apps/force', 'verb' => 'POST'],
 
-		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
-		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
-		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
-		['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
-		['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET'],
-		['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+']],
-		['name' => 'Users#setPreference', 'url' => '/settings/users/preferences/{key}', 'verb' => 'POST'],
-		['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
-		['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
-		['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
-		['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
-		['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
-		['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
-		['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
-		['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
-		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
-		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
-		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
-		['name' => 'TwoFactorSettings#index', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'GET'],
-		['name' => 'TwoFactorSettings#update', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'PUT'],
+        ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
+        ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
+        ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
+        ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
+        ['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET'],
+        ['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+']],
+        ['name' => 'Users#setPreference', 'url' => '/settings/users/preferences/{key}', 'verb' => 'POST'],
+        ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
+        ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
+        ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
+        ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
+        ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
+        ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
+        ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
+        ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
+        ['name' => 'TwoFactorSettings#index', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'GET'],
+        ['name' => 'TwoFactorSettings#update', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'PUT'],
 
-		['name' => 'Help#help', 'url' => '/settings/help/{mode}', 'verb' => 'GET', 'defaults' => ['mode' => '']],
+        ['name' => 'Help#help', 'url' => '/settings/help/{mode}', 'verb' => 'GET', 'defaults' => ['mode' => '']],
 
-		['name' => 'WebAuthn#startRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'GET'],
-		['name' => 'WebAuthn#finishRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'POST'],
-		['name' => 'WebAuthn#deleteRegistration', 'url' => '/settings/api/personal/webauthn/registration/{id}', 'verb' => 'DELETE'],
-	]
+        ['name' => 'WebAuthn#startRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'GET'],
+        ['name' => 'WebAuthn#finishRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'POST'],
+        ['name' => 'WebAuthn#deleteRegistration', 'url' => '/settings/api/personal/webauthn/registration/{id}', 'verb' => 'DELETE'],
+    ]
 ]);

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

apps/settings/lib/AppInfo/Application.php

Indentation +161 added lines, -161 removed lines

@@ -55,165 +55,165 @@
 
 class Application extends App {
 
-	const APP_ID = 'settings';
-
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams=[]){
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$container = $this->getContainer();
-
-		// Register Middleware
-		$container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$container->registerMiddleWare('SubadminMiddleware');
-
-		/**
-		 * Core class wrappers
-		 */
-		/** FIXME: Remove once OC_User is non-static and mockable */
-		$container->registerService('isAdmin', function() {
-			return \OC_User::isAdminUser(\OC_User::getUser());
-		});
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$container->registerService('isSubAdmin', function(IContainer $c) {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$container->registerService('userCertificateManager', function(IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager();
-		}, false);
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager(null);
-		}, false);
-		$container->registerService(IProvider::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->query(IProvider::class);
-		});
-		$container->registerService(IManager::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->getSettingsManager();
-		});
-
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
-			/** @var Server $server */
-			$server = $c->query('ServerContainer');
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
-
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-
-		/** @var EventDispatcherInterface $eventDispatcher */
-		$eventDispatcher = $container->getServer()->getEventDispatcher();
-		$eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
-			if (($token = $event->getSubject()) instanceof IToken) {
-				/** @var IActivityManager $activityManager */
-				$activityManager = $container->query(IActivityManager::class);
-				/** @var ILogger $logger */
-				$logger = $container->query(ILogger::class);
-
-				$activity = $activityManager->generateEvent();
-				$activity->setApp('settings')
-					->setType('security')
-					->setAffectedUser($token->getUID())
-					->setAuthor($token->getUID())
-					->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
-					->setObject('app_token', $token->getId());
-
-				try {
-					$activityManager->publish($activity);
-				} catch (BadMethodCallException $e) {
-					$logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
-				}
-			}
-		});
-	}
-
-	public function register() {
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-
-		$groupManager = $this->getContainer()->getServer()->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
-		$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
-
-		Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
-	}
-
-	public function addUserToGroup(IGroup $group, IUser $user): void {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->addUserToGroup($group, $user);
-
-	}
-
-	public function removeUserFromGroup(IGroup $group, IUser $user): void {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->removeUserFromGroup($group, $user);
-	}
-
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
-
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
-
-	/**
-	 * @param array $settings
-	 */
-	public function extendJsConfig(array $settings) {
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
-
-		$publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', '');
-		if (!empty($publicWebFinger)) {
-			$appConfig['core']['public_webfinger'] = $publicWebFinger;
-		}
-
-		$publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
-		if (!empty($publicNodeInfo)) {
-			$appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
-		}
-
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
-	}
+    const APP_ID = 'settings';
+
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams=[]){
+        parent::__construct(self::APP_ID, $urlParams);
+
+        $container = $this->getContainer();
+
+        // Register Middleware
+        $container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $container->registerMiddleWare('SubadminMiddleware');
+
+        /**
+         * Core class wrappers
+         */
+        /** FIXME: Remove once OC_User is non-static and mockable */
+        $container->registerService('isAdmin', function() {
+            return \OC_User::isAdminUser(\OC_User::getUser());
+        });
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+        $container->registerService('isSubAdmin', function(IContainer $c) {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $container->registerService('userCertificateManager', function(IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager();
+        }, false);
+        $container->registerService('systemCertificateManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager(null);
+        }, false);
+        $container->registerService(IProvider::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->query(IProvider::class);
+        });
+        $container->registerService(IManager::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->getSettingsManager();
+        });
+
+        $container->registerService(NewUserMailHelper::class, function (IContainer $c) {
+            /** @var Server $server */
+            $server = $c->query('ServerContainer');
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
+
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+
+        /** @var EventDispatcherInterface $eventDispatcher */
+        $eventDispatcher = $container->getServer()->getEventDispatcher();
+        $eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
+            if (($token = $event->getSubject()) instanceof IToken) {
+                /** @var IActivityManager $activityManager */
+                $activityManager = $container->query(IActivityManager::class);
+                /** @var ILogger $logger */
+                $logger = $container->query(ILogger::class);
+
+                $activity = $activityManager->generateEvent();
+                $activity->setApp('settings')
+                    ->setType('security')
+                    ->setAffectedUser($token->getUID())
+                    ->setAuthor($token->getUID())
+                    ->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $token->getName()])
+                    ->setObject('app_token', $token->getId());
+
+                try {
+                    $activityManager->publish($activity);
+                } catch (BadMethodCallException $e) {
+                    $logger->logException($e, ['message' => 'could not publish activity', 'level' => ILogger::WARN]);
+                }
+            }
+        });
+    }
+
+    public function register() {
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+
+        $groupManager = $this->getContainer()->getServer()->getGroupManager();
+        $groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
+        $groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
+
+        Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
+    }
+
+    public function addUserToGroup(IGroup $group, IUser $user): void {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->addUserToGroup($group, $user);
+
+    }
+
+    public function removeUserFromGroup(IGroup $group, IUser $user): void {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->removeUserFromGroup($group, $user);
+    }
+
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
+
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
+
+    /**
+     * @param array $settings
+     */
+    public function extendJsConfig(array $settings) {
+        $appConfig = json_decode($settings['array']['oc_appconfig'], true);
+
+        $publicWebFinger = \OC::$server->getConfig()->getAppValue('core', 'public_webfinger', '');
+        if (!empty($publicWebFinger)) {
+            $appConfig['core']['public_webfinger'] = $publicWebFinger;
+        }
+
+        $publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
+        if (!empty($publicNodeInfo)) {
+            $appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
+        }
+
+        $settings['array']['oc_appconfig'] = json_encode($appConfig);
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @param array $urlParams
 	 */
-	public function __construct(array $urlParams=[]){
+	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 
 		$container = $this->getContainer();
@@ -80,7 +80,7 @@ 
 		$container->registerService('isSubAdmin', function(IContainer $c) {
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
-			if($userObject !== null) {
+			if ($userObject !== null) {
 				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 			}
 			return $isSubAdmin;
@@ -88,17 +88,17 @@ 
 		$container->registerService('userCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager();
 		}, false);
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
+		$container->registerService('systemCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager(null);
 		}, false);
-		$container->registerService(IProvider::class, function (IContainer $c) {
+		$container->registerService(IProvider::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->query(IProvider::class);
 		});
-		$container->registerService(IManager::class, function (IContainer $c) {
+		$container->registerService(IManager::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->getSettingsManager();
 		});
 
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
+		$container->registerService(NewUserMailHelper::class, function(IContainer $c) {
 			/** @var Server $server */
 			$server = $c->query('ServerContainer');
 			/** @var Defaults $defaults */
@@ -119,7 +119,7 @@ 
 
 		/** @var EventDispatcherInterface $eventDispatcher */
 		$eventDispatcher = $container->getServer()->getEventDispatcher();
-		$eventDispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) {
+		$eventDispatcher->addListener('app_password_created', function(GenericEvent $event) use ($container) {
 			if (($token = $event->getSubject()) instanceof IToken) {
 				/** @var IActivityManager $activityManager */
 				$activityManager = $container->query(IActivityManager::class);
@@ -148,8 +148,8 @@ 
 		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
 
 		$groupManager = $this->getContainer()->getServer()->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$this, 'removeUserFromGroup']);
-		$groupManager->listen('\OC\Group', 'postAddUser',  [$this, 'addUserToGroup']);
+		$groupManager->listen('\OC\Group', 'postRemoveUser', [$this, 'removeUserFromGroup']);
+		$groupManager->listen('\OC\Group', 'postAddUser', [$this, 'addUserToGroup']);
 
 		Util::connectHook('\OCP\Config', 'js', $this, 'extendJsConfig');
 	}

apps/settings/lib/Controller/WebAuthnController.php

Indentation +74 added lines, -74 removed lines

@@ -37,78 +37,78 @@
 
 class WebAuthnController extends Controller {
 
-	private const WEBAUTHN_REGISTRATION = 'webauthn_registration';
-
-	/** @var Manager */
-	private $manager;
-
-	/** @var IUserSession */
-	private $userSession;
-	/**
-	 * @var ISession
-	 */
-	private $session;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-
-	public function __construct(IRequest $request, ILogger $logger, Manager $webAuthnManager, IUserSession $userSession, ISession $session) {
-		parent::__construct(Application::APP_ID, $request);
-
-		$this->manager = $webAuthnManager;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 * @UseSession
-	 * @NoCSRFRequired
-	 */
-	public function startRegistration(): JSONResponse {
-		$this->logger->debug('Starting WebAuthn registration');
-
-		$credentialOptions = $this->manager->startRegistration($this->userSession->getUser(), $this->request->getServerHost());
-
-		// Set this in the session since we need it on finish
-		$this->session->set(self::WEBAUTHN_REGISTRATION, $credentialOptions);
-
-		return new JSONResponse($credentialOptions);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 * @UseSession
-	 */
-	public function finishRegistration(string $name, string $data): JSONResponse {
-		$this->logger->debug('Finishing WebAuthn registration');
-
-		if (!$this->session->exists(self::WEBAUTHN_REGISTRATION)) {
-			$this->logger->debug('Trying to finish WebAuthn registration without session data');
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		// Obtain the publicKeyCredentialOptions from when we started the registration
-		$publicKeyCredentialCreationOptions = PublicKeyCredentialCreationOptions::createFromArray($this->session->get(self::WEBAUTHN_REGISTRATION));
-
-		$this->session->remove(self::WEBAUTHN_REGISTRATION);
-
-		return new JSONResponse($this->manager->finishRegister($publicKeyCredentialCreationOptions, $name, $data));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 */
-	public function deleteRegistration(int $id): JSONResponse {
-		$this->logger->debug('Finishing WebAuthn registration');
-
-		$this->manager->deleteRegistration($this->userSession->getUser(), $id);
-
-		return new JSONResponse([]);
-	}
+    private const WEBAUTHN_REGISTRATION = 'webauthn_registration';
+
+    /** @var Manager */
+    private $manager;
+
+    /** @var IUserSession */
+    private $userSession;
+    /**
+     * @var ISession
+     */
+    private $session;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    public function __construct(IRequest $request, ILogger $logger, Manager $webAuthnManager, IUserSession $userSession, ISession $session) {
+        parent::__construct(Application::APP_ID, $request);
+
+        $this->manager = $webAuthnManager;
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     * @UseSession
+     * @NoCSRFRequired
+     */
+    public function startRegistration(): JSONResponse {
+        $this->logger->debug('Starting WebAuthn registration');
+
+        $credentialOptions = $this->manager->startRegistration($this->userSession->getUser(), $this->request->getServerHost());
+
+        // Set this in the session since we need it on finish
+        $this->session->set(self::WEBAUTHN_REGISTRATION, $credentialOptions);
+
+        return new JSONResponse($credentialOptions);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     * @UseSession
+     */
+    public function finishRegistration(string $name, string $data): JSONResponse {
+        $this->logger->debug('Finishing WebAuthn registration');
+
+        if (!$this->session->exists(self::WEBAUTHN_REGISTRATION)) {
+            $this->logger->debug('Trying to finish WebAuthn registration without session data');
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        // Obtain the publicKeyCredentialOptions from when we started the registration
+        $publicKeyCredentialCreationOptions = PublicKeyCredentialCreationOptions::createFromArray($this->session->get(self::WEBAUTHN_REGISTRATION));
+
+        $this->session->remove(self::WEBAUTHN_REGISTRATION);
+
+        return new JSONResponse($this->manager->finishRegister($publicKeyCredentialCreationOptions, $name, $data));
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     */
+    public function deleteRegistration(int $id): JSONResponse {
+        $this->logger->debug('Finishing WebAuthn registration');
+
+        $this->manager->deleteRegistration($this->userSession->getUser(), $id);
+
+        return new JSONResponse([]);
+    }
 }

apps/settings/composer/composer/autoload_classmap.php

Spacing +47 added lines, -47 removed lines

@@ -6,51 +6,51 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Settings\\Activity\\GroupProvider' => $baseDir . '/../lib/Activity/GroupProvider.php',
-    'OCA\\Settings\\Activity\\GroupSetting' => $baseDir . '/../lib/Activity/GroupSetting.php',
-    'OCA\\Settings\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Settings\\Activity\\SecurityFilter' => $baseDir . '/../lib/Activity/SecurityFilter.php',
-    'OCA\\Settings\\Activity\\SecurityProvider' => $baseDir . '/../lib/Activity/SecurityProvider.php',
-    'OCA\\Settings\\Activity\\SecuritySetting' => $baseDir . '/../lib/Activity/SecuritySetting.php',
-    'OCA\\Settings\\Activity\\Setting' => $baseDir . '/../lib/Activity/Setting.php',
-    'OCA\\Settings\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Settings\\BackgroundJobs\\VerifyUserData' => $baseDir . '/../lib/BackgroundJobs/VerifyUserData.php',
-    'OCA\\Settings\\Controller\\AdminSettingsController' => $baseDir . '/../lib/Controller/AdminSettingsController.php',
-    'OCA\\Settings\\Controller\\AppSettingsController' => $baseDir . '/../lib/Controller/AppSettingsController.php',
-    'OCA\\Settings\\Controller\\AuthSettingsController' => $baseDir . '/../lib/Controller/AuthSettingsController.php',
-    'OCA\\Settings\\Controller\\CertificateController' => $baseDir . '/../lib/Controller/CertificateController.php',
-    'OCA\\Settings\\Controller\\ChangePasswordController' => $baseDir . '/../lib/Controller/ChangePasswordController.php',
-    'OCA\\Settings\\Controller\\CheckSetupController' => $baseDir . '/../lib/Controller/CheckSetupController.php',
-    'OCA\\Settings\\Controller\\CommonSettingsTrait' => $baseDir . '/../lib/Controller/CommonSettingsTrait.php',
-    'OCA\\Settings\\Controller\\HelpController' => $baseDir . '/../lib/Controller/HelpController.php',
-    'OCA\\Settings\\Controller\\LogSettingsController' => $baseDir . '/../lib/Controller/LogSettingsController.php',
-    'OCA\\Settings\\Controller\\MailSettingsController' => $baseDir . '/../lib/Controller/MailSettingsController.php',
-    'OCA\\Settings\\Controller\\PersonalSettingsController' => $baseDir . '/../lib/Controller/PersonalSettingsController.php',
-    'OCA\\Settings\\Controller\\TwoFactorSettingsController' => $baseDir . '/../lib/Controller/TwoFactorSettingsController.php',
-    'OCA\\Settings\\Controller\\UsersController' => $baseDir . '/../lib/Controller/UsersController.php',
-    'OCA\\Settings\\Controller\\WebAuthnController' => $baseDir . '/../lib/Controller/WebAuthnController.php',
-    'OCA\\Settings\\Hooks' => $baseDir . '/../lib/Hooks.php',
-    'OCA\\Settings\\Mailer\\NewUserMailHelper' => $baseDir . '/../lib/Mailer/NewUserMailHelper.php',
-    'OCA\\Settings\\Middleware\\SubadminMiddleware' => $baseDir . '/../lib/Middleware/SubadminMiddleware.php',
-    'OCA\\Settings\\Sections\\Admin\\Additional' => $baseDir . '/../lib/Sections/Admin/Additional.php',
-    'OCA\\Settings\\Sections\\Admin\\Groupware' => $baseDir . '/../lib/Sections/Admin/Groupware.php',
-    'OCA\\Settings\\Sections\\Admin\\Overview' => $baseDir . '/../lib/Sections/Admin/Overview.php',
-    'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir . '/../lib/Sections/Admin/Security.php',
-    'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir . '/../lib/Sections/Admin/Server.php',
-    'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir . '/../lib/Sections/Admin/Sharing.php',
-    'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir . '/../lib/Sections/Personal/PersonalInfo.php',
-    'OCA\\Settings\\Sections\\Personal\\Security' => $baseDir . '/../lib/Sections/Personal/Security.php',
-    'OCA\\Settings\\Sections\\Personal\\SyncClients' => $baseDir . '/../lib/Sections/Personal/SyncClients.php',
-    'OCA\\Settings\\Settings\\Admin\\Mail' => $baseDir . '/../lib/Settings/Admin/Mail.php',
-    'OCA\\Settings\\Settings\\Admin\\Overview' => $baseDir . '/../lib/Settings/Admin/Overview.php',
-    'OCA\\Settings\\Settings\\Admin\\Security' => $baseDir . '/../lib/Settings/Admin/Security.php',
-    'OCA\\Settings\\Settings\\Admin\\Server' => $baseDir . '/../lib/Settings/Admin/Server.php',
-    'OCA\\Settings\\Settings\\Admin\\Sharing' => $baseDir . '/../lib/Settings/Admin/Sharing.php',
-    'OCA\\Settings\\Settings\\Personal\\Additional' => $baseDir . '/../lib/Settings/Personal/Additional.php',
-    'OCA\\Settings\\Settings\\Personal\\PersonalInfo' => $baseDir . '/../lib/Settings/Personal/PersonalInfo.php',
-    'OCA\\Settings\\Settings\\Personal\\Security\\Authtokens' => $baseDir . '/../lib/Settings/Personal/Security/Authtokens.php',
-    'OCA\\Settings\\Settings\\Personal\\Security\\Password' => $baseDir . '/../lib/Settings/Personal/Security/Password.php',
-    'OCA\\Settings\\Settings\\Personal\\Security\\TwoFactor' => $baseDir . '/../lib/Settings/Personal/Security/TwoFactor.php',
-    'OCA\\Settings\\Settings\\Personal\\Security\\WebAuthn' => $baseDir . '/../lib/Settings/Personal/Security/WebAuthn.php',
-    'OCA\\Settings\\Settings\\Personal\\ServerDevNotice' => $baseDir . '/../lib/Settings/Personal/ServerDevNotice.php',
+    'OCA\\Settings\\Activity\\GroupProvider' => $baseDir.'/../lib/Activity/GroupProvider.php',
+    'OCA\\Settings\\Activity\\GroupSetting' => $baseDir.'/../lib/Activity/GroupSetting.php',
+    'OCA\\Settings\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Settings\\Activity\\SecurityFilter' => $baseDir.'/../lib/Activity/SecurityFilter.php',
+    'OCA\\Settings\\Activity\\SecurityProvider' => $baseDir.'/../lib/Activity/SecurityProvider.php',
+    'OCA\\Settings\\Activity\\SecuritySetting' => $baseDir.'/../lib/Activity/SecuritySetting.php',
+    'OCA\\Settings\\Activity\\Setting' => $baseDir.'/../lib/Activity/Setting.php',
+    'OCA\\Settings\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Settings\\BackgroundJobs\\VerifyUserData' => $baseDir.'/../lib/BackgroundJobs/VerifyUserData.php',
+    'OCA\\Settings\\Controller\\AdminSettingsController' => $baseDir.'/../lib/Controller/AdminSettingsController.php',
+    'OCA\\Settings\\Controller\\AppSettingsController' => $baseDir.'/../lib/Controller/AppSettingsController.php',
+    'OCA\\Settings\\Controller\\AuthSettingsController' => $baseDir.'/../lib/Controller/AuthSettingsController.php',
+    'OCA\\Settings\\Controller\\CertificateController' => $baseDir.'/../lib/Controller/CertificateController.php',
+    'OCA\\Settings\\Controller\\ChangePasswordController' => $baseDir.'/../lib/Controller/ChangePasswordController.php',
+    'OCA\\Settings\\Controller\\CheckSetupController' => $baseDir.'/../lib/Controller/CheckSetupController.php',
+    'OCA\\Settings\\Controller\\CommonSettingsTrait' => $baseDir.'/../lib/Controller/CommonSettingsTrait.php',
+    'OCA\\Settings\\Controller\\HelpController' => $baseDir.'/../lib/Controller/HelpController.php',
+    'OCA\\Settings\\Controller\\LogSettingsController' => $baseDir.'/../lib/Controller/LogSettingsController.php',
+    'OCA\\Settings\\Controller\\MailSettingsController' => $baseDir.'/../lib/Controller/MailSettingsController.php',
+    'OCA\\Settings\\Controller\\PersonalSettingsController' => $baseDir.'/../lib/Controller/PersonalSettingsController.php',
+    'OCA\\Settings\\Controller\\TwoFactorSettingsController' => $baseDir.'/../lib/Controller/TwoFactorSettingsController.php',
+    'OCA\\Settings\\Controller\\UsersController' => $baseDir.'/../lib/Controller/UsersController.php',
+    'OCA\\Settings\\Controller\\WebAuthnController' => $baseDir.'/../lib/Controller/WebAuthnController.php',
+    'OCA\\Settings\\Hooks' => $baseDir.'/../lib/Hooks.php',
+    'OCA\\Settings\\Mailer\\NewUserMailHelper' => $baseDir.'/../lib/Mailer/NewUserMailHelper.php',
+    'OCA\\Settings\\Middleware\\SubadminMiddleware' => $baseDir.'/../lib/Middleware/SubadminMiddleware.php',
+    'OCA\\Settings\\Sections\\Admin\\Additional' => $baseDir.'/../lib/Sections/Admin/Additional.php',
+    'OCA\\Settings\\Sections\\Admin\\Groupware' => $baseDir.'/../lib/Sections/Admin/Groupware.php',
+    'OCA\\Settings\\Sections\\Admin\\Overview' => $baseDir.'/../lib/Sections/Admin/Overview.php',
+    'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir.'/../lib/Sections/Admin/Security.php',
+    'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir.'/../lib/Sections/Admin/Server.php',
+    'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir.'/../lib/Sections/Admin/Sharing.php',
+    'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir.'/../lib/Sections/Personal/PersonalInfo.php',
+    'OCA\\Settings\\Sections\\Personal\\Security' => $baseDir.'/../lib/Sections/Personal/Security.php',
+    'OCA\\Settings\\Sections\\Personal\\SyncClients' => $baseDir.'/../lib/Sections/Personal/SyncClients.php',
+    'OCA\\Settings\\Settings\\Admin\\Mail' => $baseDir.'/../lib/Settings/Admin/Mail.php',
+    'OCA\\Settings\\Settings\\Admin\\Overview' => $baseDir.'/../lib/Settings/Admin/Overview.php',
+    'OCA\\Settings\\Settings\\Admin\\Security' => $baseDir.'/../lib/Settings/Admin/Security.php',
+    'OCA\\Settings\\Settings\\Admin\\Server' => $baseDir.'/../lib/Settings/Admin/Server.php',
+    'OCA\\Settings\\Settings\\Admin\\Sharing' => $baseDir.'/../lib/Settings/Admin/Sharing.php',
+    'OCA\\Settings\\Settings\\Personal\\Additional' => $baseDir.'/../lib/Settings/Personal/Additional.php',
+    'OCA\\Settings\\Settings\\Personal\\PersonalInfo' => $baseDir.'/../lib/Settings/Personal/PersonalInfo.php',
+    'OCA\\Settings\\Settings\\Personal\\Security\\Authtokens' => $baseDir.'/../lib/Settings/Personal/Security/Authtokens.php',
+    'OCA\\Settings\\Settings\\Personal\\Security\\Password' => $baseDir.'/../lib/Settings/Personal/Security/Password.php',
+    'OCA\\Settings\\Settings\\Personal\\Security\\TwoFactor' => $baseDir.'/../lib/Settings/Personal/Security/TwoFactor.php',
+    'OCA\\Settings\\Settings\\Personal\\Security\\WebAuthn' => $baseDir.'/../lib/Settings/Personal/Security/WebAuthn.php',
+    'OCA\\Settings\\Settings\\Personal\\ServerDevNotice' => $baseDir.'/../lib/Settings/Personal/ServerDevNotice.php',
 );

apps/settings/composer/composer/autoload_static.php

Spacing +54 added lines, -54 removed lines

@@ -6,73 +6,73 @@
 
 class ComposerStaticInitSettings
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Settings\\' => 13,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Settings\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Settings\\Activity\\GroupProvider' => __DIR__ . '/..' . '/../lib/Activity/GroupProvider.php',
-        'OCA\\Settings\\Activity\\GroupSetting' => __DIR__ . '/..' . '/../lib/Activity/GroupSetting.php',
-        'OCA\\Settings\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Settings\\Activity\\SecurityFilter' => __DIR__ . '/..' . '/../lib/Activity/SecurityFilter.php',
-        'OCA\\Settings\\Activity\\SecurityProvider' => __DIR__ . '/..' . '/../lib/Activity/SecurityProvider.php',
-        'OCA\\Settings\\Activity\\SecuritySetting' => __DIR__ . '/..' . '/../lib/Activity/SecuritySetting.php',
-        'OCA\\Settings\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/Activity/Setting.php',
-        'OCA\\Settings\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Settings\\BackgroundJobs\\VerifyUserData' => __DIR__ . '/..' . '/../lib/BackgroundJobs/VerifyUserData.php',
-        'OCA\\Settings\\Controller\\AdminSettingsController' => __DIR__ . '/..' . '/../lib/Controller/AdminSettingsController.php',
-        'OCA\\Settings\\Controller\\AppSettingsController' => __DIR__ . '/..' . '/../lib/Controller/AppSettingsController.php',
-        'OCA\\Settings\\Controller\\AuthSettingsController' => __DIR__ . '/..' . '/../lib/Controller/AuthSettingsController.php',
-        'OCA\\Settings\\Controller\\CertificateController' => __DIR__ . '/..' . '/../lib/Controller/CertificateController.php',
-        'OCA\\Settings\\Controller\\ChangePasswordController' => __DIR__ . '/..' . '/../lib/Controller/ChangePasswordController.php',
-        'OCA\\Settings\\Controller\\CheckSetupController' => __DIR__ . '/..' . '/../lib/Controller/CheckSetupController.php',
-        'OCA\\Settings\\Controller\\CommonSettingsTrait' => __DIR__ . '/..' . '/../lib/Controller/CommonSettingsTrait.php',
-        'OCA\\Settings\\Controller\\HelpController' => __DIR__ . '/..' . '/../lib/Controller/HelpController.php',
-        'OCA\\Settings\\Controller\\LogSettingsController' => __DIR__ . '/..' . '/../lib/Controller/LogSettingsController.php',
-        'OCA\\Settings\\Controller\\MailSettingsController' => __DIR__ . '/..' . '/../lib/Controller/MailSettingsController.php',
-        'OCA\\Settings\\Controller\\PersonalSettingsController' => __DIR__ . '/..' . '/../lib/Controller/PersonalSettingsController.php',
-        'OCA\\Settings\\Controller\\TwoFactorSettingsController' => __DIR__ . '/..' . '/../lib/Controller/TwoFactorSettingsController.php',
-        'OCA\\Settings\\Controller\\UsersController' => __DIR__ . '/..' . '/../lib/Controller/UsersController.php',
-        'OCA\\Settings\\Controller\\WebAuthnController' => __DIR__ . '/..' . '/../lib/Controller/WebAuthnController.php',
-        'OCA\\Settings\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
-        'OCA\\Settings\\Mailer\\NewUserMailHelper' => __DIR__ . '/..' . '/../lib/Mailer/NewUserMailHelper.php',
-        'OCA\\Settings\\Middleware\\SubadminMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/SubadminMiddleware.php',
-        'OCA\\Settings\\Sections\\Admin\\Additional' => __DIR__ . '/..' . '/../lib/Sections/Admin/Additional.php',
-        'OCA\\Settings\\Sections\\Admin\\Groupware' => __DIR__ . '/..' . '/../lib/Sections/Admin/Groupware.php',
-        'OCA\\Settings\\Sections\\Admin\\Overview' => __DIR__ . '/..' . '/../lib/Sections/Admin/Overview.php',
-        'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Sections/Admin/Security.php',
-        'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Sections/Admin/Server.php',
-        'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Sections/Admin/Sharing.php',
-        'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Sections/Personal/PersonalInfo.php',
-        'OCA\\Settings\\Sections\\Personal\\Security' => __DIR__ . '/..' . '/../lib/Sections/Personal/Security.php',
-        'OCA\\Settings\\Sections\\Personal\\SyncClients' => __DIR__ . '/..' . '/../lib/Sections/Personal/SyncClients.php',
-        'OCA\\Settings\\Settings\\Admin\\Mail' => __DIR__ . '/..' . '/../lib/Settings/Admin/Mail.php',
-        'OCA\\Settings\\Settings\\Admin\\Overview' => __DIR__ . '/..' . '/../lib/Settings/Admin/Overview.php',
-        'OCA\\Settings\\Settings\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Settings/Admin/Security.php',
-        'OCA\\Settings\\Settings\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Settings/Admin/Server.php',
-        'OCA\\Settings\\Settings\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Settings/Admin/Sharing.php',
-        'OCA\\Settings\\Settings\\Personal\\Additional' => __DIR__ . '/..' . '/../lib/Settings/Personal/Additional.php',
-        'OCA\\Settings\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Settings/Personal/PersonalInfo.php',
-        'OCA\\Settings\\Settings\\Personal\\Security\\Authtokens' => __DIR__ . '/..' . '/../lib/Settings/Personal/Security/Authtokens.php',
-        'OCA\\Settings\\Settings\\Personal\\Security\\Password' => __DIR__ . '/..' . '/../lib/Settings/Personal/Security/Password.php',
-        'OCA\\Settings\\Settings\\Personal\\Security\\TwoFactor' => __DIR__ . '/..' . '/../lib/Settings/Personal/Security/TwoFactor.php',
-        'OCA\\Settings\\Settings\\Personal\\Security\\WebAuthn' => __DIR__ . '/..' . '/../lib/Settings/Personal/Security/WebAuthn.php',
-        'OCA\\Settings\\Settings\\Personal\\ServerDevNotice' => __DIR__ . '/..' . '/../lib/Settings/Personal/ServerDevNotice.php',
+    public static $classMap = array(
+        'OCA\\Settings\\Activity\\GroupProvider' => __DIR__.'/..'.'/../lib/Activity/GroupProvider.php',
+        'OCA\\Settings\\Activity\\GroupSetting' => __DIR__.'/..'.'/../lib/Activity/GroupSetting.php',
+        'OCA\\Settings\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Settings\\Activity\\SecurityFilter' => __DIR__.'/..'.'/../lib/Activity/SecurityFilter.php',
+        'OCA\\Settings\\Activity\\SecurityProvider' => __DIR__.'/..'.'/../lib/Activity/SecurityProvider.php',
+        'OCA\\Settings\\Activity\\SecuritySetting' => __DIR__.'/..'.'/../lib/Activity/SecuritySetting.php',
+        'OCA\\Settings\\Activity\\Setting' => __DIR__.'/..'.'/../lib/Activity/Setting.php',
+        'OCA\\Settings\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Settings\\BackgroundJobs\\VerifyUserData' => __DIR__.'/..'.'/../lib/BackgroundJobs/VerifyUserData.php',
+        'OCA\\Settings\\Controller\\AdminSettingsController' => __DIR__.'/..'.'/../lib/Controller/AdminSettingsController.php',
+        'OCA\\Settings\\Controller\\AppSettingsController' => __DIR__.'/..'.'/../lib/Controller/AppSettingsController.php',
+        'OCA\\Settings\\Controller\\AuthSettingsController' => __DIR__.'/..'.'/../lib/Controller/AuthSettingsController.php',
+        'OCA\\Settings\\Controller\\CertificateController' => __DIR__.'/..'.'/../lib/Controller/CertificateController.php',
+        'OCA\\Settings\\Controller\\ChangePasswordController' => __DIR__.'/..'.'/../lib/Controller/ChangePasswordController.php',
+        'OCA\\Settings\\Controller\\CheckSetupController' => __DIR__.'/..'.'/../lib/Controller/CheckSetupController.php',
+        'OCA\\Settings\\Controller\\CommonSettingsTrait' => __DIR__.'/..'.'/../lib/Controller/CommonSettingsTrait.php',
+        'OCA\\Settings\\Controller\\HelpController' => __DIR__.'/..'.'/../lib/Controller/HelpController.php',
+        'OCA\\Settings\\Controller\\LogSettingsController' => __DIR__.'/..'.'/../lib/Controller/LogSettingsController.php',
+        'OCA\\Settings\\Controller\\MailSettingsController' => __DIR__.'/..'.'/../lib/Controller/MailSettingsController.php',
+        'OCA\\Settings\\Controller\\PersonalSettingsController' => __DIR__.'/..'.'/../lib/Controller/PersonalSettingsController.php',
+        'OCA\\Settings\\Controller\\TwoFactorSettingsController' => __DIR__.'/..'.'/../lib/Controller/TwoFactorSettingsController.php',
+        'OCA\\Settings\\Controller\\UsersController' => __DIR__.'/..'.'/../lib/Controller/UsersController.php',
+        'OCA\\Settings\\Controller\\WebAuthnController' => __DIR__.'/..'.'/../lib/Controller/WebAuthnController.php',
+        'OCA\\Settings\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
+        'OCA\\Settings\\Mailer\\NewUserMailHelper' => __DIR__.'/..'.'/../lib/Mailer/NewUserMailHelper.php',
+        'OCA\\Settings\\Middleware\\SubadminMiddleware' => __DIR__.'/..'.'/../lib/Middleware/SubadminMiddleware.php',
+        'OCA\\Settings\\Sections\\Admin\\Additional' => __DIR__.'/..'.'/../lib/Sections/Admin/Additional.php',
+        'OCA\\Settings\\Sections\\Admin\\Groupware' => __DIR__.'/..'.'/../lib/Sections/Admin/Groupware.php',
+        'OCA\\Settings\\Sections\\Admin\\Overview' => __DIR__.'/..'.'/../lib/Sections/Admin/Overview.php',
+        'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__.'/..'.'/../lib/Sections/Admin/Security.php',
+        'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__.'/..'.'/../lib/Sections/Admin/Server.php',
+        'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__.'/..'.'/../lib/Sections/Admin/Sharing.php',
+        'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__.'/..'.'/../lib/Sections/Personal/PersonalInfo.php',
+        'OCA\\Settings\\Sections\\Personal\\Security' => __DIR__.'/..'.'/../lib/Sections/Personal/Security.php',
+        'OCA\\Settings\\Sections\\Personal\\SyncClients' => __DIR__.'/..'.'/../lib/Sections/Personal/SyncClients.php',
+        'OCA\\Settings\\Settings\\Admin\\Mail' => __DIR__.'/..'.'/../lib/Settings/Admin/Mail.php',
+        'OCA\\Settings\\Settings\\Admin\\Overview' => __DIR__.'/..'.'/../lib/Settings/Admin/Overview.php',
+        'OCA\\Settings\\Settings\\Admin\\Security' => __DIR__.'/..'.'/../lib/Settings/Admin/Security.php',
+        'OCA\\Settings\\Settings\\Admin\\Server' => __DIR__.'/..'.'/../lib/Settings/Admin/Server.php',
+        'OCA\\Settings\\Settings\\Admin\\Sharing' => __DIR__.'/..'.'/../lib/Settings/Admin/Sharing.php',
+        'OCA\\Settings\\Settings\\Personal\\Additional' => __DIR__.'/..'.'/../lib/Settings/Personal/Additional.php',
+        'OCA\\Settings\\Settings\\Personal\\PersonalInfo' => __DIR__.'/..'.'/../lib/Settings/Personal/PersonalInfo.php',
+        'OCA\\Settings\\Settings\\Personal\\Security\\Authtokens' => __DIR__.'/..'.'/../lib/Settings/Personal/Security/Authtokens.php',
+        'OCA\\Settings\\Settings\\Personal\\Security\\Password' => __DIR__.'/..'.'/../lib/Settings/Personal/Security/Password.php',
+        'OCA\\Settings\\Settings\\Personal\\Security\\TwoFactor' => __DIR__.'/..'.'/../lib/Settings/Personal/Security/TwoFactor.php',
+        'OCA\\Settings\\Settings\\Personal\\Security\\WebAuthn' => __DIR__.'/..'.'/../lib/Settings/Personal/Security/WebAuthn.php',
+        'OCA\\Settings\\Settings\\Personal\\ServerDevNotice' => __DIR__.'/..'.'/../lib/Settings/Personal/ServerDevNotice.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitSettings::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitSettings::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitSettings::$classMap;

lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php

Indentation +50 added lines, -50 removed lines

@@ -32,55 +32,55 @@
 
 class PublicKeyCredentialMapper extends QBMapper {
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class);
-	}
-
-	public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId)))
-			);
-
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @return PublicKeyCredentialEntity[]
-	 */
-	public function findAllForUid(string $uid): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('uid', $qb->createNamedParameter($uid))
-			);
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param string $uid
-	 * @param int $id
-	 *
-	 * @return PublicKeyCredentialEntity
-	 * @throws DoesNotExistException
-	 */
-	public function findById(string $uid, int $id): PublicKeyCredentialEntity {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->andX(
-				$qb->expr()->eq('id', $qb->createNamedParameter($id)),
-				$qb->expr()->eq('uid', $qb->createNamedParameter($uid))
-			));
-
-		return $this->findEntity($qb);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class);
+    }
+
+    public function findOneByCredentialId(string $publicKeyCredentialId): PublicKeyCredentialEntity {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('public_key_credential_id', $qb->createNamedParameter(base64_encode($publicKeyCredentialId)))
+            );
+
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @return PublicKeyCredentialEntity[]
+     */
+    public function findAllForUid(string $uid): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('uid', $qb->createNamedParameter($uid))
+            );
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param string $uid
+     * @param int $id
+     *
+     * @return PublicKeyCredentialEntity
+     * @throws DoesNotExistException
+     */
+    public function findById(string $uid, int $id): PublicKeyCredentialEntity {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->andX(
+                $qb->expr()->eq('id', $qb->createNamedParameter($id)),
+                $qb->expr()->eq('uid', $qb->createNamedParameter($uid))
+            ));
+
+        return $this->findEntity($qb);
+    }
 
 }

lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php

Indentation +36 added lines, -36 removed lines

@@ -43,50 +43,50 @@
  */
 class PublicKeyCredentialEntity extends Entity implements JsonSerializable {
 
-	/** @var string */
-	protected $name;
+    /** @var string */
+    protected $name;
 
-	/** @var string */
-	protected $uid;
+    /** @var string */
+    protected $uid;
 
-	/** @var string */
-	protected $publicKeyCredentialId;
+    /** @var string */
+    protected $publicKeyCredentialId;
 
-	/** @var string */
-	protected $data;
+    /** @var string */
+    protected $data;
 
-	public function __construct() {
-		$this->addType('name', 'string');
-		$this->addType('uid', 'string');
-		$this->addType('publicKeyCredentialId', 'string');
-		$this->addType('data', 'string');
-	}
+    public function __construct() {
+        $this->addType('name', 'string');
+        $this->addType('uid', 'string');
+        $this->addType('publicKeyCredentialId', 'string');
+        $this->addType('data', 'string');
+    }
 
-	static function fromPublicKeyCrendentialSource(string $name, PublicKeyCredentialSource $publicKeyCredentialSource): PublicKeyCredentialEntity {
-		$publicKeyCredentialEntity = new self();
+    static function fromPublicKeyCrendentialSource(string $name, PublicKeyCredentialSource $publicKeyCredentialSource): PublicKeyCredentialEntity {
+        $publicKeyCredentialEntity = new self();
 
-		$publicKeyCredentialEntity->setName($name);
-		$publicKeyCredentialEntity->setUid($publicKeyCredentialSource->getUserHandle());
-		$publicKeyCredentialEntity->setPublicKeyCredentialId(base64_encode($publicKeyCredentialSource->getPublicKeyCredentialId()));
-		$publicKeyCredentialEntity->setData(json_encode($publicKeyCredentialSource));
+        $publicKeyCredentialEntity->setName($name);
+        $publicKeyCredentialEntity->setUid($publicKeyCredentialSource->getUserHandle());
+        $publicKeyCredentialEntity->setPublicKeyCredentialId(base64_encode($publicKeyCredentialSource->getPublicKeyCredentialId()));
+        $publicKeyCredentialEntity->setData(json_encode($publicKeyCredentialSource));
 
-		return $publicKeyCredentialEntity;
-	}
+        return $publicKeyCredentialEntity;
+    }
 
-	function toPublicKeyCredentialSource(): PublicKeyCredentialSource {
-		return PublicKeyCredentialSource::createFromArray(
-			json_decode($this->getData(), true)
-		);
-	}
+    function toPublicKeyCredentialSource(): PublicKeyCredentialSource {
+        return PublicKeyCredentialSource::createFromArray(
+            json_decode($this->getData(), true)
+        );
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function jsonSerialize(): array {
-		return [
-			'id' => $this->getId(),
-			'name' => $this->getName(),
-		];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function jsonSerialize(): array {
+        return [
+            'id' => $this->getId(),
+            'name' => $this->getName(),
+        ];
+    }
 
 }