nextcloud / server

lib/private/Authentication/TwoFactorAuth/Registry.php

Indentation +25 added lines, -25 removed lines

@@ -36,37 +36,37 @@
 
 class Registry implements IRegistry {
 
-	/** @var ProviderUserAssignmentDao */
-	private $assignmentDao;
+    /** @var ProviderUserAssignmentDao */
+    private $assignmentDao;
 
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
-	public function __construct(ProviderUserAssignmentDao $assignmentDao,
-								EventDispatcherInterface $dispatcher) {
-		$this->assignmentDao = $assignmentDao;
-		$this->dispatcher = $dispatcher;
-	}
+    public function __construct(ProviderUserAssignmentDao $assignmentDao,
+                                EventDispatcherInterface $dispatcher) {
+        $this->assignmentDao = $assignmentDao;
+        $this->dispatcher = $dispatcher;
+    }
 
-	public function getProviderStates(IUser $user): array {
-		return $this->assignmentDao->getState($user->getUID());
-	}
+    public function getProviderStates(IUser $user): array {
+        return $this->assignmentDao->getState($user->getUID());
+    }
 
-	public function enableProviderFor(IProvider $provider, IUser $user) {
-		$this->assignmentDao->persist($provider->getId(), $user->getUID(), 1);
+    public function enableProviderFor(IProvider $provider, IUser $user) {
+        $this->assignmentDao->persist($provider->getId(), $user->getUID(), 1);
 
-		$event = new RegistryEvent($provider, $user);
-		$this->dispatcher->dispatch(self::EVENT_PROVIDER_ENABLED, $event);
-	}
+        $event = new RegistryEvent($provider, $user);
+        $this->dispatcher->dispatch(self::EVENT_PROVIDER_ENABLED, $event);
+    }
 
-	public function disableProviderFor(IProvider $provider, IUser $user) {
-		$this->assignmentDao->persist($provider->getId(), $user->getUID(), 0);
+    public function disableProviderFor(IProvider $provider, IUser $user) {
+        $this->assignmentDao->persist($provider->getId(), $user->getUID(), 0);
 
-		$event = new RegistryEvent($provider, $user);
-		$this->dispatcher->dispatch(self::EVENT_PROVIDER_DISABLED, $event);
-	}
+        $event = new RegistryEvent($provider, $user);
+        $this->dispatcher->dispatch(self::EVENT_PROVIDER_DISABLED, $event);
+    }
 
-	public function cleanUp(string $providerId) {
-		$this->assignmentDao->deleteAll($providerId);
-	}
+    public function cleanUp(string $providerId) {
+        $this->assignmentDao->deleteAll($providerId);
+    }
 }

lib/public/Authentication/TwoFactorAuth/IRegistry.php

Indentation +36 added lines, -36 removed lines

@@ -40,45 +40,45 @@
 interface IRegistry {
 
 
-	const EVENT_PROVIDER_ENABLED = self::class . '::enable';
-	const EVENT_PROVIDER_DISABLED = self::class . '::disable';
+    const EVENT_PROVIDER_ENABLED = self::class . '::enable';
+    const EVENT_PROVIDER_DISABLED = self::class . '::disable';
 
-	/**
-	 * Get a key-value map of providers and their enabled/disabled state for
-	 * the given user.
-	 *
-	 * @since 14.0.0
-	 * @return string[] where the array key is the provider ID (string) and the
-	 *                  value is the enabled state (bool)
-	 */
-	public function getProviderStates(IUser $user): array;
+    /**
+     * Get a key-value map of providers and their enabled/disabled state for
+     * the given user.
+     *
+     * @since 14.0.0
+     * @return string[] where the array key is the provider ID (string) and the
+     *                  value is the enabled state (bool)
+     */
+    public function getProviderStates(IUser $user): array;
 
-	/**
-	 * Enable the given 2FA provider for the given user
-	 *
-	 * @since 14.0.0
-	 */
-	public function enableProviderFor(IProvider $provider, IUser $user);
+    /**
+     * Enable the given 2FA provider for the given user
+     *
+     * @since 14.0.0
+     */
+    public function enableProviderFor(IProvider $provider, IUser $user);
 
-	/**
-	 * Disable the given 2FA provider for the given user
-	 *
-	 * @since 14.0.0
-	 */
-	public function disableProviderFor(IProvider $provider, IUser $user);
+    /**
+     * Disable the given 2FA provider for the given user
+     *
+     * @since 14.0.0
+     */
+    public function disableProviderFor(IProvider $provider, IUser $user);
 
-	/**
-	 * Cleans up all entries of the provider with the given id. This is only
-	 * necessary in edge-cases where an admin disabled and/or uninstalled a
-	 * provider app. Invoking this method will make sure outdated provider
-	 * associations are removed so that users can log in.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 *
-	 * @return void
-	 */
-	public function cleanUp(string $providerId);
+    /**
+     * Cleans up all entries of the provider with the given id. This is only
+     * necessary in edge-cases where an admin disabled and/or uninstalled a
+     * provider app. Invoking this method will make sure outdated provider
+     * associations are removed so that users can log in.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     *
+     * @return void
+     */
+    public function cleanUp(string $providerId);
 
 }

