switch to BeforeUserLoggedInEvent

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Author: blizzz

lib/AppInfo/Application.php

@@ -35,8 +35,8 @@
 use OCP\Security\Events\GenerateSecurePasswordEvent;
 use OCP\Security\Events\ValidatePasswordPolicyEvent;
 use OCP\User\Events\BeforePasswordUpdatedEvent;
+use OCP\User\Events\BeforeUserLoggedInEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
-use OCP\User\Events\PostLoginEvent;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
@@ -98,14 +98,14 @@ function (Event $event) use ($container) {
 			}
 		);
 		$eventDispatcher->addListener(
-			PostLoginEvent::class,
+			BeforeUserLoggedInEvent::class,
 			function (Event $event) use ($container) {
-				if(!$event instanceof PostLoginEvent) {
+				if(!$event instanceof BeforeUserLoggedInEvent) {
 					return;
 				}
 				/** @var ComplianceService $complianceUpdater */
 				$complianceUpdater = $container->query(ComplianceService::class);
-				$complianceUpdater->entryControl($event->getUser(), $event->getPassword(), $event->isTokenLogin());
+				$complianceUpdater->entryControl($event->getUsername(), $event->getPassword());
 			}
 		);
 

lib/ComplianceService.php

@@ -85,14 +85,15 @@ public function audit(IUser $user, string $password) {
 	/**
 	 * @throws LoginException
 	 */
-	public function entryControl(IUser $user, string $password, bool $isTokenLogin) {
+	//public function entryControl(IUser $user, string $password, bool $isTokenLogin) {
+	public function entryControl(string $loginName, string $password) {
+		$uid = $loginName;
+		\OCP\Util::emitHook( '\OCA\Files_Sharing\API\Server2Server', 'preLoginNameUsedAsUserName', ['uid' => &$uid]);
 		foreach ($this->getInstance(IEntryControl::class) as $instance) {
 			try {
-				$instance->entryControl($user, $password, $isTokenLogin);
+				$user = \OC::$server->getUserManager()->get($uid);
+				$instance->entryControl($user, $password, false);
 			} catch (HintException $e) {
-				if($this->userSession->isLoggedIn()) {
-					$this->userSession->logout();
-				}
 				throw new LoginException($e->getHint());
 			}
 		}