nextcloud / server

lib/private/Authentication/TwoFactorAuth/Registry.php

Indentation +31 added lines, -31 removed lines

@@ -37,44 +37,44 @@
 
 class Registry implements IRegistry {
 
-	/** @var ProviderUserAssignmentDao */
-	private $assignmentDao;
+    /** @var ProviderUserAssignmentDao */
+    private $assignmentDao;
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	public function __construct(ProviderUserAssignmentDao $assignmentDao,
-								IEventDispatcher $dispatcher) {
-		$this->assignmentDao = $assignmentDao;
-		$this->dispatcher = $dispatcher;
-	}
+    public function __construct(ProviderUserAssignmentDao $assignmentDao,
+                                IEventDispatcher $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 deleteUserData(IUser $user): void {
-		foreach ($this->assignmentDao->deleteByUser($user->getUID()) as $provider) {
-			$event = new TwoFactorProviderDisabled($provider['provider_id']);
-			$this->dispatcher->dispatchTyped($event);
-		}
-	}
+    public function deleteUserData(IUser $user): void {
+        foreach ($this->assignmentDao->deleteByUser($user->getUID()) as $provider) {
+            $event = new TwoFactorProviderDisabled($provider['provider_id']);
+            $this->dispatcher->dispatchTyped($event);
+        }
+    }
 
-	public function cleanUp(string $providerId) {
-		$this->assignmentDao->deleteAll($providerId);
-	}
+    public function cleanUp(string $providerId) {
+        $this->assignmentDao->deleteAll($providerId);
+    }
 }

lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php

Indentation +95 added lines, -95 removed lines

@@ -36,99 +36,99 @@
  * 2FA providers
  */
 class ProviderUserAssignmentDao {
-	public const TABLE_NAME = 'twofactor_providers';
-
-	/** @var IDBConnection */
-	private $conn;
-
-	public function __construct(IDBConnection $dbConn) {
-		$this->conn = $dbConn;
-	}
-
-	/**
-	 * Get all assigned provider IDs for the given user ID
-	 *
-	 * @return string[] where the array key is the provider ID (string) and the
-	 *                  value is the enabled state (bool)
-	 */
-	public function getState(string $uid): array {
-		$qb = $this->conn->getQueryBuilder();
-
-		$query = $qb->select('provider_id', 'enabled')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-		$result = $query->execute();
-		$providers = [];
-		foreach ($result->fetchAll() as $row) {
-			$providers[$row['provider_id']] = 1 === (int)$row['enabled'];
-		}
-		$result->closeCursor();
-
-		return $providers;
-	}
-
-	/**
-	 * Persist a new/updated (provider_id, uid, enabled) tuple
-	 */
-	public function persist(string $providerId, string $uid, int $enabled) {
-		$qb = $this->conn->getQueryBuilder();
-
-		try {
-			// Insert a new entry
-			$insertQuery = $qb->insert(self::TABLE_NAME)->values([
-				'provider_id' => $qb->createNamedParameter($providerId),
-				'uid' => $qb->createNamedParameter($uid),
-				'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
-			]);
-
-			$insertQuery->execute();
-		} catch (UniqueConstraintViolationException $ex) {
-			// There is already an entry -> update it
-			$updateQuery = $qb->update(self::TABLE_NAME)
-				->set('enabled', $qb->createNamedParameter($enabled))
-				->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
-				->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-			$updateQuery->execute();
-		}
-	}
-
-	/**
-	 * Delete all provider states of a user and return the provider IDs
-	 *
-	 * @param string $uid
-	 *
-	 * @return int[]
-	 */
-	public function deleteByUser(string $uid): array {
-		$qb1 = $this->conn->getQueryBuilder();
-		$selectQuery = $qb1->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb1->expr()->eq('uid', $qb1->createNamedParameter($uid)));
-		$selectResult = $selectQuery->execute();
-		$rows = $selectResult->fetchAll();
-		$selectResult->closeCursor();
-
-		$qb2 = $this->conn->getQueryBuilder();
-		$deleteQuery = $qb2
-			->delete(self::TABLE_NAME)
-			->where($qb2->expr()->eq('uid', $qb2->createNamedParameter($uid)));
-		$deleteQuery->execute();
-
-		return array_map(function (array $row) {
-			return [
-				'provider_id' => $row['provider_id'],
-				'uid' => $row['uid'],
-				'enabled' => 1 === (int) $row['enabled'],
-			];
-		}, $rows);
-	}
-
-	public function deleteAll(string $providerId) {
-		$qb = $this->conn->getQueryBuilder();
-
-		$deleteQuery = $qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
-
-		$deleteQuery->execute();
-	}
+    public const TABLE_NAME = 'twofactor_providers';
+
+    /** @var IDBConnection */
+    private $conn;
+
+    public function __construct(IDBConnection $dbConn) {
+        $this->conn = $dbConn;
+    }
+
+    /**
+     * Get all assigned provider IDs for the given user ID
+     *
+     * @return string[] where the array key is the provider ID (string) and the
+     *                  value is the enabled state (bool)
+     */
+    public function getState(string $uid): array {
+        $qb = $this->conn->getQueryBuilder();
+
+        $query = $qb->select('provider_id', 'enabled')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+        $result = $query->execute();
+        $providers = [];
+        foreach ($result->fetchAll() as $row) {
+            $providers[$row['provider_id']] = 1 === (int)$row['enabled'];
+        }
+        $result->closeCursor();
+
+        return $providers;
+    }
+
+    /**
+     * Persist a new/updated (provider_id, uid, enabled) tuple
+     */
+    public function persist(string $providerId, string $uid, int $enabled) {
+        $qb = $this->conn->getQueryBuilder();
+
+        try {
+            // Insert a new entry
+            $insertQuery = $qb->insert(self::TABLE_NAME)->values([
+                'provider_id' => $qb->createNamedParameter($providerId),
+                'uid' => $qb->createNamedParameter($uid),
+                'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
+            ]);
+
+            $insertQuery->execute();
+        } catch (UniqueConstraintViolationException $ex) {
+            // There is already an entry -> update it
+            $updateQuery = $qb->update(self::TABLE_NAME)
+                ->set('enabled', $qb->createNamedParameter($enabled))
+                ->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
+                ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+            $updateQuery->execute();
+        }
+    }
+
+    /**
+     * Delete all provider states of a user and return the provider IDs
+     *
+     * @param string $uid
+     *
+     * @return int[]
+     */
+    public function deleteByUser(string $uid): array {
+        $qb1 = $this->conn->getQueryBuilder();
+        $selectQuery = $qb1->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb1->expr()->eq('uid', $qb1->createNamedParameter($uid)));
+        $selectResult = $selectQuery->execute();
+        $rows = $selectResult->fetchAll();
+        $selectResult->closeCursor();
+
+        $qb2 = $this->conn->getQueryBuilder();
+        $deleteQuery = $qb2
+            ->delete(self::TABLE_NAME)
+            ->where($qb2->expr()->eq('uid', $qb2->createNamedParameter($uid)));
+        $deleteQuery->execute();
+
+        return array_map(function (array $row) {
+            return [
+                'provider_id' => $row['provider_id'],
+                'uid' => $row['uid'],
+                'enabled' => 1 === (int) $row['enabled'],
+            ];
+        }, $rows);
+    }
+
+    public function deleteAll(string $providerId) {
+        $qb = $this->conn->getQueryBuilder();
+
+        $deleteQuery = $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
+
+        $deleteQuery->execute();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 		$result = $query->execute();
 		$providers = [];
 		foreach ($result->fetchAll() as $row) {
-			$providers[$row['provider_id']] = 1 === (int)$row['enabled'];
+			$providers[$row['provider_id']] = 1 === (int) $row['enabled'];
 		}
 		$result->closeCursor();
 
@@ -114,7 +114,7 @@ 
 			->where($qb2->expr()->eq('uid', $qb2->createNamedParameter($uid)));
 		$deleteQuery->execute();
 
-		return array_map(function (array $row) {
+		return array_map(function(array $row) {
 			return [
 				'provider_id' => $row['provider_id'],
 				'uid' => $row['uid'],

lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php

Indentation +17 added lines, -17 removed lines

@@ -32,21 +32,21 @@
  */
 final class TwoFactorProviderDisabled extends Event {
 
-	/** @var string */
-	private $providerId;
-
-	/**
-	 * @since 20.0.0
-	 */
-	public function __construct(string $providerId) {
-		parent::__construct();
-		$this->providerId = $providerId;
-	}
-
-	/**
-	 * @since 20.0.0
-	 */
-	public function getProviderId(): string {
-		return $this->providerId;
-	}
+    /** @var string */
+    private $providerId;
+
+    /**
+     * @since 20.0.0
+     */
+    public function __construct(string $providerId) {
+        parent::__construct();
+        $this->providerId = $providerId;
+    }
+
+    /**
+     * @since 20.0.0
+     */
+    public function getProviderId(): string {
+        return $this->providerId;
+    }
 }