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

Commit 2d1dea89 authored by Ronak Patel's avatar Ronak Patel Committed by Akhil
Browse files

Changing condition to check if user taken

parent bbe68f5c

appinfo/info.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.

    It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.

    This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>

    <version>3.4.0</version>

    <version>3.4.1</version>

    <licence>agpl</licence>

    <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>

    <namespace>EcloudAccounts</namespace>

lib/Controller/UserController.php

+4 −4
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ class UserController extends ApiController { 
		}



		// To check for old accounts

		$mailDomain = $this->config->getSystemValue('mail_domain');

		$mailDomainSuffix = !empty($mailDomain) ? '@' . $mailDomain : '';

		if (!$exists && stristr($uid, $mailDomainSuffix) === false) {

			$exists = $this->userService->userExists($uid . $mailDomainSuffix);

		$legacyDomain = $this->config->getSystemValue('legacy_domain');

		$legacyDomainSuffix = !empty($legacyDomain) ? '@' . $legacyDomain : '';

		if (!$exists && stristr($uid, $legacyDomainSuffix) === false) {

			$exists = $this->userService->userExists($uid . $legacyDomainSuffix);

		}



		$response->setData($exists);