Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5db4744 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Few fixes

parent 4f48738b

lib/Listeners/BeforeUserDeletedListener.php

+3 −3
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ class BeforeUserDeletedListener implements IEventListener { 
			$this->logger->error('Error deleting mail folder for user '. $uid . ' :' . $e->getMessage());

		}



		$this->logger->info('Deleting vault account of user '.$user);

		$this->logger->info('Deleting vault account of user '.$uid);

		$this->ssoService->setupUserId($uid); //will retrieve id if not already in user settings

		$oidcUid = $this->ssoService->currentUserId;

		$oidcUid = $this->ssoService->getCurrentUserId();

		if (!empty($oidcUid)) {

			$this->triggerVaultAccountDelete($oidcUid);

		} else {

			$this->logger->error('Error deleting vault account: No ssoid for '.$user);

			$this->logger->error('Error deleting vault account: No ssoid for '.$uid);

		}



		try {

lib/Service/SSOService.php

+5 −1
Original line number Diff line number Diff line
@@ -253,6 +253,10 @@ class SSOService { 
		$this->migrateCredential($username, $secret);

	}



	public function getCurrentUserId() : String {

		return $this->currentUserId;

	}



	private function getCredentialIds() : array {

		$url = $this->ssoConfig['admin_rest_api_url'] . self::CREDENTIALS_ENDPOINT;

		$url = str_replace('{USER_ID}', $this->currentUserId, $url);
@@ -303,7 +307,7 @@ class SSOService { 
		return $credentialEntry;

	}



	private function setupUserId(string $username) : void {

	public function setupUserId(string $username) : void {

		$user = $this->userManager->get($username);

		$savedOIDCUid = $this->config->getUserValue($user->getUID(), 'oidc_login', 'oidc_uid');