use OC\Authentication\Listeners\UserDeletedStoreCleanupListener;
use OC\Authentication\Listeners\UserDeletedTokenCleanupListener;
use OC\Authentication\Notifications\Notifier as AuthenticationNotifier;
-use OC\Core\Notification\RemoveLinkSharesNotifier;
+use OC\Core\Notification\CoreNotifier;
use OC\DB\MissingColumnInformation;
use OC\DB\MissingIndexInformation;
use OC\DB\MissingPrimaryKeyInformation;
$eventDispatcher = $server->query(IEventDispatcher::class);
$notificationManager = $server->getNotificationManager();
- $notificationManager->registerNotifierService(RemoveLinkSharesNotifier::class);
+ $notificationManager->registerNotifierService(CoreNotifier::class);
$notificationManager->registerNotifierService(AuthenticationNotifier::class);
$oldEventDispatcher = $server->getEventDispatcher();
--- /dev/null
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Notification;
+
+use OCP\L10N\IFactory;
+use OCP\Notification\INotification;
+use OCP\Notification\INotifier;
+
+class CoreNotifier implements INotifier {
+ /** @var IFactory */
+ private $l10nFactory;
+
+ public function __construct(IFactory $factory) {
+ $this->l10nFactory = $factory;
+ }
+
+ /**
+ * Identifier of the notifier, only use [a-z0-9_]
+ *
+ * @return string
+ * @since 17.0.0
+ */
+ public function getID(): string {
+ return 'core';
+ }
+
+ /**
+ * Human readable name describing the notifier
+ *
+ * @return string
+ * @since 17.0.0
+ */
+ public function getName(): string {
+ return $this->l10nFactory->get('core')->t('Nextcloud Server');
+ }
+
+ public function prepare(INotification $notification, string $languageCode): INotification {
+ if ($notification->getApp() !== 'core') {
+ throw new \InvalidArgumentException();
+ }
+ $l = $this->l10nFactory->get('core', $languageCode);
+
+ if ($notification->getSubject() === 'repair_exposing_links') {
+ $notification->setParsedSubject($l->t('Some of your link shares have been removed'));
+ $notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
+ $notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
+ return $notification;
+ }
+
+ if ($notification->getSubject() === 'user_limit_reached') {
+ $notification->setParsedSubject($l->t('The user limit of this instance is reached.'));
+ $notification->setParsedMessage($l->t('Add a subscription key to increase the user limit of this instance. For more information have a look at the Enterprise subscription page.'));
+ $notification->setLink('https://nextcloud.com/enterprise/order/');
+ return $notification;
+ }
+
+ throw new \InvalidArgumentException('Invalid subject');
+ }
+}
+++ /dev/null
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OC\Core\Notification;
-
-use OCP\L10N\IFactory;
-use OCP\Notification\INotification;
-use OCP\Notification\INotifier;
-
-class RemoveLinkSharesNotifier implements INotifier {
- /** @var IFactory */
- private $l10nFactory;
-
- public function __construct(IFactory $factory) {
- $this->l10nFactory = $factory;
- }
-
- /**
- * Identifier of the notifier, only use [a-z0-9_]
- *
- * @return string
- * @since 17.0.0
- */
- public function getID(): string {
- return 'core';
- }
-
- /**
- * Human readable name describing the notifier
- *
- * @return string
- * @since 17.0.0
- */
- public function getName(): string {
- return $this->l10nFactory->get('core')->t('Nextcloud Server');
- }
-
- public function prepare(INotification $notification, string $languageCode): INotification {
- if ($notification->getApp() !== 'core') {
- throw new \InvalidArgumentException();
- }
- $l = $this->l10nFactory->get('core', $languageCode);
-
- if ($notification->getSubject() === 'repair_exposing_links') {
- $notification->setParsedSubject($l->t('Some of your link shares have been removed'));
- $notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
- $notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
- return $notification;
- }
-
- throw new \InvalidArgumentException('Invalid subject');
- }
-}
'OC\\Core\\Migrations\\Version20000Date20201109081918' => $baseDir . '/core/Migrations/Version20000Date20201109081918.php',
'OC\\Core\\Migrations\\Version20000Date20201109081919' => $baseDir . '/core/Migrations/Version20000Date20201109081919.php',
'OC\\Core\\Migrations\\Version20000Date20201111081915' => $baseDir . '/core/Migrations/Version20000Date20201111081915.php',
- 'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => $baseDir . '/core/Notification/RemoveLinkSharesNotifier.php',
+ 'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php',
'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php',
'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',
'OC\\DB\\AdapterMySQL' => $baseDir . '/lib/private/DB/AdapterMySQL.php',
'OC\\Core\\Migrations\\Version20000Date20201109081918' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201109081918.php',
'OC\\Core\\Migrations\\Version20000Date20201109081919' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201109081919.php',
'OC\\Core\\Migrations\\Version20000Date20201111081915' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201111081915.php',
- 'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => __DIR__ . '/../../..' . '/core/Notification/RemoveLinkSharesNotifier.php',
+ 'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php',
'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php',
'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',
'OC\\DB\\AdapterMySQL' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterMySQL.php',
use OC\User\Backend;
use OCP\AppFramework\QueryException;
use OCP\IConfig;
+use OCP\IGroupManager;
use OCP\IServerContainer;
use OCP\IUserManager;
+use OCP\Notification\IManager;
use OCP\Support\Subscription\Exception\AlreadyRegisteredException;
use OCP\Support\Subscription\IRegistry;
use OCP\Support\Subscription\ISubscription;
private $container;
/** @var IUserManager */
private $userManager;
+ /** @var IGroupManager */
+ private $groupManager;
/** @var LoggerInterface */
private $logger;
+ /** @var IManager */
+ private $notificationManager;
public function __construct(IConfig $config,
IServerContainer $container,
IUserManager $userManager,
- LoggerInterface $logger) {
+ IGroupManager $groupManager,
+ LoggerInterface $logger,
+ IManager $notificationManager) {
$this->config = $config;
$this->container = $container;
$this->userManager = $userManager;
+ $this->groupManager = $groupManager;
$this->logger = $logger;
+ $this->notificationManager = $notificationManager;
}
private function getSubscription(): ?ISubscription {
}
private function notifyAboutReachedUserLimit() {
- // TODO notify admin about reached user limit
+ $admins = $this->groupManager->get('admin')->getUsers();
+ foreach ($admins as $admin) {
+ $notification = $this->notificationManager->createNotification();
+
+ $notification->setApp('core')
+ ->setUser($admin->getUID())
+ ->setDateTime(new \DateTime())
+ ->setObject('user_limit_reached', '1')
+ ->setSubject('user_limit_reached');
+ $this->notificationManager->notify($notification);
+ }
+
$this->logger->warning('The user limit was reached and the new user was not created', ['app' => 'lib']);
}
}
use OC\Support\Subscription\Registry;
use OCP\IConfig;
+use OCP\IGroup;
+use OCP\IGroupManager;
use OCP\IServerContainer;
use OCP\IUserManager;
+use OCP\Notification\IManager;
use OCP\Support\Subscription\ISubscription;
use OCP\Support\Subscription\ISupportedApps;
use PHPUnit\Framework\MockObject\MockObject;
/** @var MockObject|IUserManager */
private $userManager;
+ /** @var MockObject|IGroupManager */
+ private $groupManager;
+
/** @var MockObject|LoggerInterface */
private $logger;
+ /** @var MockObject|IManager */
+ private $notificationManager;
+
protected function setUp(): void {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
$this->serverContainer = $this->createMock(IServerContainer::class);
$this->userManager = $this->createMock(IUserManager::class);
+ $this->groupManager = $this->createMock(IGroupManager::class);
$this->logger = $this->createMock(LoggerInterface::class);
+ $this->notificationManager = $this->createMock(IManager::class);
$this->registry = new Registry(
$this->config,
$this->serverContainer,
$this->userManager,
- $this->logger
+ $this->groupManager,
+ $this->logger,
+ $this->notificationManager
);
}
->method('isHardUserLimitReached')
->willReturn(true);
$this->registry->register($subscription);
+ $dummyGroup = $this->createMock(IGroup::class);
+ $dummyGroup->expects($this->once())
+ ->method('getUsers')
+ ->willReturn([]);
+ $this->groupManager->expects($this->once())
+ ->method('get')
+ ->willReturn($dummyGroup);
$this->assertSame(true, $this->registry->delegateIsHardUserLimitReached());
}
->method('getBackends')
->willReturn([$dummyBackend]);
+ if ($expectedResult) {
+ $dummyGroup = $this->createMock(IGroup::class);
+ $dummyGroup->expects($this->once())
+ ->method('getUsers')
+ ->willReturn([]);
+ $this->groupManager->expects($this->once())
+ ->method('get')
+ ->willReturn($dummyGroup);
+ }
+
$this->assertSame($expectedResult, $this->registry->delegateIsHardUserLimitReached());
}
}
projects / nextcloud-server.git / commitdiff