lib/public/Authentication/TwoFactorAuth/RegistryEvent.php

Indentation +27 added lines, -27 removed lines

@@ -32,31 +32,31 @@
  */
 class RegistryEvent extends Event {
 
-	/** @var IProvider */
-	private $provider;
-
-	/** @IUser */
-	private $user;
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function __construct(IProvider $provider, IUser $user) {
-		$this->provider = $provider;
-		$this->user = $user;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function getProvider(): IProvider {
-		return $this->provider;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function getUser(): IUser {
-		return $this->user;
-	}
+    /** @var IProvider */
+    private $provider;
+
+    /** @IUser */
+    private $user;
+
+    /**
+     * @since 15.0.0
+     */
+    public function __construct(IProvider $provider, IUser $user) {
+        $this->provider = $provider;
+        $this->user = $user;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function getProvider(): IProvider {
+        return $this->provider;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function getUser(): IUser {
+        return $this->user;
+    }
 }

apps/twofactor_backupcodes/lib/Listener/ClearNotifications.php

Indentation +15 added lines, -15 removed lines

@@ -30,22 +30,22 @@
 
 class ClearNotifications implements IListener {
 
-	/** @var IManager */
-	private $manager;
+    /** @var IManager */
+    private $manager;
 
-	public function __construct(IManager $manager) {
-		$this->manager = $manager;
-	}
+    public function __construct(IManager $manager) {
+        $this->manager = $manager;
+    }
 
-	public function handle(Event $event) {
-		if (!($event instanceof CodesGenerated)) {
-			return;
-		}
+    public function handle(Event $event) {
+        if (!($event instanceof CodesGenerated)) {
+            return;
+        }
 
-		$notification = $this->manager->createNotification();
-		$notification->setApp('twofactor_backupcodes')
-			->setUser($event->getUser()->getUID())
-			->setObject('create', 'codes');
-		$this->manager->markProcessed($notification);
-	}
+        $notification = $this->manager->createNotification();
+        $notification->setApp('twofactor_backupcodes')
+            ->setUser($event->getUser()->getUID())
+            ->setObject('create', 'codes');
+        $this->manager->markProcessed($notification);
+    }
 }

apps/twofactor_backupcodes/lib/Listener/ProviderEnabled.php

Indentation +25 added lines, -25 removed lines

@@ -32,30 +32,30 @@
 
 class ProviderEnabled implements IListener {
 
-	/** @var IRegistry */
-	private $registry;
-
-	/** @var IJobList */
-	private $jobList;
-
-	public function __construct(IRegistry $registry,
-								IJobList $jobList) {
-		$this->registry = $registry;
-		$this->jobList = $jobList;
-	}
-
-	public function handle(Event $event) {
-		if (!($event instanceof RegistryEvent)) {
-			return;
-		}
-
-		$providers = $this->registry->getProviderStates($event->getUser());
-		if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) {
-			// Backup codes already generated nothing to do here
-			return;
-		}
-
-		$this->jobList->add(RememberBackupCodesJob::class, ['uid' => $event->getUser()->getUID()]);
-	}
+    /** @var IRegistry */
+    private $registry;
+
+    /** @var IJobList */
+    private $jobList;
+
+    public function __construct(IRegistry $registry,
+                                IJobList $jobList) {
+        $this->registry = $registry;
+        $this->jobList = $jobList;
+    }
+
+    public function handle(Event $event) {
+        if (!($event instanceof RegistryEvent)) {
+            return;
+        }
+
+        $providers = $this->registry->getProviderStates($event->getUser());
+        if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) {
+            // Backup codes already generated nothing to do here
+            return;
+        }
+
+        $this->jobList->add(RememberBackupCodesJob::class, ['uid' => $event->getUser()->getUID()]);
+    }
 
 }

apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php

Indentation +45 added lines, -45 removed lines

@@ -33,60 +33,60 @@
 
 class RememberBackupCodesJob extends TimedJob {
 
-	/** @var IRegistry */
-	private $registry;
+    /** @var IRegistry */
+    private $registry;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var ITimeFactory */
-	private $time;
+    /** @var ITimeFactory */
+    private $time;
 
-	/** @var IManager */
-	private $notificationManager;
+    /** @var IManager */
+    private $notificationManager;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IRegistry $registry,
-								IUserManager $userManager,
-								ITimeFactory $timeFactory,
-								IManager $notificationManager,
-								IJobList $jobList) {
-		$this->registry = $registry;
-		$this->userManager = $userManager;
-		$this->time = $timeFactory;
-		$this->notificationManager = $notificationManager;
-		$this->jobList = $jobList;
+    public function __construct(IRegistry $registry,
+                                IUserManager $userManager,
+                                ITimeFactory $timeFactory,
+                                IManager $notificationManager,
+                                IJobList $jobList) {
+        $this->registry = $registry;
+        $this->userManager = $userManager;
+        $this->time = $timeFactory;
+        $this->notificationManager = $notificationManager;
+        $this->jobList = $jobList;
 
-		$this->setInterval(60*60*24*14);
-	}
+        $this->setInterval(60*60*24*14);
+    }
 
-	protected function run($argument) {
-		$uid = $argument['uid'];
-		$user = $this->userManager->get($uid);
+    protected function run($argument) {
+        $uid = $argument['uid'];
+        $user = $this->userManager->get($uid);
 
-		if ($user === null) {
-			// We can't run with an invalid user
-			return;
-		}
+        if ($user === null) {
+            // We can't run with an invalid user
+            return;
+        }
 
-		$providers = $this->registry->getProviderStates($user);
-		if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) {
-			// Backup codes already generated lets remove this job
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
+        $providers = $this->registry->getProviderStates($user);
+        if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) {
+            // Backup codes already generated lets remove this job
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
 
-		$date = new \DateTime();
-		$date->setTimestamp($this->time->getTime());
+        $date = new \DateTime();
+        $date->setTimestamp($this->time->getTime());
 
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('twofactor_backupcodes')
-			->setUser($user->getUID())
-			->setDateTime($date)
-			->setObject('create', 'codes')
-			->setSubject('create_backupcodes');
-		$this->notificationManager->notify($notification);
-	}
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('twofactor_backupcodes')
+            ->setUser($user->getUID())
+            ->setDateTime($date)
+            ->setObject('create', 'codes')
+            ->setSubject('create_backupcodes');
+        $this->notificationManager->notify($notification);
+    }
 }

apps/twofactor_backupcodes/lib/Notifications/Notifier.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	private $factory;
+    /** @var IFactory */
+    private $factory;
 
-	public function __construct(IFactory $factory) {
-		$this->factory = $factory;
-	}
+    public function __construct(IFactory $factory) {
+        $this->factory = $factory;
+    }
 
-	public function prepare(INotification $notification, $languageCode) {
-		if ($notification->getApp() !== 'twofactor_backupcodes') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
+    public function prepare(INotification $notification, $languageCode) {
+        if ($notification->getApp() !== 'twofactor_backupcodes') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
 
-		// Read the language from the notification
-		$l = $this->factory->get('twofactor_backupcodes', $languageCode);
+        // Read the language from the notification
+        $l = $this->factory->get('twofactor_backupcodes', $languageCode);
 
-		switch ($notification->getSubject()) {
-			case 'create_backupcodes':
-				$notification->setParsedSubject(
-					$l->t('Generate backup codes')
-				)->setParsedMessage(
-					$l->t('You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor.')
-				);
-				return $notification;
+        switch ($notification->getSubject()) {
+            case 'create_backupcodes':
+                $notification->setParsedSubject(
+                    $l->t('Generate backup codes')
+                )->setParsedMessage(
+                    $l->t('You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor.')
+                );
+                return $notification;
 
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
 
 }

apps/twofactor_backupcodes/lib/AppInfo/Application.php

Indentation +54 added lines, -54 removed lines

@@ -42,65 +42,65 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Application extends App {
-	public function __construct() {
-		parent::__construct('twofactor_backupcodes');
-	}
+    public function __construct() {
+        parent::__construct('twofactor_backupcodes');
+    }
 
-	/**
-	 * Register the different app parts
-	 */
-	public function register() {
-		$this->registerHooksAndEvents();
-		$this->registerNotification();
-	}
+    /**
+     * Register the different app parts
+     */
+    public function register() {
+        $this->registerHooksAndEvents();
+        $this->registerNotification();
+    }
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents() {
-		Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
+    /**
+     * Register the hooks and events
+     */
+    public function registerHooksAndEvents() {
+        Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
 
-		$container = $this->getContainer();
-		/** @var EventDispatcherInterface $eventDispatcher */
-		$eventDispatcher = $container->query(EventDispatcherInterface::class);
-		$eventDispatcher->addListener(CodesGenerated::class, function (CodesGenerated $event) use ($container) {
-			/** @var IListener[] $listeners */
-			$listeners = [
-				$container->query(ActivityPublisher::class),
-				$container->query(RegistryUpdater::class),
-				$container->query(ClearNotifications::class),
-			];
+        $container = $this->getContainer();
+        /** @var EventDispatcherInterface $eventDispatcher */
+        $eventDispatcher = $container->query(EventDispatcherInterface::class);
+        $eventDispatcher->addListener(CodesGenerated::class, function (CodesGenerated $event) use ($container) {
+            /** @var IListener[] $listeners */
+            $listeners = [
+                $container->query(ActivityPublisher::class),
+                $container->query(RegistryUpdater::class),
+                $container->query(ClearNotifications::class),
+            ];
 
-			foreach ($listeners as $listener) {
-				$listener->handle($event);
-			}
-		});
+            foreach ($listeners as $listener) {
+                $listener->handle($event);
+            }
+        });
 
-		$eventDispatcher->addListener(IRegistry::EVENT_PROVIDER_ENABLED, function(RegistryEvent $event) use ($container) {
-			/** @var IListener $listener */
-			$listener = $container->query(ProviderEnabled::class);
-			$listener->handle($event);
-		});
-	}
+        $eventDispatcher->addListener(IRegistry::EVENT_PROVIDER_ENABLED, function(RegistryEvent $event) use ($container) {
+            /** @var IListener $listener */
+            $listener = $container->query(ProviderEnabled::class);
+            $listener->handle($event);
+        });
+    }
 
-	public function registerNotification() {
-		$container = $this->getContainer();
-		/** @var IManager $manager */
-		$manager = $container->query(IManager::class);
-		$manager->registerNotifier(
-			function() use ($container) {
-				return $container->query(Notifier::class);
-			},
-			function () use ($container) {
-				$l = $container->query(IL10N::class);
-				return ['id' => 'twofactor_backupcodes', 'name' => $l->t('Second-factor backup codes')];
-			}
-		);
-	}
+    public function registerNotification() {
+        $container = $this->getContainer();
+        /** @var IManager $manager */
+        $manager = $container->query(IManager::class);
+        $manager->registerNotifier(
+            function() use ($container) {
+                return $container->query(Notifier::class);
+            },
+            function () use ($container) {
+                $l = $container->query(IL10N::class);
+                return ['id' => 'twofactor_backupcodes', 'name' => $l->t('Second-factor backup codes')];
+            }
+        );
+    }
 
-	public function deleteUser($params) {
-		/** @var BackupCodeMapper $mapper */
-		$mapper = $this->getContainer()->query(BackupCodeMapper::class);
-		$mapper->deleteCodesByUserId($params['uid']);
-	}
+    public function deleteUser($params) {
+        /** @var BackupCodeMapper $mapper */
+        $mapper = $this->getContainer()->query(BackupCodeMapper::class);
+        $mapper->deleteCodesByUserId($params['uid']);
+    }
 }