nextcloud / server

apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php

Indentation +93 added lines, -93 removed lines

@@ -45,97 +45,97 @@
  * Username and password from login credentials, saved in DB
  */
 class LoginCredentials extends AuthMechanism {
-	public const CREDENTIALS_IDENTIFIER = 'password::logincredentials/credentials';
-
-	/** @var ISession */
-	protected $session;
-
-	/** @var ICredentialsManager */
-	protected $credentialsManager;
-
-	/** @var CredentialsStore */
-	private $credentialsStore;
-
-	public function __construct(IL10N $l, ISession $session, ICredentialsManager $credentialsManager, CredentialsStore $credentialsStore, IEventDispatcher $eventDispatcher) {
-		$this->session = $session;
-		$this->credentialsManager = $credentialsManager;
-		$this->credentialsStore = $credentialsStore;
-
-		$this
-			->setIdentifier('password::logincredentials')
-			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('Log-in credentials, save in database'))
-			->addParameters([
-			]);
-
-		$eventDispatcher->addServiceListener(UserLoggedInEvent::class, StorePasswordListener::class);
-		$eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, StorePasswordListener::class);
-	}
-
-	private function getCredentials(IUser $user): array {
-		$credentials = $this->credentialsManager->retrieve($user->getUID(), self::CREDENTIALS_IDENTIFIER);
-
-		if (is_null($credentials)) {
-			// nothing saved in db, try to get it from the session and save it
-			try {
-				$sessionCredentials = $this->credentialsStore->getLoginCredentials();
-
-				$credentials = [
-					'user' => $sessionCredentials->getLoginName(),
-					'password' => $sessionCredentials->getPassword(),
-				];
-
-				$this->credentialsManager->store($user->getUID(), self::CREDENTIALS_IDENTIFIER, $credentials);
-			} catch (CredentialsUnavailableException $e) {
-				throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
-			}
-		}
-
-		return $credentials;
-	}
-
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		if (!isset($user)) {
-			throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
-		}
-		$credentials = $this->getCredentials($user);
-
-		$loginKey = $storage->getBackendOption("login_ldap_attr");
-		if ($loginKey) {
-			$backend = $user->getBackend();
-			if ($backend instanceof IUserLDAP) {
-				$value = $this->getLdapPropertyForUser($backend, $user, $loginKey);
-				if ($value === null) {
-					throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute not set for user ' . $user->getUID());
-				}
-				$storage->setBackendOption('user', $value);
-			} else {
-				throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute configured but user ' . $user->getUID() . ' is not an ldap user');
-			}
-		} else {
-			$storage->setBackendOption('user', $credentials['user']);
-		}
-		$storage->setBackendOption('password', $credentials['password']);
-	}
-
-	private function getLdapPropertyForUser(IUserLDAP $ldap, IUser $user, string $property): ?string {
-		$access = $ldap->getLDAPAccess($user->getUID());
-		$connection = $access->getConnection();
-		$key = "external_login::" . $user->getUID() . "::" . $property;
-		$cached = $connection->getFromCache($key);
-
-		if ($cached !== null) {
-			return $cached;
-		}
-
-		$value = $access->readAttribute($access->username2dn($user->getUID()), $property);
-		if (count($value) > 0) {
-			$value = current($value);
-		} else {
-			return null;
-		}
-		$connection->writeToCache($key, $value);
-
-		return $value;
-	}
+    public const CREDENTIALS_IDENTIFIER = 'password::logincredentials/credentials';
+
+    /** @var ISession */
+    protected $session;
+
+    /** @var ICredentialsManager */
+    protected $credentialsManager;
+
+    /** @var CredentialsStore */
+    private $credentialsStore;
+
+    public function __construct(IL10N $l, ISession $session, ICredentialsManager $credentialsManager, CredentialsStore $credentialsStore, IEventDispatcher $eventDispatcher) {
+        $this->session = $session;
+        $this->credentialsManager = $credentialsManager;
+        $this->credentialsStore = $credentialsStore;
+
+        $this
+            ->setIdentifier('password::logincredentials')
+            ->setScheme(self::SCHEME_PASSWORD)
+            ->setText($l->t('Log-in credentials, save in database'))
+            ->addParameters([
+            ]);
+
+        $eventDispatcher->addServiceListener(UserLoggedInEvent::class, StorePasswordListener::class);
+        $eventDispatcher->addServiceListener(PasswordUpdatedEvent::class, StorePasswordListener::class);
+    }
+
+    private function getCredentials(IUser $user): array {
+        $credentials = $this->credentialsManager->retrieve($user->getUID(), self::CREDENTIALS_IDENTIFIER);
+
+        if (is_null($credentials)) {
+            // nothing saved in db, try to get it from the session and save it
+            try {
+                $sessionCredentials = $this->credentialsStore->getLoginCredentials();
+
+                $credentials = [
+                    'user' => $sessionCredentials->getLoginName(),
+                    'password' => $sessionCredentials->getPassword(),
+                ];
+
+                $this->credentialsManager->store($user->getUID(), self::CREDENTIALS_IDENTIFIER, $credentials);
+            } catch (CredentialsUnavailableException $e) {
+                throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
+            }
+        }
+
+        return $credentials;
+    }
+
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        if (!isset($user)) {
+            throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
+        }
+        $credentials = $this->getCredentials($user);
+
+        $loginKey = $storage->getBackendOption("login_ldap_attr");
+        if ($loginKey) {
+            $backend = $user->getBackend();
+            if ($backend instanceof IUserLDAP) {
+                $value = $this->getLdapPropertyForUser($backend, $user, $loginKey);
+                if ($value === null) {
+                    throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute not set for user ' . $user->getUID());
+                }
+                $storage->setBackendOption('user', $value);
+            } else {
+                throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute configured but user ' . $user->getUID() . ' is not an ldap user');
+            }
+        } else {
+            $storage->setBackendOption('user', $credentials['user']);
+        }
+        $storage->setBackendOption('password', $credentials['password']);
+    }
+
+    private function getLdapPropertyForUser(IUserLDAP $ldap, IUser $user, string $property): ?string {
+        $access = $ldap->getLDAPAccess($user->getUID());
+        $connection = $access->getConnection();
+        $key = "external_login::" . $user->getUID() . "::" . $property;
+        $cached = $connection->getFromCache($key);
+
+        if ($cached !== null) {
+            return $cached;
+        }
+
+        $value = $access->readAttribute($access->username2dn($user->getUID()), $property);
+        if (count($value) > 0) {
+            $value = current($value);
+        } else {
+            return null;
+        }
+        $connection->writeToCache($key, $value);
+
+        return $value;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -106,11 +106,11 @@ 
 			if ($backend instanceof IUserLDAP) {
 				$value = $this->getLdapPropertyForUser($backend, $user, $loginKey);
 				if ($value === null) {
-					throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute not set for user ' . $user->getUID());
+					throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute not set for user '.$user->getUID());
 				}
 				$storage->setBackendOption('user', $value);
 			} else {
-				throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute configured but user ' . $user->getUID() . ' is not an ldap user');
+				throw new InsufficientDataForMeaningfulAnswerException('Custom ldap attribute configured but user '.$user->getUID().' is not an ldap user');
 			}
 		} else {
 			$storage->setBackendOption('user', $credentials['user']);
@@ -121,7 +121,7 @@ 
 	private function getLdapPropertyForUser(IUserLDAP $ldap, IUser $user, string $property): ?string {
 		$access = $ldap->getLDAPAccess($user->getUID());
 		$connection = $access->getConnection();
-		$key = "external_login::" . $user->getUID() . "::" . $property;
+		$key = "external_login::".$user->getUID()."::".$property;
 		$cached = $connection->getFromCache($key);
 
 		if ($cached !== null) {