diff --git a/appinfo/info.xml b/appinfo/info.xml index 6a057226e6f20ca70e12ba0eb94a92fa8de9b456..8a9a2749d95dd4ec3038009e2ded4fc689f15035 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,14 +5,18 @@ Email Recovery Email Recovery App +<<<<<<< HEAD + 12.0.0 +======= 11.0.3 +>>>>>>> main agpl MURENA SAS EmailRecovery security https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/email-recovery/-/issues/ - + OCA\EmailRecovery\Settings\RecoveryEmailSettings diff --git a/lib/Command/CreatePopularDomain.php b/lib/Command/CreatePopularDomain.php index 9fa3af62433544966f7662801c2834b075e66bf3..3d0fbab576c9dd580b0fc2ed175be550f58c9440 100644 --- a/lib/Command/CreatePopularDomain.php +++ b/lib/Command/CreatePopularDomain.php @@ -7,17 +7,17 @@ namespace OCA\EmailRecovery\Command; use OCA\EmailRecovery\AppInfo\Application; use OCA\EmailRecovery\Service\DomainService; use OCP\Files\IAppData; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class CreatePopularDomain extends Command { private DomainService $domainService; - private ILogger $logger; + private LoggerInterface $logger; private IAppData $appData; - public function __construct(DomainService $domainService, ILogger $logger, IAppData $appData) { + public function __construct(DomainService $domainService, LoggerInterface $logger, IAppData $appData) { parent::__construct(); $this->domainService = $domainService; $this->logger = $logger; diff --git a/lib/Command/SpamAccountDetection.php b/lib/Command/SpamAccountDetection.php index 0e4e2ba5af35dc3979d726be54e927b4216691e1..33d2185b5bdcc76ea54780f9d07ef0aa84dca45e 100644 --- a/lib/Command/SpamAccountDetection.php +++ b/lib/Command/SpamAccountDetection.php @@ -7,17 +7,17 @@ namespace OCA\EmailRecovery\Command; use OCA\EmailRecovery\AppInfo\Application; use OCA\EmailRecovery\Service\RecoveryEmailService; use OCP\Files\IAppData; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class SpamAccountDetection extends Command { private RecoveryEmailService $recoveryEmailService; - private ILogger $logger; + private LoggerInterface $logger; private IAppData $appData; - public function __construct(RecoveryEmailService $recoveryEmailService, ILogger $logger, IAppData $appData) { + public function __construct(RecoveryEmailService $recoveryEmailService, LoggerInterface $logger, IAppData $appData) { parent::__construct(); $this->recoveryEmailService = $recoveryEmailService; $this->logger = $logger; diff --git a/lib/Command/UpdateBlacklistedDomains.php b/lib/Command/UpdateBlacklistedDomains.php index b677f6804f70454e1acb4f15f966c7d382b69362..ab0a1008d1b7ab6b653f502485ed5afcc1c75a36 100644 --- a/lib/Command/UpdateBlacklistedDomains.php +++ b/lib/Command/UpdateBlacklistedDomains.php @@ -6,17 +6,17 @@ namespace OCA\EmailRecovery\Command; use OCA\EmailRecovery\AppInfo\Application; use OCA\EmailRecovery\Service\DomainService; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class UpdateBlacklistedDomains extends Command { private DomainService $domainService; - private ILogger $logger; + private LoggerInterface $logger; - public function __construct(DomainService $domainService, ILogger $logger) { + public function __construct(DomainService $domainService, LoggerInterface $logger) { parent::__construct(); $this->domainService = $domainService; $this->logger = $logger; diff --git a/lib/Controller/EmailRecoveryApiController.php b/lib/Controller/EmailRecoveryApiController.php index ccda36000fd239382377f8d1b3f18f8f3da4cf6d..05ce993c5b709be66bb83c193124838ba4d47bb4 100644 --- a/lib/Controller/EmailRecoveryApiController.php +++ b/lib/Controller/EmailRecoveryApiController.php @@ -30,17 +30,17 @@ use OCA\EmailRecovery\Exception\SameRecoveryEmailAsEmailException; use OCA\EmailRecovery\Service\RecoveryEmailService; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http\Response; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class EmailRecoveryApiController extends ApiController { - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; private $recoveryEmailService; public function __construct( string $appName, - ILogger $logger, + LoggerInterface $logger, RecoveryEmailService $recoveryEmailService ) { parent::__construct($appName, $request); diff --git a/lib/Controller/EmailRecoveryController.php b/lib/Controller/EmailRecoveryController.php index 58604be8a643264d31bfd8be69e9933f3f57fdb8..54db94367b9fe2371e3383dc00086f530f143b95 100644 --- a/lib/Controller/EmailRecoveryController.php +++ b/lib/Controller/EmailRecoveryController.php @@ -38,7 +38,7 @@ use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use OCP\IRequest; use OCP\IUserManager; use OCP\IUserSession; @@ -46,7 +46,7 @@ use OCP\Security\VerificationToken\InvalidTokenException; class EmailRecoveryController extends Controller { private IConfig $config; - private ILogger $logger; + private LoggerInterface $logger; private IL10N $l; private IUserSession $userSession; private RecoveryEmailService $recoveryEmailService; @@ -56,7 +56,7 @@ class EmailRecoveryController extends Controller { string $appName, IRequest $request, IConfig $config, - ILogger $logger, + LoggerInterface $logger, IL10N $l, IUserSession $userSession, RecoveryEmailService $recoveryEmailService, diff --git a/lib/Listeners/BeforeUserDeletedListener.php b/lib/Listeners/BeforeUserDeletedListener.php index 106d915d9007f2a02cca2783b2455191bdd6ae2c..a6683645207d84da68648242686bab0bf41ff4d8 100644 --- a/lib/Listeners/BeforeUserDeletedListener.php +++ b/lib/Listeners/BeforeUserDeletedListener.php @@ -7,7 +7,7 @@ namespace OCA\EmailRecovery\Listeners; use OCA\EmailRecovery\Service\RecoveryEmailService; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use OCP\IUserManager; use OCP\User\Events\BeforeUserDeletedEvent; @@ -16,7 +16,7 @@ class BeforeUserDeletedListener implements IEventListener { private $recoveryEmailService; private $userManager; - public function __construct(ILogger $logger, RecoveryEmailService $recoveryEmailService, IUserManager $userManager) { + public function __construct(LoggerInterface $logger, RecoveryEmailService $recoveryEmailService, IUserManager $userManager) { $this->logger = $logger; $this->recoveryEmailService = $recoveryEmailService; $this->userManager = $userManager; diff --git a/lib/Listeners/UserConfigChangedListener.php b/lib/Listeners/UserConfigChangedListener.php index 206c0cbac6493a046b1c1e2a2f78abe4b2db99f4..2fcf465cf7648c5bad03f4a5c4154e991d248bd8 100644 --- a/lib/Listeners/UserConfigChangedListener.php +++ b/lib/Listeners/UserConfigChangedListener.php @@ -9,7 +9,7 @@ use OCA\EcloudAccounts\Service\LDAPConnectionService; use OCA\EmailRecovery\Service\RecoveryEmailService; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use OCP\IUserManager; use OCP\User\Events\UserConfigChangedEvent; @@ -20,7 +20,7 @@ class UserConfigChangedListener implements IEventListener { private LDAPConnectionService $LDAPConnectionService; private const LDAP_BACKEND_NAME = 'LDAP'; - public function __construct(ILogger $logger, RecoveryEmailService $recoveryEmailService, IUserManager $userManager, LDAPConnectionService $LDAPConnectionService) { + public function __construct(LoggerInterface $logger, RecoveryEmailService $recoveryEmailService, IUserManager $userManager, LDAPConnectionService $LDAPConnectionService) { $this->logger = $logger; $this->recoveryEmailService = $recoveryEmailService; $this->userManager = $userManager; diff --git a/lib/Service/DomainService.php b/lib/Service/DomainService.php index 6f18c45f125bfaf2a7f809edf5bf7b2ae97723ae..ad0d55cc7b257c059d21216992e39ec0448bd86e 100644 --- a/lib/Service/DomainService.php +++ b/lib/Service/DomainService.php @@ -10,10 +10,10 @@ use OCP\Files\IAppData; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class DomainService { - private ILogger $logger; + private LoggerInterface $logger; private IAppData $appData; private Client $httpClient; private string $appName; @@ -25,7 +25,7 @@ class DomainService { private const BLACKLISTED_DOMAINS_FILE = 'blacklisted_domains.json'; private const DISPOSABLE_DOMAINS_FILE = 'disposable_domains.json'; - public function __construct(string $appName, ILogger $logger, IAppData $appData, Client $httpClient, IL10N $l) { + public function __construct(string $appName, LoggerInterface $logger, IAppData $appData, Client $httpClient, IL10N $l) { $this->logger = $logger; $this->appData = $appData; $this->httpClient = $httpClient; diff --git a/lib/Service/RecoveryEmailService.php b/lib/Service/RecoveryEmailService.php index e213545ac906d9d100b231429a4b83ccf5dcfd41..9bbfcf141c97e55e16115b1c0177e9f6dd8efd51 100644 --- a/lib/Service/RecoveryEmailService.php +++ b/lib/Service/RecoveryEmailService.php @@ -18,7 +18,7 @@ use OCP\Http\Client\IClientService; use OCP\ICacheFactory; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use OCP\ISession; use OCP\IURLGenerator; use OCP\IUser; @@ -30,7 +30,7 @@ use OCP\Security\VerificationToken\IVerificationToken; use OCP\Util; class RecoveryEmailService { - private ILogger $logger; + private LoggerInterface $logger; private IConfig $config; private string $appName; private IUserManager $userManager; @@ -66,7 +66,7 @@ class RecoveryEmailService { private ISession $session; private ShopAccountService $shopAccountService; - public function __construct(string $appName, ILogger $logger, IConfig $config, ISession $session, IUserManager $userManager, IMailer $mailer, IFactory $l10nFactory, IURLGenerator $urlGenerator, Defaults $themingDefaults, IVerificationToken $verificationToken, CurlService $curlService, DomainService $domainService, IL10N $l, ICacheFactory $cacheFactory, IClientService $httpClientService, ConfigMapper $configMapper, ShopAccountService $shopAccountService) { + public function __construct(string $appName, LoggerInterface $logger, IConfig $config, ISession $session, IUserManager $userManager, IMailer $mailer, IFactory $l10nFactory, IURLGenerator $urlGenerator, Defaults $themingDefaults, IVerificationToken $verificationToken, CurlService $curlService, DomainService $domainService, IL10N $l, ICacheFactory $cacheFactory, IClientService $httpClientService, ConfigMapper $configMapper, ShopAccountService $shopAccountService) { $this->logger = $logger; $this->config = $config; $this->appName = $appName;