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

Commit 7cce8fea authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Version Bump to NC 31 compatible

parent 862edbb9
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@
    <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>12.0.1</version>
    <version>13.0.0</version>
    <licence>agpl</licence>
    <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
    <namespace>EcloudAccounts</namespace>
    <category>tools</category>
    <bugs>https://gitlab.e.foundation/e/management/issues</bugs>
    <dependencies>
        <nextcloud min-version="29" max-version="30"/>
        <nextcloud min-version="30" max-version="31"/>
    </dependencies>
	<settings>
		<personal>OCA\EcloudAccounts\Settings\DeleteShopAccountSetting</personal>
+4 −4
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ namespace OCA\EcloudAccounts\Command;
use Exception;
use OCA\EcloudAccounts\AppInfo\Application;
use OCA\EcloudAccounts\Service\UserService;
use OCP\ILogger;
use OCP\IUser;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -18,9 +18,9 @@ class MapActiveAttributetoLDAP extends Command {
	private OutputInterface $commandOutput;
	private IUserManager $userManager;
	private $userService;
	private $logger;
	private LoggerInterface $logger;

	public function __construct(IUserManager $userManager, ILogger $logger, UserService $userService) {
	public function __construct(IUserManager $userManager, LoggerInterface $logger, UserService $userService) {
		$this->userManager = $userManager;
		$this->userService = $userService;
		$this->logger = $logger;
@@ -42,7 +42,7 @@ class MapActiveAttributetoLDAP extends Command {
				try {
					$this->userService->mapActiveAttributesInLDAP($username, $isEnabled);
				} catch (Exception $e) {
					$this->logger->logException('Failed to update LDAP attributes for user: ' . $username, ['exception' => $e]);
					$this->logger->error('Failed to update LDAP attributes for user: ' . $username, ['exception' => $e]);
				}
			}
		});
+8 −8
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\Files\IAppData;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IRequest;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use Psr\Log\LoggerInterface;

class AccountController extends Controller {
	protected $appName;
@@ -53,7 +53,7 @@ class AccountController extends Controller {
	private const HCAPTCHA_DOMAINS = ['https://hcaptcha.com', 'https://*.hcaptcha.com'];
	private const BLACKLISTED_USERNAMES_FILE_NAME = 'blacklisted_usernames';
	
	private ILogger $logger;
	private LoggerInterface $logger;
	public function __construct(
		$AppName,
		IRequest $request,
@@ -66,7 +66,7 @@ class AccountController extends Controller {
		IURLGenerator $urlGenerator,
		ISession $session,
		IConfig $config,
		ILogger $logger,
		LoggerInterface $logger,
		IInitialState $initialState,
		IAppData $appData,
	) {
@@ -199,7 +199,7 @@ class AccountController extends Controller {
				$ipAddress = $this->request->getRemoteAddress();
				$this->userService->addUsernameToCommonDataStore($username, $ipAddress, $recoveryEmail);
			} catch (\Throwable $e) {
				$this->logger->logException($e, ['app' => Application::APP_ID]);
				$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => Application::APP_ID]);
			}
			$this->userService->setAccountDataLocally($username, $userEmail);
			$this->userService->createHMEAlias($username, $userEmail);
@@ -222,15 +222,15 @@ class AccountController extends Controller {
			$response->setData(['success' => true]);

		} catch (LDAPUserCreationException | Error $e) {
			$this->logger->logException($e, ['app' => Application::APP_ID]);
			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => Application::APP_ID]);
			$response->setData(['message' => 'A server-side error occurred while processing your request! Please try again later.', 'success' => false]);
			$response->setStatus(500);
		} catch (RecoveryEmailValidationException $e) {
			$this->logger->logException($e, ['app' => Application::APP_ID]);
			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => Application::APP_ID]);
			$response->setData(['message' => $e->getMessage(), 'success' => false]);
			$response->setStatus(400);
		} catch (Exception $e) {
			$this->logger->logException($e, ['app' => Application::APP_ID]);
			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => Application::APP_ID]);
			$response->setData(['message' => 'An error occurred while creating your account!', 'success' => false]);
			$response->setStatus(500);
		}
@@ -330,7 +330,7 @@ class AccountController extends Controller {
				$response->setData(['message' => 'Username is already taken.', 'field' => 'username', 'success' => false]);
			}
		} catch (Exception $e) {
			$this->logger->logException($e, ['app' => Application::APP_ID ]);
			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => Application::APP_ID]);
			$response->setStatus(500);
		}

+3 −3
Original line number Diff line number Diff line
@@ -8,18 +8,18 @@ use Exception;
use OCA\EcloudAccounts\Service\ShopAccountService;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;

class ShopAccountController extends Controller {
	private ShopAccountService $shopAccountService;
	private IUserSession $userSession;

	private ILogger $logger;
	private LoggerInterface $logger;


	public function __construct($appName, IRequest $request, IUserSession $userSession, ShopAccountService $shopAccountService, ILogger $logger) {
	public function __construct($appName, IRequest $request, IUserSession $userSession, ShopAccountService $shopAccountService, LoggerInterface $logger) {
		parent::__construct($appName, $request);
		$this->shopAccountService = $shopAccountService;
		$this->userSession = $userSession;
+3 −3
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ use OCA\EcloudAccounts\Service\UserService;
use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IRequest;
use OCP\L10N\IFactory;
use Psr\Log\LoggerInterface;

class UserController extends ApiController {
	/** @var UserService */
@@ -20,11 +20,11 @@ class UserController extends ApiController {

	private $mailUsageMapper;

	private $logger;
	private LoggerInterface $logger;

	private $config;
	protected $l10nFactory;
	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, IFactory $l10nFactory) {
	public function __construct($appName, IRequest $request, LoggerInterface $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, IFactory $l10nFactory) {
		parent::__construct($appName, $request);
		$this->userService = $userService;
		$this->mailUsageMapper = $mailUsageMapper;
Loading