From e8fee956a42cafe7b8004c12656d4b5c1b2b1616 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 27 Apr 2023 14:47:35 +0530
Subject: [PATCH 001/185] tos service set

---
 lib/Controller/UserController.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index dd87f13e..06ad0a37 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -11,11 +11,14 @@ use OCP\IConfig;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
 use OCA\EcloudAccounts\Service\UserService;
+use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
 
 class UserController extends ApiController {
 	/** @var UserService */
 	private $userService;
+	/** @var SignatoryService */
+	private $signatoryService;
 
 	private $mailUsageMapper;
 
@@ -23,12 +26,13 @@ class UserController extends ApiController {
 
 	private $config;
 
-	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper) {
+	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService) {
 		parent::__construct($appName, $request);
 		$this->userService = $userService;
 		$this->mailUsageMapper = $mailUsageMapper;
 		$this->logger = $logger;
 		$this->config = $config;
+		$this->signatoryService = $signatoryService;
 	}
 
 	/**
@@ -87,7 +91,10 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-
+		$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
+		if (!$tosSignatoryInserted) {
+			return $this->getErrorResponse($response, 'error_setting_tos', 400);
+		}
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
 			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From 71af9e9438b787c725800c3507fe79f18efc0dcb Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:15:08 +0530
Subject: [PATCH 002/185] check tos enabled

---
 lib/Controller/UserController.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 06ad0a37..79995cda 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -10,6 +10,7 @@ use OCP\ILogger;
 use OCP\IConfig;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\App\IAppManager;
 use OCA\EcloudAccounts\Service\UserService;
 use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
@@ -26,9 +27,13 @@ class UserController extends ApiController {
 
 	private $config;
 
-	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService) {
+	/** @var IAppManager */
+    private $appManager;
+
+	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager) {
 		parent::__construct($appName, $request);
 		$this->userService = $userService;
+		$this->appManager = $appManager;
 		$this->mailUsageMapper = $mailUsageMapper;
 		$this->logger = $logger;
 		$this->config = $config;
@@ -91,9 +96,11 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-		$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
-		if (!$tosSignatoryInserted) {
-			return $this->getErrorResponse($response, 'error_setting_tos', 400);
+		if ($this->appManager->isEnabledForUser('terms_of_service')) {
+			$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
+			if (!$tosSignatoryInserted) {
+				return $this->getErrorResponse($response, 'error_setting_tos', 400);
+			}
 		}
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
-- 
GitLab


From 8826d89c17270319cabf2ed24d332e6d7132ca98 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:17:23 +0530
Subject: [PATCH 003/185] check tos enabled

---
 lib/Controller/UserController.php | 270 +++++++++++++++---------------
 1 file changed, 139 insertions(+), 131 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 79995cda..ad5fe7ad 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -15,141 +15,149 @@ use OCA\EcloudAccounts\Service\UserService;
 use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
 
-class UserController extends ApiController {
-	/** @var UserService */
-	private $userService;
-	/** @var SignatoryService */
-	private $signatoryService;
+class UserController extends ApiController
+{
+    /** @var UserService */
+    private $userService;
+    /** @var SignatoryService */
+    private $signatoryService;
 
-	private $mailUsageMapper;
+    private $mailUsageMapper;
 
-	private $logger;
+    private $logger;
 
-	private $config;
+    private $config;
 
-	/** @var IAppManager */
+    /** @var IAppManager */
     private $appManager;
 
-	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->userService = $userService;
-		$this->appManager = $appManager;
-		$this->mailUsageMapper = $mailUsageMapper;
-		$this->logger = $logger;
-		$this->config = $config;
-		$this->signatoryService = $signatoryService;
-	}
-
-	/**
-	 * @CORS
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 */
-	public function userExists(string $token, string $uid): DataResponse {
-		$response = new DataResponse();
-		if (!$this->checkAppCredentials($token)) {
-			$response->setStatus(401);
-			return $response;
-		}
-
-		$exists = false;
-
-		if ($this->userService->userExists($uid)) {
-			$exists = true;
-		}
-
-		// 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);
-		}
-
-		$response->setData($exists);
-		return $response;
-	}
-
-	/**
-	 * @CORS
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB'): DataResponse {
-		$response = new DataResponse();
-
-		if (!$this->checkAppCredentials($token)) {
-			$response->setStatus(401);
-			return $response;
-		}
-
-		if (!$this->userService->userExists($uid)) {
-			$response->setStatus(404);
-			return $response;
-		}
-
-		$user = $this->userService->getUser($uid);
-
-		if (is_null($user)) {
-			$response->setStatus(404);
-			return $response;
-		}
-
-		$user->setEMailAddress($email);
-		$user->setQuota($quota);
-		if ($this->appManager->isEnabledForUser('terms_of_service')) {
-			$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
-			if (!$tosSignatoryInserted) {
-				return $this->getErrorResponse($response, 'error_setting_tos', 400);
-			}
-		}
-		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
-		if (!$recoveryEmailUpdated) {
-			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-		}
-		$hmeAliasAdded = $this->userService->addHMEAliasInConfig($uid, $hmeAlias);
-		if (!$hmeAliasAdded) {
-			return $this->getErrorResponse($response, 'error_adding_hme_alias', 400);
-		}
-		return $response;
-	}
-
-	/**
-	 * @CORS
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 */
-	public function setMailQuotaUsage(array $usage, string $token): DataResponse {
-		$response = new DataResponse();
-		if (!$this->checkAppCredentials($token)) {
-			$response->setStatus(401);
-			return $response;
-		}
-		try {
-			// Explicitly cast input values to integer
-			$usage = array_map(fn ($value) => (int) $value, $usage);
-			$this->updateMailQuotaUsageInPreferences($usage);
-		} catch (Exception $e) {
-			$statusCode = 500;
-			$errorMessage = 'error_setting_mail_quota_usage';
-			$response = $this->getErrorResponse($response, $errorMessage, $statusCode);
-
-			$this->logger->error($errorMessage . ': ' . $e->getMessage());
-		}
-		return $response;
-	}
-
-	private function updateMailQuotaUsageInPreferences(array $usage) {
-		$this->mailUsageMapper->updateUsageInPreferences($usage);
-	}
-
-	private function getErrorResponse(DataResponse $response, string $error, int $code) {
-		$response->setStatus($code);
-		$response->setData(['error' => $error]);
-		return $response;
-	}
-
-	private function checkAppCredentials(string $token): bool {
-		$ecloud_accounts_secret = $this->userService->getConfigValue('secret');
-		return hash_equals($ecloud_accounts_secret, $token);
-	}
+    public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager)
+    {
+        parent::__construct($appName, $request);
+        $this->userService = $userService;
+        $this->appManager = $appManager;
+        $this->mailUsageMapper = $mailUsageMapper;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->signatoryService = $signatoryService;
+    }
+
+    /**
+     * @CORS
+     * @PublicPage
+     * @NoCSRFRequired
+     */
+    public function userExists(string $token, string $uid): DataResponse
+    {
+        $response = new DataResponse();
+        if (!$this->checkAppCredentials($token)) {
+            $response->setStatus(401);
+            return $response;
+        }
+
+        $exists = false;
+
+        if ($this->userService->userExists($uid)) {
+            $exists = true;
+        }
+
+        // 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);
+        }
+
+        $response->setData($exists);
+        return $response;
+    }
+
+    /**
+     * @CORS
+     * @PublicPage
+     * @NoCSRFRequired
+     */
+    public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB'): DataResponse
+    {
+        $response = new DataResponse();
+
+        if (!$this->checkAppCredentials($token)) {
+            $response->setStatus(401);
+            return $response;
+        }
+
+        if (!$this->userService->userExists($uid)) {
+            $response->setStatus(404);
+            return $response;
+        }
+
+        $user = $this->userService->getUser($uid);
+
+        if (is_null($user)) {
+            $response->setStatus(404);
+            return $response;
+        }
+
+        $user->setEMailAddress($email);
+        $user->setQuota($quota);
+        if ($this->appManager->isEnabledForUser('terms_of_service')) {
+            $tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
+            if (!$tosSignatoryInserted) {
+                return $this->getErrorResponse($response, 'error_setting_tos', 400);
+            }
+        }
+        $recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
+        if (!$recoveryEmailUpdated) {
+            return $this->getErrorResponse($response, 'error_setting_recovery', 400);
+        }
+        $hmeAliasAdded = $this->userService->addHMEAliasInConfig($uid, $hmeAlias);
+        if (!$hmeAliasAdded) {
+            return $this->getErrorResponse($response, 'error_adding_hme_alias', 400);
+        }
+        return $response;
+    }
+
+    /**
+     * @CORS
+     * @PublicPage
+     * @NoCSRFRequired
+     */
+    public function setMailQuotaUsage(array $usage, string $token): DataResponse
+    {
+        $response = new DataResponse();
+        if (!$this->checkAppCredentials($token)) {
+            $response->setStatus(401);
+            return $response;
+        }
+        try {
+            // Explicitly cast input values to integer
+            $usage = array_map(fn ($value) => (int) $value, $usage);
+            $this->updateMailQuotaUsageInPreferences($usage);
+        } catch (Exception $e) {
+            $statusCode = 500;
+            $errorMessage = 'error_setting_mail_quota_usage';
+            $response = $this->getErrorResponse($response, $errorMessage, $statusCode);
+
+            $this->logger->error($errorMessage . ': ' . $e->getMessage());
+        }
+        return $response;
+    }
+
+    private function updateMailQuotaUsageInPreferences(array $usage)
+    {
+        $this->mailUsageMapper->updateUsageInPreferences($usage);
+    }
+
+    private function getErrorResponse(DataResponse $response, string $error, int $code)
+    {
+        $response->setStatus($code);
+        $response->setData(['error' => $error]);
+        return $response;
+    }
+
+    private function checkAppCredentials(string $token): bool
+    {
+        $ecloud_accounts_secret = $this->userService->getConfigValue('secret');
+        return hash_equals($ecloud_accounts_secret, $token);
+    }
 }
-- 
GitLab


From b3dc8e1071aea5a8bbd90888a941033e00cb02f0 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:23:24 +0530
Subject: [PATCH 004/185] check tos enabled

---
 lib/Controller/UserController.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index ad5fe7ad..da5c95f0 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -21,6 +21,8 @@ class UserController extends ApiController
     private $userService;
     /** @var SignatoryService */
     private $signatoryService;
+	/** @var IAppManager */
+	private $appManager;
 
     private $mailUsageMapper;
 
@@ -28,9 +30,6 @@ class UserController extends ApiController
 
     private $config;
 
-    /** @var IAppManager */
-    private $appManager;
-
     public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager)
     {
         parent::__construct($appName, $request);
-- 
GitLab


From 613f315f34fb467755059b77f896bfa11af3a1c2 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:24:52 +0530
Subject: [PATCH 005/185] check tos enabled

---
 lib/Controller/UserController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index da5c95f0..e56a7417 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -100,11 +100,11 @@ class UserController extends ApiController
         $user->setEMailAddress($email);
         $user->setQuota($quota);
         if ($this->appManager->isEnabledForUser('terms_of_service')) {
-            $tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
-            if (!$tosSignatoryInserted) {
-                return $this->getErrorResponse($response, 'error_setting_tos', 400);
-            }
-        }
+			$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
+			if (!$tosSignatoryInserted) {
+				return $this->getErrorResponse($response, 'error_setting_tos', 400);
+			}
+		}
         $recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
         if (!$recoveryEmailUpdated) {
             return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From 0b7a0ee4abe0f9c785e19799dd3eac43f2a59fc4 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:27:08 +0530
Subject: [PATCH 006/185] check tos enabled

---
 lib/Controller/UserController.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index e56a7417..405b4579 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -99,12 +99,6 @@ class UserController extends ApiController
 
         $user->setEMailAddress($email);
         $user->setQuota($quota);
-        if ($this->appManager->isEnabledForUser('terms_of_service')) {
-			$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
-			if (!$tosSignatoryInserted) {
-				return $this->getErrorResponse($response, 'error_setting_tos', 400);
-			}
-		}
         $recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
         if (!$recoveryEmailUpdated) {
             return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From 2f139da1ccc5af76bf7fee9b03d96f10d1e3cd04 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:29:08 +0530
Subject: [PATCH 007/185] check tos enabled

---
 lib/Controller/UserController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 405b4579..d1f461e2 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -21,8 +21,8 @@ class UserController extends ApiController
     private $userService;
     /** @var SignatoryService */
     private $signatoryService;
-	/** @var IAppManager */
-	private $appManager;
+    /** @var IAppManager */
+    private $appManager;
 
     private $mailUsageMapper;
 
-- 
GitLab


From 6dfd3305c9c79217c9285357d5e3d84cbaa16ec1 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:30:46 +0530
Subject: [PATCH 008/185] check tos enabled

---
 lib/Controller/UserController.php | 270 +++++++++++++++---------------
 1 file changed, 131 insertions(+), 139 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index d1f461e2..06ad0a37 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -10,147 +10,139 @@ use OCP\ILogger;
 use OCP\IConfig;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\App\IAppManager;
 use OCA\EcloudAccounts\Service\UserService;
 use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
 
-class UserController extends ApiController
-{
-    /** @var UserService */
-    private $userService;
-    /** @var SignatoryService */
-    private $signatoryService;
-    /** @var IAppManager */
-    private $appManager;
-
-    private $mailUsageMapper;
-
-    private $logger;
-
-    private $config;
-
-    public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager)
-    {
-        parent::__construct($appName, $request);
-        $this->userService = $userService;
-        $this->appManager = $appManager;
-        $this->mailUsageMapper = $mailUsageMapper;
-        $this->logger = $logger;
-        $this->config = $config;
-        $this->signatoryService = $signatoryService;
-    }
-
-    /**
-     * @CORS
-     * @PublicPage
-     * @NoCSRFRequired
-     */
-    public function userExists(string $token, string $uid): DataResponse
-    {
-        $response = new DataResponse();
-        if (!$this->checkAppCredentials($token)) {
-            $response->setStatus(401);
-            return $response;
-        }
-
-        $exists = false;
-
-        if ($this->userService->userExists($uid)) {
-            $exists = true;
-        }
-
-        // 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);
-        }
-
-        $response->setData($exists);
-        return $response;
-    }
-
-    /**
-     * @CORS
-     * @PublicPage
-     * @NoCSRFRequired
-     */
-    public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB'): DataResponse
-    {
-        $response = new DataResponse();
-
-        if (!$this->checkAppCredentials($token)) {
-            $response->setStatus(401);
-            return $response;
-        }
-
-        if (!$this->userService->userExists($uid)) {
-            $response->setStatus(404);
-            return $response;
-        }
-
-        $user = $this->userService->getUser($uid);
-
-        if (is_null($user)) {
-            $response->setStatus(404);
-            return $response;
-        }
-
-        $user->setEMailAddress($email);
-        $user->setQuota($quota);
-        $recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
-        if (!$recoveryEmailUpdated) {
-            return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-        }
-        $hmeAliasAdded = $this->userService->addHMEAliasInConfig($uid, $hmeAlias);
-        if (!$hmeAliasAdded) {
-            return $this->getErrorResponse($response, 'error_adding_hme_alias', 400);
-        }
-        return $response;
-    }
-
-    /**
-     * @CORS
-     * @PublicPage
-     * @NoCSRFRequired
-     */
-    public function setMailQuotaUsage(array $usage, string $token): DataResponse
-    {
-        $response = new DataResponse();
-        if (!$this->checkAppCredentials($token)) {
-            $response->setStatus(401);
-            return $response;
-        }
-        try {
-            // Explicitly cast input values to integer
-            $usage = array_map(fn ($value) => (int) $value, $usage);
-            $this->updateMailQuotaUsageInPreferences($usage);
-        } catch (Exception $e) {
-            $statusCode = 500;
-            $errorMessage = 'error_setting_mail_quota_usage';
-            $response = $this->getErrorResponse($response, $errorMessage, $statusCode);
-
-            $this->logger->error($errorMessage . ': ' . $e->getMessage());
-        }
-        return $response;
-    }
-
-    private function updateMailQuotaUsageInPreferences(array $usage)
-    {
-        $this->mailUsageMapper->updateUsageInPreferences($usage);
-    }
-
-    private function getErrorResponse(DataResponse $response, string $error, int $code)
-    {
-        $response->setStatus($code);
-        $response->setData(['error' => $error]);
-        return $response;
-    }
-
-    private function checkAppCredentials(string $token): bool
-    {
-        $ecloud_accounts_secret = $this->userService->getConfigValue('secret');
-        return hash_equals($ecloud_accounts_secret, $token);
-    }
+class UserController extends ApiController {
+	/** @var UserService */
+	private $userService;
+	/** @var SignatoryService */
+	private $signatoryService;
+
+	private $mailUsageMapper;
+
+	private $logger;
+
+	private $config;
+
+	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService) {
+		parent::__construct($appName, $request);
+		$this->userService = $userService;
+		$this->mailUsageMapper = $mailUsageMapper;
+		$this->logger = $logger;
+		$this->config = $config;
+		$this->signatoryService = $signatoryService;
+	}
+
+	/**
+	 * @CORS
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 */
+	public function userExists(string $token, string $uid): DataResponse {
+		$response = new DataResponse();
+		if (!$this->checkAppCredentials($token)) {
+			$response->setStatus(401);
+			return $response;
+		}
+
+		$exists = false;
+
+		if ($this->userService->userExists($uid)) {
+			$exists = true;
+		}
+
+		// 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);
+		}
+
+		$response->setData($exists);
+		return $response;
+	}
+
+	/**
+	 * @CORS
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 */
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB'): DataResponse {
+		$response = new DataResponse();
+
+		if (!$this->checkAppCredentials($token)) {
+			$response->setStatus(401);
+			return $response;
+		}
+
+		if (!$this->userService->userExists($uid)) {
+			$response->setStatus(404);
+			return $response;
+		}
+
+		$user = $this->userService->getUser($uid);
+
+		if (is_null($user)) {
+			$response->setStatus(404);
+			return $response;
+		}
+
+		$user->setEMailAddress($email);
+		$user->setQuota($quota);
+		$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
+		if (!$tosSignatoryInserted) {
+			return $this->getErrorResponse($response, 'error_setting_tos', 400);
+		}
+		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
+		if (!$recoveryEmailUpdated) {
+			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
+		}
+		$hmeAliasAdded = $this->userService->addHMEAliasInConfig($uid, $hmeAlias);
+		if (!$hmeAliasAdded) {
+			return $this->getErrorResponse($response, 'error_adding_hme_alias', 400);
+		}
+		return $response;
+	}
+
+	/**
+	 * @CORS
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 */
+	public function setMailQuotaUsage(array $usage, string $token): DataResponse {
+		$response = new DataResponse();
+		if (!$this->checkAppCredentials($token)) {
+			$response->setStatus(401);
+			return $response;
+		}
+		try {
+			// Explicitly cast input values to integer
+			$usage = array_map(fn ($value) => (int) $value, $usage);
+			$this->updateMailQuotaUsageInPreferences($usage);
+		} catch (Exception $e) {
+			$statusCode = 500;
+			$errorMessage = 'error_setting_mail_quota_usage';
+			$response = $this->getErrorResponse($response, $errorMessage, $statusCode);
+
+			$this->logger->error($errorMessage . ': ' . $e->getMessage());
+		}
+		return $response;
+	}
+
+	private function updateMailQuotaUsageInPreferences(array $usage) {
+		$this->mailUsageMapper->updateUsageInPreferences($usage);
+	}
+
+	private function getErrorResponse(DataResponse $response, string $error, int $code) {
+		$response->setStatus($code);
+		$response->setData(['error' => $error]);
+		return $response;
+	}
+
+	private function checkAppCredentials(string $token): bool {
+		$ecloud_accounts_secret = $this->userService->getConfigValue('secret');
+		return hash_equals($ecloud_accounts_secret, $token);
+	}
 }
-- 
GitLab


From 0f1499e185fba093fe3a79c4c903e3105a2ce8e4 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:34:05 +0530
Subject: [PATCH 009/185] added app manager

---
 lib/Controller/UserController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 06ad0a37..1635fec7 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -10,6 +10,7 @@ use OCP\ILogger;
 use OCP\IConfig;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
+use App\IAppManager;
 use OCA\EcloudAccounts\Service\UserService;
 use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
@@ -19,6 +20,8 @@ class UserController extends ApiController {
 	private $userService;
 	/** @var SignatoryService */
 	private $signatoryService;
+	/** @var IAppManager */
+	private $appManager;
 
 	private $mailUsageMapper;
 
-- 
GitLab


From 1690f897d1d102b7459dd776f07aaa6522f7e805 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:36:54 +0530
Subject: [PATCH 010/185] added app manager

---
 lib/Controller/UserController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 1635fec7..5d00575d 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -29,13 +29,14 @@ class UserController extends ApiController {
 
 	private $config;
 
-	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService) {
+	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager) {
 		parent::__construct($appName, $request);
 		$this->userService = $userService;
 		$this->mailUsageMapper = $mailUsageMapper;
 		$this->logger = $logger;
 		$this->config = $config;
 		$this->signatoryService = $signatoryService;
+		$this->appManager = $appManager;
 	}
 
 	/**
-- 
GitLab


From 82c0cf868e362e3fad53a32d7dcce84495a2d65d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:38:05 +0530
Subject: [PATCH 011/185] check enabled

---
 lib/Controller/UserController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 5d00575d..87369b17 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -95,9 +95,11 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-		$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
-		if (!$tosSignatoryInserted) {
-			return $this->getErrorResponse($response, 'error_setting_tos', 400);
+		if ($this->appManager->isEnabledForUser('terms_of_service')) {
+			$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
+			if (!$tosSignatoryInserted) {
+				return $this->getErrorResponse($response, 'error_setting_tos', 400);
+			}
 		}
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
-- 
GitLab


From dd11d66facfa197e4423c55e2a98bb4a5a5e110b Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 28 Apr 2023 10:45:24 +0530
Subject: [PATCH 012/185] check enabled

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 87369b17..ee56d1a6 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -10,7 +10,7 @@ use OCP\ILogger;
 use OCP\IConfig;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
-use App\IAppManager;
+use OCP\App\IAppManager;
 use OCA\EcloudAccounts\Service\UserService;
 use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
-- 
GitLab


From 5c3cc6ddfe5fb2dd39d1a4b114847a4a202caad8 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 2 May 2023 16:45:03 +0530
Subject: [PATCH 013/185] tos accepted flag set

---
 lib/Controller/UserController.php | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index ee56d1a6..c750cbd5 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -10,18 +10,12 @@ use OCP\ILogger;
 use OCP\IConfig;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\App\IAppManager;
 use OCA\EcloudAccounts\Service\UserService;
-use OCA\TermsOfService\Service\SignatoryService ;
 use OCA\EcloudAccounts\Db\MailUsageMapper;
 
 class UserController extends ApiController {
 	/** @var UserService */
 	private $userService;
-	/** @var SignatoryService */
-	private $signatoryService;
-	/** @var IAppManager */
-	private $appManager;
 
 	private $mailUsageMapper;
 
@@ -29,14 +23,12 @@ class UserController extends ApiController {
 
 	private $config;
 
-	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, SignatoryService $signatoryService, IAppManager $appManager) {
+	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper) {
 		parent::__construct($appName, $request);
 		$this->userService = $userService;
 		$this->mailUsageMapper = $mailUsageMapper;
 		$this->logger = $logger;
 		$this->config = $config;
-		$this->signatoryService = $signatoryService;
-		$this->appManager = $appManager;
 	}
 
 	/**
@@ -73,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB'): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', 84,72:  * - postLogin(\OC\User\User $user, string $loginName, string $password, boolean $tosAccepted)): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
@@ -95,12 +87,7 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-		if ($this->appManager->isEnabledForUser('terms_of_service')) {
-			$tosSignatoryInserted = $this->signatoryService->tosSignatoryInsert($uid);
-			if (!$tosSignatoryInserted) {
-				return $this->getErrorResponse($response, 'error_setting_tos', 400);
-			}
-		}
+		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', $tosAccepted);
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
 			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From d452e3ea217d2feae66172b9d200c8a7b8be0d73 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 2 May 2023 16:46:04 +0530
Subject: [PATCH 014/185] tos accepted flag set

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index c750cbd5..6bd33592 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', 84,72:  * - postLogin(\OC\User\User $user, string $loginName, string $password, boolean $tosAccepted)): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', boolean $tosAccepted = 'false'): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
-- 
GitLab


From a08407ac26553f6372bad5eddb959c79fb6ec510 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 2 May 2023 16:47:25 +0530
Subject: [PATCH 015/185] tos accepted flag set

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 6bd33592..5373f1ea 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', boolean $tosAccepted = 'false'): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', boolean $tosAccepted = false): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
-- 
GitLab


From 83a627c3ed965af9cad857e71638c8ab5d472a03 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 2 May 2023 17:00:47 +0530
Subject: [PATCH 016/185] tos accepted flag set

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 5373f1ea..62f0dcd9 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', boolean $tosAccepted = false): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB',  bool $tosAccepted = false): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
-- 
GitLab


From f9e7e7bb5d77777f56ab2172a5256de733787b11 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 2 May 2023 17:02:48 +0530
Subject: [PATCH 017/185] tos accepted flag set

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 62f0dcd9..94f6b1cc 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB',  bool $tosAccepted = false): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted = false): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
-- 
GitLab


From 9f13fa9e679bb6130d41f40a10ffc48d5dd744a9 Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Wed, 3 May 2023 00:32:25 +0530
Subject: [PATCH 018/185] fix setuserval function

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 94f6b1cc..72719e7a 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -87,7 +87,7 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', $tosAccepted);
+		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', strval($tosAccepted));
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
 			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From 9a35393622386871227b765b3a940c938f95a9f0 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 3 May 2023 11:31:54 +0530
Subject: [PATCH 019/185] tos accepted flag set

---
 lib/Controller/UserController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 94f6b1cc..e0f257e5 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted = false): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
-- 
GitLab


From 0f9230dd219627734149625655736ce041c0d464 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 8 May 2023 17:20:40 +0530
Subject: [PATCH 020/185]  applied suggestion

---
 lib/Controller/UserController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 10e5fd5c..975e7aa7 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -65,7 +65,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted = false): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
@@ -87,7 +87,7 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', strval($tosAccepted));
+		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
 			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-- 
GitLab


From d27387d71df9907c1dec23aba17c3f1249fc5eb3 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 15 May 2023 08:47:27 +0000
Subject: [PATCH 021/185] Refactor Beta user section to use VueJS instead of
 jQuery and PHP

---
 .gitlab-ci.yml                        |   2 +-
 appinfo/info.xml                      |   2 +-
 appinfo/routes.php                    |   4 +-
 css/style.css                         |  68 --------
 lib/Controller/BetaUserController.php |   5 -
 lib/Service/BetaUserService.php       |  63 +++++++
 lib/Settings/BetaUserSetting.php      |  56 ++----
 package-lock.json                     |   4 +-
 package.json                          |   2 +-
 src/BecomeBetaUser.vue                | 239 ++++++++++++++++++++++++++
 src/beta-user-setting.js              |  90 +---------
 templates/become_beta_user.php        |  28 ---
 templates/beta.php                    |   4 +
 templates/opt_out_beta_user.php       |  49 ------
 14 files changed, 335 insertions(+), 281 deletions(-)
 delete mode 100644 css/style.css
 create mode 100644 lib/Service/BetaUserService.php
 create mode 100644 src/BecomeBetaUser.vue
 delete mode 100644 templates/become_beta_user.php
 create mode 100644 templates/beta.php
 delete mode 100644 templates/opt_out_beta_user.php

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a29b6313..6119917f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-    TO_PACKAGE: 'appinfo css l10n lib templates js img'
+    TO_PACKAGE: 'appinfo l10n lib templates js img'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
diff --git a/appinfo/info.xml b/appinfo/info.xml
index a695b9fa..dc5aa25c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.0.0</version>
+    <version>3.1.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index b4eb6822..24d57502 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -16,11 +16,11 @@ return ['routes' => [
 	],
 	[
 		'name' => 'beta_user#remove_user_in_group',
-		'url' => '/beta/update', 'verb' => 'DELETE'
+		'url' => '/beta/remove', 'verb' => 'GET'
 	],
 	[
 		'name' => 'beta_user#add_user_in_group',
-		'url' => '/beta/update', 'verb' => 'POST'
+		'url' => '/beta/add', 'verb' => 'GET'
 	],
 	[
 		'name' => 'beta_user#submit_issue',
diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index 1c850421..00000000
--- a/css/style.css
+++ /dev/null
@@ -1,68 +0,0 @@
-.alert {
-	position: relative;
-	margin-top: 1rem;
-	margin-bottom: 1rem;
-	border: 1px solid transparent;
-	border-radius: 0.25rem;
-	width: fit-content;
-}
-
-.alert-success {
-	color: #155724;
-	background-color: #d4edda;
-	border-color: #c3e6cb;
-	padding: 0.75rem 1.25rem;
-}
-
-.alert-fail {
-	color: #721c24;
-	background-color: #f8d7da;
-	border-color: #f5c6cb;
-	padding: 0.75rem 1.25rem;
-}
-
-#issue-submit-form #title,
-#issue-submit-form textarea {
-	width: 450px;
-}
-
-#issue-submit-form textarea {
-	height: 100px;
-}
-
-#issue-submit-form textarea:hover {
-	border-color: var(--color-primary-element) !important;
-}
-
-.mt-20 {
-	margin-top: 20px !important;
-}
-
-#beta-form .btn-optout {
-	background-color: white;
-	color: var(--color-delete);
-	border-color: var(--color-delete);
-}
-
-#beta-form .width300,
-#issue-submit-form .width300 {
-	width: 300px;
-}
-
-.color-red {
-	color: red;
-}
-
-ul.beta-apps {
-	list-style: none;
-	margin-left: 0;
-	padding-left: 1em;
-}
-
-ul.beta-apps > li:before {
-	display: inline-block;
-	content: '-';
-	width: 1em;
-	margin-left: -1em;
-}
-
diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index ac6b06c6..be1b970f 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -12,7 +12,6 @@ use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\IGroupManager;
 use OCP\IUserSession;
-use OCP\ILogger;
 use OCP\Mail\IMailer;
 use OCP\Util;
 
@@ -29,7 +28,6 @@ class BetaUserController extends Controller {
 		$AppName,
 		IRequest $request,
 		IConfig $config,
-		ILogger $logger,
 		IUserManager $userManager,
 		IGroupManager $groupManager,
 		IUserSession $userSession,
@@ -39,7 +37,6 @@ class BetaUserController extends Controller {
 		$this->appName = $AppName;
 		$this->request = $request;
 		$this->config = $config;
-		$this->logger = $logger;
 		$this->userManager = $userManager;
 		$this->userSession = $userSession;
 		$this->groupManager = $groupManager;
@@ -85,7 +82,6 @@ class BetaUserController extends Controller {
 		$fromEmail = $user->getEMailAddress();
 		$fromName = $user->getDisplayName();
 
-
 		$template = $this->mailer->createEMailTemplate('betauser.SubmitGitIssue', []);
 		$template->addHeader();
 		$template->setSubject($title);
@@ -98,7 +94,6 @@ class BetaUserController extends Controller {
 		$message->useTemplate($template);
 
 		$this->mailer->send($message);
-
 		return true;
 	}
 }
diff --git a/lib/Service/BetaUserService.php b/lib/Service/BetaUserService.php
new file mode 100644
index 00000000..3f6f84d2
--- /dev/null
+++ b/lib/Service/BetaUserService.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Service;
+
+use OCP\IConfig;
+use OCP\IGroupManager;
+use OCP\IUserSession;
+use OCP\App\IAppManager;
+
+class BetaUserService {
+	private $config;
+	private $appManager;
+	protected $groupManager;
+	private $userSession;
+
+	public function __construct(
+		IConfig $config,
+		IGroupManager $groupManager,
+		IUserSession $userSession,
+		IAppManager $appManager
+	) {
+		$this->config = $config;
+		$this->groupManager = $groupManager;
+		$this->userSession = $userSession;
+		$this->appManager = $appManager;
+	}
+		
+	/**
+	 * Method getBetaUserStatus used to get beta user status
+	 *
+	 * @return void
+	 */
+	public function getBetaUserStatus() {
+		$uid = $this->userSession->getUser()->getUID();
+		$betaGroupName = $this->config->getSystemValue("beta_group_name");
+		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Method getBetaApps used to get beta apps
+	 *
+	 * @return void
+	 */
+	public function getBetaApps() {
+		$betaGroupName = $this->config->getSystemValue("beta_group_name");
+		$group = $this->groupManager->get($betaGroupName);
+		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
+		$betaApps = [];
+		foreach ($betaGroupApps as $app) {
+			$appEnabledGroups = $this->config->getAppValue($app, 'enabled', 'no');
+			if (str_contains($appEnabledGroups, $betaGroupName)) {
+				$info = $this->appManager->getAppInfo($app);
+				$betaApps[] = $info['name'];
+			}
+		}
+		return $betaApps;
+	}
+}
diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 696d9433..79c6b95c 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -6,66 +6,42 @@ namespace OCA\EcloudAccounts\Settings;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IGroupManager;
-use OCP\IUserSession;
 use OCP\Settings\ISettings;
-use OCP\Util;
 use OCP\IConfig;
-use OCP\App\IAppManager;
 use OCP\ILogger;
+use OCP\AppFramework\Services\IInitialState;
+use OCA\EcloudAccounts\Service\BetaUserService;
 
 class BetaUserSetting implements ISettings {
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
 	protected $groupManager;
-
-	/** @var Util */
-	protected $util;
-
-	private $appName;
-
-	private $appManager;
-
-	/** @var ILogger */
 	private $logger;
+	private $initialState;
+	private $config;
+	private $appName;
+	private $betaUserService;
 
 	public function __construct(
 		$appName,
-		IUserSession $userSession,
 		IGroupManager $groupManager,
-		Util $util,
 		IConfig $config,
-		IAppManager $appManager,
-		ILogger $logger
+		ILogger $logger,
+		IInitialState $initialState,
+		BetaUserService $betaUserService
 	) {
-		$this->userSession = $userSession;
 		$this->groupManager = $groupManager;
 		$this->appName = $appName;
 		$this->config = $config;
-		$this->util = $util;
-		$this->appManager = $appManager;
 		$this->logger = $logger;
+		$this->initialState = $initialState;
+		$this->betaUserService = $betaUserService;
 	}
 
 	public function getForm(): TemplateResponse {
-		$uid = $this->userSession->getUser()->getUID();
-		$betaGroupName = $this->config->getSystemValue("beta_group_name");
-		$this->util->addScript($this->appName, $this->appName . '-beta-user-setting');
-		$group = $this->groupManager->get($betaGroupName);
-		$betaGroupApps = $this->appManager->getEnabledAppsForGroup($group);
-		$betaApps = [];
-		foreach ($betaGroupApps as $app) {
-			$appEnabledGroups = $this->config->getAppValue($app, 'enabled', 'no');
-			if (str_contains($appEnabledGroups, $betaGroupName)) {
-				$info = $this->appManager->getAppInfo($app);
-				$betaApps[] = $info['name'];
-			}
-		}
-		if ($this->groupManager->isInGroup($uid, $betaGroupName)) {
-			return new TemplateResponse($this->appName, 'opt_out_beta_user', ['betaApps' => $betaApps], '');
-		}
-		return new TemplateResponse($this->appName, 'become_beta_user', ['betaApps' => $betaApps], '');
+		$betaUserStatus = $this->betaUserService->getBetaUserStatus();
+		$betaApps = $this->betaUserService->getBetaApps();
+		$this->initialState->provideInitialState('is_beta_user', $betaUserStatus);
+		$this->initialState->provideInitialState('beta_apps', $betaApps);
+		return new TemplateResponse($this->appName, 'beta', ['appName' => $this->appName], '');
 	}
 
 	public function getSection(): ?string {
diff --git a/package-lock.json b/package-lock.json
index a153f139..5077e57f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "ecloud-accounts",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ecloud-accounts",
-			"version": "3.0.0",
+			"version": "3.1.0",
 			"dependencies": {
 				"@nextcloud/axios": "^2.1.0",
 				"@nextcloud/dialogs": "^3.2.0",
diff --git a/package.json b/package.json
index c3b7f007..83b8a14f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ecloud-accounts",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "App for ecloud account management.",
 	"repository": {
 		"type": "git",
diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
new file mode 100644
index 00000000..1fbb3759
--- /dev/null
+++ b/src/BecomeBetaUser.vue
@@ -0,0 +1,239 @@
+<template>
+	<SettingsSection>
+		<div v-if="!isBetaUser" class="section padding-0">
+			<h2>
+				{{
+					t(appName, 'Do you want to become a beta user?')
+				}}
+			</h2>
+			<p class="settings-hint">
+				{{
+					t(appName, 'You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')
+				}}
+			</p>
+			<p class="settings-hint">
+				{{
+					t(appName, 'To get a preview of our new features you need to become part of our beta users.To do so, simply click on the button below.You can opt out of beta features at anytime.')
+				}}
+			</p>
+			<div id="groups" class="aliases-info">
+				<input type="button"
+					class="width300"
+					:value="t(appName, 'Become a beta user')"
+					@click="becomeBetaUser()">
+			</div>
+			<div class="margin-top-10">
+				<p class="settings-hint">
+					{{ t(appName, 'Here is the list of currently available beta features: ') }}
+				</p>
+				<ul class="beta-apps settings-hint">
+					<li v-for="app in betaApps" :key="app">
+						{{ app }}
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div v-if="isBetaUser" class="section padding-0">
+			<h2>
+				{{ t(appName,'You are part of the beta users.') }}
+			</h2>
+			<p class="settings-hint">
+				{{ t(appName,'Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.') }}
+			</p>
+			<div>
+				<p class="settings-hint">
+					{{ t(appName,'Here is the list of currently available beta features:') }}
+				</p>
+				<ul class="beta-apps settings-hint">
+					<li v-for="app in betaApps" :key="app">
+						{{ app }}
+					</li>
+				</ul>
+			</div>
+			<form id="issue-submit-form" class="mt-20" @submit="submitFeedback">
+				<p>
+					<label id="title_label" for="title">
+						<b>
+							{{ t(appName,'Title') }} <sup class="color-red">*</sup>
+						</b>
+					</label>
+				</p>
+				<p>
+					<input id="title"
+						v-model="title"
+						type="text"
+						:placeholder="t(appName, 'Summary of your feedback')">
+				</p>
+				<p class="mt-20">
+					<label id="description_label" for="description">
+						<b>
+							{{ t(appName,'Description') }} <sup class="color-red">*</sup>
+						</b>
+					</label>
+				</p>
+				<p>
+					<textarea id="description" v-model="description" :placeholder="t(appName, 'Please give us as many details as possible')" />
+				</p>
+				<p class="mt-20">
+					<input type="submit"
+						:value="t(appName, 'Submit')"
+						class="width300"
+						:disabled="isDisabled">
+				</p>
+			</form>
+			<p class="settings-hint mt-20">
+				{{ t(appName,'Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!') }}
+			</p>
+			<div id="beta-form">
+				<input type="submit"
+					class="width300 btn-optout"
+					:value="t(appName, 'Opt out of beta features')"
+					@click="optOutFromBetaUser()">
+			</div>
+		</div>
+	</SettingsSection>
+</template>
+
+<script>
+import { loadState } from '@nextcloud/initial-state'
+import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
+import Axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+import { showSuccess, showError } from '@nextcloud/dialogs'
+import { translate as t } from '@nextcloud/l10n'
+const APPLICATION_NAME = 'ecloud-accounts'
+
+export default {
+	name: 'BecomeBetaUser',
+	components: {
+		SettingsSection,
+	},
+	data() {
+		return {
+			appName: APPLICATION_NAME,
+			isBetaUser: loadState(APPLICATION_NAME, 'is_beta_user'),
+			betaApps: loadState(APPLICATION_NAME, 'beta_apps'),
+			title: '',
+			description: '',
+		}
+	},
+	computed: {
+		isDisabled() {
+			return (this.description === '' || this.title === '')
+		},
+	},
+	methods: {
+		async becomeBetaUser() {
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/beta/add`
+				)
+				await Axios.get(url)
+				this.isBetaUser = true
+				showSuccess(t(this.appName, 'Congratulations! You\'ve successfully been added to the beta users.'))
+			} catch (e) {
+				showError(t(this.appName, 'Something went wrong.'))
+			}
+		},
+		async optOutFromBetaUser() {
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/beta/remove`
+				)
+				await Axios.get(url)
+				this.isBetaUser = false
+				showSuccess(t(this.appName, 'You no longer have access to experimental features.'))
+			} catch (e) {
+				showError(t(this.appName, 'Something went wrong.'))
+			}
+		},
+		async submitFeedback(e) {
+			e.preventDefault()
+			try {
+				const url = generateUrl(
+					`/apps/${this.appName}/issue/submit`
+				)
+				await Axios.post(url, { title: this.title, description: this.description })
+				showSuccess(t(this.appName, 'Issue submitted successfully.'))
+				this.description = ''
+				this.title = ''
+			} catch (e) {
+				showError(t(this.appName, 'Something went wrong.'))
+			}
+		},
+	},
+}
+</script>
+<style scoped>
+.alert {
+	position: relative;
+	margin-top: 1rem;
+	margin-bottom: 1rem;
+	border: 1px solid transparent;
+	border-radius: 0.25rem;
+	width: fit-content;
+}
+
+.alert-success {
+	color: #155724;
+	background-color: #d4edda;
+	border-color: #c3e6cb;
+	padding: 0.75rem 1.25rem;
+}
+
+.alert-fail {
+	color: #721c24;
+	background-color: #f8d7da;
+	border-color: #f5c6cb;
+	padding: 0.75rem 1.25rem;
+}
+
+#issue-submit-form #title,
+#issue-submit-form textarea {
+	width: 450px;
+}
+
+#issue-submit-form textarea {
+	height: 100px;
+}
+
+#issue-submit-form textarea:hover {
+	border-color: var(--color-primary-element) !important;
+}
+
+.mt-20 {
+	margin-top: 20px !important;
+}
+
+#beta-form .btn-optout {
+	background-color: white;
+	color: var(--color-delete);
+	border-color: var(--color-delete);
+}
+
+#beta-form .width300,
+#issue-submit-form .width300 {
+	width: 300px;
+}
+
+.color-red {
+	color: red;
+}
+
+ul.beta-apps {
+	list-style: none;
+	margin-left: 0;
+	padding-left: 1em;
+}
+
+ul.beta-apps > li:before {
+	display: inline-block;
+	content: '-';
+	width: 1em;
+	margin-left: -1em;
+}
+
+.padding-0{
+	padding: 0;
+}
+</style>
diff --git a/src/beta-user-setting.js b/src/beta-user-setting.js
index dc4aee17..06e3d92f 100644
--- a/src/beta-user-setting.js
+++ b/src/beta-user-setting.js
@@ -1,86 +1,8 @@
-/*
- * Copyright 2022 - Murena SAS - tous droits réservés
- */
-/* global $ */
-$(function() {
-	$('#beta-form').submit(function(event) {
-		event.preventDefault()
+import Vue from 'vue'
+import './common.js'
+import BecomeBetaUser from './BecomeBetaUser.vue'
 
-		$('#beta-form [type="submit"]').attr('disabled', true)
-		const registerType = $('#beta').val()
-		const url_ = OC.generateUrl('/apps/ecloud-accounts/beta/update')
-
-		$.ajax({
-			url: url_,
-			method: (registerType === 'deregister') ? 'DELETE' : 'POST',
-			success(result) {
-				let message_ = ''
-				if (result) {
-					if (registerType === 'deregister') {
-						message_ = t('ecloud-accounts', 'You no longer have access to experimental features.')
-					} else {
-						message_ = t('ecloud-accounts', 'Congratulations! You\'ve successfully been added to the beta users.')
-					}
-					$('#message').addClass('alert-success')
-				} else {
-					message_ = t('ecloud-accounts', 'Something went wrong.')
-					$('#message').addClass('alert-fail')
-				}
-				$('#message').html(message_)
-				setTimeout(function() {
-					window.location.reload()
-				}, 2000)
-			},
-			error(request, msg, error) {
-				$('#message').addClass('alert-fail')
-				$('#message').html(t('ecloud-accounts', 'Something went wrong here.'))
-			},
-		})
-	})
-
-	$('#title, #description').on('input', function() {
-		$(this).parent().find('.error-msg').remove()
-	})
-
-	$('#issue-submit-form').submit(function(event) {
-		event.preventDefault()
-
-		const url_ = OC.generateUrl('/apps/ecloud-accounts/issue/submit')
-		$('.error-msg').remove()
-		if ($('#title').val() === '' || $('#description').val() === '') {
-			if ($('#title').val() === '') {
-				$('#title').parent().append('<div class="error-msg color-red width300">' + t('ecloud-accounts', 'Title is mandatory.') + '</div>')
-			}
-			if ($('#description').val() === '') {
-				$('#description').parent().append('<div class="error-msg color-red width300">' + t('ecloud-accounts', 'Description is mandatory.') + '</div>')
-			}
-			return
-		}
-		$('#issue-submit-form [type="submit"]').attr('disabled', true)
-
-		$.ajax({
-			url: url_,
-			method: 'POST',
-			data: $(this).serializeArray(),
-			success(result) {
-				let message_ = ''
-				if (result) {
-					message_ = t('ecloud-accounts', 'Issue submitted successfully.')
-					$('#issue_message').addClass('alert-success')
-				} else {
-					message_ = t('ecloud-accounts', 'Something went wrong.')
-					$('#issue_message').addClass('alert-fail')
-				}
-				$('#issue_message').html(message_)
-				setTimeout(function() {
-					window.location.reload()
-				}, 2000)
-
-			},
-			error(request, msg, error) {
-				$('#issue_message').addClass('alert-fail')
-				$('#issue_message').html(t('ecloud-accounts', 'Something went wrong.'))
-			},
-		})
-	})
+export default new Vue({
+	el: '#become-beta-user',
+	render: h => h(BecomeBetaUser),
 })
diff --git a/templates/become_beta_user.php b/templates/become_beta_user.php
deleted file mode 100644
index 6d9b82b0..00000000
--- a/templates/become_beta_user.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-style('ecloud-accounts', 'style');
-?>
-
-<div id="email-main">
-	<div id="email-content">
-		<div class="section">
-			<h2><?php p($l->t('Do you want to become a beta user?')); ?></h2>
-			<p class="settings-hint"><?php p($l->t('You want to experiment new features ahead of the others and provide feedback on them before and if they\'re released? This section is made for you!')) ?></p>
-			<p class="settings-hint"><?php p($l->t('To get a preview of our new features you need to become part of our beta users. To do so, simply click on the button below. You can opt out of beta features at anytime.')) ?></p>
-			<div id="groups" class="aliases-info">
-				<form id="beta-form">
-					<input name="beta" id="beta" type="hidden" value="register">
-					<input type="submit" class="width300" value="<?= p($l->t('Become a beta user')) ?>" />
-				</form>
-			</div>
-			<div id="message" class="alert"></div>
-			<div class="margin-top-10">
-				<p class="settings-hint"><?php p($l->t('Here is the list of currently available beta features:')) ?></p>
-				<ul class="beta-apps settings-hint">
-					<?php foreach ($betaApps as $app) { ?>
-					<li><?= $app ?></li>
-					<?php } ?>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/templates/beta.php b/templates/beta.php
new file mode 100644
index 00000000..cb0c5869
--- /dev/null
+++ b/templates/beta.php
@@ -0,0 +1,4 @@
+<?php
+script("ecloud-accounts", $appName . '-beta-user-setting');
+?>
+<div id="become-beta-user"></div>
\ No newline at end of file
diff --git a/templates/opt_out_beta_user.php b/templates/opt_out_beta_user.php
deleted file mode 100644
index d77c7698..00000000
--- a/templates/opt_out_beta_user.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-style('ecloud-accounts', 'style');
-?>
-
-<div id="email-main">
-	<div id="email-content">
-		<div class="section">
-			<h2><?php p($l->t('You are part of the beta users.')); ?></h2>
-			<p class="settings-hint">
-				<?php p($l->t('Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.')); ?>
-			</p>
-			<div>
-				<p class="settings-hint"><?php p($l->t('Here is the list of currently available beta features:')) ?></p>
-				<ul class="beta-apps settings-hint">
-					<?php foreach ($betaApps as $app) { ?>
-						<li><?= $app ?></li>
-					<?php } ?>
-				</ul>
-			</div>
-			<form id="issue-submit-form" class="mt-20">
-				<p>
-					<label for="title" id="title_label"><b><?php p($l->t('Title')); ?> <sup class="color-red">*</sup></b></label>
-				</p>
-				<p>
-					<input type="text" id="title" name="title" placeholder="<?php p($l->t('Summary of your feedback')); ?>">
-				</p>
-				<p class="mt-20">
-					<label for="description" id="description_label"><b><?php p($l->t('Description')); ?> <sup class="color-red">*</sup></b></label>
-				</p>
-				<p>
-					<textarea id="description" name="description" placeholder="<?php p($l->t('Please give us as many details as possible')); ?>"></textarea>
-				</p>
-				<p class="mt-20">
-					<input type="submit" value="<?php p($l->t('Submit')) ?>" class="width300" />
-				</p>
-				<div id="issue_message" class="alert"></div>
-			</form>
-			<p class="settings-hint mt-20"><?php p($l->t('Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!')) ?></p>
-
-			<div id="groups" class="aliases-info">
-				<form id="beta-form">
-					<input name="beta" id="beta" type="hidden" value="deregister">
-					<input type="submit" class="width300 btn-optout" value="<?= p($l->t('Opt out of beta features')) ?>" />
-				</form>
-			</div>
-			<div id="message" class="alert"></div>
-		</div>
-	</div>
-</div>
-- 
GitLab


From fbea7e772e2f13888497245332e9f36945f2f26b Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 16 May 2023 09:39:23 +0000
Subject: [PATCH 022/185] change in route for beta section

---
 appinfo/routes.php     | 4 ++--
 src/BecomeBetaUser.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 24d57502..761120a8 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -16,11 +16,11 @@ return ['routes' => [
 	],
 	[
 		'name' => 'beta_user#remove_user_in_group',
-		'url' => '/beta/remove', 'verb' => 'GET'
+		'url' => '/beta/remove', 'verb' => 'DELETE'
 	],
 	[
 		'name' => 'beta_user#add_user_in_group',
-		'url' => '/beta/add', 'verb' => 'GET'
+		'url' => '/beta/add', 'verb' => 'POST'
 	],
 	[
 		'name' => 'beta_user#submit_issue',
diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index 1fbb3759..e798e33c 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -128,7 +128,7 @@ export default {
 				const url = generateUrl(
 					`/apps/${this.appName}/beta/add`
 				)
-				await Axios.get(url)
+				await Axios.post(url, {})
 				this.isBetaUser = true
 				showSuccess(t(this.appName, 'Congratulations! You\'ve successfully been added to the beta users.'))
 			} catch (e) {
@@ -140,7 +140,7 @@ export default {
 				const url = generateUrl(
 					`/apps/${this.appName}/beta/remove`
 				)
-				await Axios.get(url)
+				await Axios.delete(url)
 				this.isBetaUser = false
 				showSuccess(t(this.appName, 'You no longer have access to experimental features.'))
 			} catch (e) {
-- 
GitLab


From cdc44b5042399166f3a1866a28ba5ac66a5979bb Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 6 Jun 2023 17:09:35 +0000
Subject: [PATCH 023/185] Add multi-shop support

---
 appinfo/info.xml                              |   4 +-
 appinfo/routes.php                            |   4 +-
 l10n/de.js                                    |   5 +-
 l10n/de.json                                  |   5 +-
 l10n/en.js                                    |   7 +-
 l10n/en.json                                  |   5 +-
 l10n/es.js                                    |   5 +-
 l10n/es.json                                  |   5 +-
 l10n/fr.js                                    |   7 +-
 l10n/fr.json                                  |   7 +-
 l10n/it.js                                    |   5 +-
 l10n/it.json                                  |   5 +-
 lib/Controller/ShopAccountController.php      |  70 +------
 lib/Listeners/BeforeUserDeletedListener.php   |  18 +-
 lib/Service/ShopAccountService.php            | 115 ++++++-----
 ...sonal.php => DeleteShopAccountSetting.php} |  19 +-
 ...tings.vue => DeleteShopAccountSetting.vue} | 192 +++++++-----------
 src/delete-account-listeners.js               |  16 +-
 ...onal.js => delete-shop-account-setting.js} |   2 +-
 webpack.config.js                             |   2 +-
 20 files changed, 211 insertions(+), 287 deletions(-)
 rename lib/Settings/{Personal.php => DeleteShopAccountSetting.php} (75%)
 rename src/{PersonalSettings.vue => DeleteShopAccountSetting.vue} (55%)
 rename src/{personal.js => delete-shop-account-setting.js} (69%)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index dc5aa25c..1bc21400 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.1.0</version>
+    <version>3.2.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
@@ -20,7 +20,7 @@
         <nextcloud min-version="24" max-version="25"/>
     </dependencies>
 	<settings>
-		<personal>OCA\EcloudAccounts\Settings\Personal</personal>
+		<personal>OCA\EcloudAccounts\Settings\DeleteShopAccountSetting</personal>
 		<personal>OCA\EcloudAccounts\Settings\BetaUserSetting</personal>
 		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
 	</settings>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 761120a8..aedd9131 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -6,9 +6,7 @@ return ['routes' => [
 	['name' => 'user#set_mail_quota_usage', 'url' => '/api/set_mail_quota_usage', 'verb' => 'POST'],
 	['name' => 'shop_account#set_shop_email_post_delete', 'url' => '/shop-accounts/set_shop_email_post_delete', 'verb' => 'POST' ],
 	['name' => 'shop_account#set_shop_delete_preference', 'url' => '/shop-accounts/set_shop_delete_preference', 'verb' => 'POST' ],
-	['name' => 'shop_account#get_order_info', 'url' => '/shop-accounts/order_info', 'verb' => 'GET'],
-	['name' => 'shop_account#get_subscription_info', 'url' => '/shop-accounts/subscription_info', 'verb' => 'GET'],
-	['name' => 'shop_account#get_shop_user', 'url' => '/shop-accounts/user', 'verb' => 'GET'],
+	['name' => 'shop_account#get_shop_users', 'url' => '/shop-accounts/users', 'verb' => 'GET'],
 	['name' => 'shop_account#check_shop_email_post_delete', 'url' => '/shop-accounts/check_shop_email_post_delete', 'verb' => 'GET'],
 	[
 		'name' => 'user#preflighted_cors', 'url' => '/api/{path}',
diff --git a/l10n/de.js b/l10n/de.js
index d6e8e051..46823807 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -4,10 +4,11 @@ OC.L10N.register(
 		"Email Address": "E-Mail Adresse",
 		"Options": "Optionen",
 		"We are going to proceed with your cloud account suppression.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren.",
-		"Check the box below if you also want to delete the associated shop account.": "Markieren Sie das Kästchen unten, wenn Sie auch das zugehörige Shop-Konto löschen möchten.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Aktivieren Sie das folgende Kontrollkästchen, wenn Sie auch das/die zugehörige(n) Shop-Konto/Konten löschen möchten",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s' target='_blank'>Ihrem Konto</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Zu Ihrer Information: Sie haben %d Auftrag(e) in Ihre Konten: ",
 		"I also want to delete my shop account": "Ich möchte auch mein Shop-Konto löschen",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein.",
 		"Error while setting shop delete preference": "Fehler beim Einstellen der Shop-Löschpräferenz",
 		"Shop email cannot be same as this account's email.": "Die E-Mail von Murena.com kann nicht mit der E-Mail dieses Kontos übereinstimmen.",
 		"Invalid Email Format.": "Ungültiges E-Mail-Format.",
diff --git a/l10n/de.json b/l10n/de.json
index f83d4949..b94ac709 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -3,10 +3,11 @@
 		"Email Address": "E-Mail Adresse",
 		"Options": "Optionen",
 		"We are going to proceed with your cloud account suppression.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren.",
-		"Check the box below if you also want to delete the associated shop account.": "Markieren Sie das Kästchen unten, wenn Sie auch das zugehörige Shop-Konto löschen möchten.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Aktivieren Sie das folgende Kontrollkästchen, wenn Sie auch das/die zugehörige(n) Shop-Konto/Konten löschen möchten",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s' target='_blank'>Ihrem Konto</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Zu Ihrer Information: Sie haben %d Auftrag(e) in Ihre Konten: ",
 		"I also want to delete my shop account": "Ich möchte auch mein Shop-Konto löschen",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein.",
 		"Error while setting shop delete preference": "Fehler beim Einstellen der Shop-Löschpräferenz",
 		"Shop email cannot be same as this account's email.": "Die E-Mail von Murena.com kann nicht mit der E-Mail dieses Kontos übereinstimmen.",
 		"Invalid Email Format.": "Ungültiges E-Mail-Format.",
diff --git a/l10n/en.js b/l10n/en.js
index af35aee2..bc284754 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -1,13 +1,16 @@
+/* eslint-disable quote-props */
+/* eslint-disable quotes */
 OC.L10N.register(
 	"ecloud-accounts",
 	{
 		"Email Address": "Email Address",
 		"Options": "Options",
 		"We are going to proceed with your cloud account suppression.": "We are going to proceed with your cloud account suppression.",
-		"Check the box below if you also want to delete the associated shop account.": "Check the box below if you also want to delete the associated shop account.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Check the box below if you also want to delete the associated shop account(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.",
+		"For your information you have %d order(s) in your accounts: ": "For your information you have %d order(s) in your accounts: ",
 		"I also want to delete my shop account": "I also want to delete my shop account",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.",
 		"Error while setting shop delete preference": "Error while setting shop delete preference",
 		"Shop email cannot be same as this account's email.": "Murena.com email cannot be same as this account's email.",
 		"Invalid Email Format.": "Invalid Email Format.",
diff --git a/l10n/en.json b/l10n/en.json
index ea45c326..bdcda7af 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -3,10 +3,11 @@
 		"Email Address": "Email Address",
 		"Options": "Options",
 		"We are going to proceed with your cloud account suppression.": "We are going to proceed with your cloud account suppression.",
-		"Check the box below if you also want to delete the associated shop account.": "Check the box below if you also want to delete the associated shop account.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Check the box below if you also want to delete the associated shop account(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.",
+		"For your information you have %d order(s) in your accounts: ": "For your information you have %d order(s) in your accounts: ",
 		"I also want to delete my shop account": "I also want to delete my shop account",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.",
 		"Error while setting shop delete preference": "Error while setting shop delete preference",
 		"Shop email cannot be same as this account's email.": "Murena.com email cannot be same as this account's email.",
 		"Invalid Email Format.": "Invalid Email Format.",
diff --git a/l10n/es.js b/l10n/es.js
index e241ca0b..713bffb6 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -4,10 +4,11 @@ OC.L10N.register(
 		"Email Address": "Correo electrónico",
 		"Options": "Opciones",
 		"We are going to proceed with your cloud account suppression.": "Vamos a proceder a la supresión de su cuenta en la nube.",
-		"Check the box below if you also want to delete the associated shop account.": "Marca la casilla de abajo si también quieres eliminar la cuenta de la tienda asociada.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Marque la casilla siguiente si también desea eliminar la(s) cuenta(s) de la tienda asociada(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Para su información tiene %d orden(es) en <a class='text-color-active' href='%s' target='_blank'>su cuenta</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Para su información tiene %d orden(es) en sus cuentas: ",
 		"I also want to delete my shop account": "También quiero borrar mi cuenta de la tienda",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Si quieres mantener tu cuenta de la tienda, valida o modifica la dirección de correo electrónico que aparece a continuación. Esta dirección de correo electrónico se convertirá en su nuevo acceso a la tienda. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Si quieres mantener tu cuenta de la tienda, valida o modifica la dirección de correo electrónico que aparece a continuación. Esta dirección de correo electrónico se convertirá en su nuevo acceso a la tienda.",
 		"Error while setting shop delete preference": "Error al configurar la preferencia de eliminación de la tienda",
 		"Shop email cannot be same as this account's email.": "El correo electrónico de Murena.com no puede ser el mismo que el de esta cuenta.",
 		"Invalid Email Format.": "Formato de correo electrónico no válido.",
diff --git a/l10n/es.json b/l10n/es.json
index b92ea244..fc0959d3 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -3,10 +3,11 @@
 		"Email Address": "Correo electrónico",
 		"Options": "Opciones",
 		"We are going to proceed with your cloud account suppression.": "Vamos a proceder a la supresión de su cuenta en la nube. ",
-		"Check the box below if you also want to delete the associated shop account.": "Marca la casilla de abajo si también quieres eliminar la cuenta de la tienda asociada.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Marque la casilla siguiente si también desea eliminar la(s) cuenta(s) de la tienda asociada(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Para su información tiene %d orden(es) en <a class='text-color-active' href='%s' target='_blank'>su cuenta</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Para su información tiene %d orden(es) en sus cuentas: ",
 		"I also want to delete my shop account": "También quiero borrar mi cuenta de la tienda",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Si quieres mantener tu cuenta de la tienda, valida o modifica la dirección de correo electrónico que aparece a continuación. Esta dirección de correo electrónico se convertirá en su nuevo acceso a la tienda. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Si quieres mantener tu cuenta de la tienda, valida o modifica la dirección de correo electrónico que aparece a continuación. Esta dirección de correo electrónico se convertirá en su nuevo acceso a la tienda.",
 		"Error while setting shop delete preference": "Error al configurar la preferencia de eliminación de la tienda",
 		"Shop email cannot be same as this account's email.": "El correo electrónico de Murena.com no puede ser el mismo que el de esta cuenta.",
 		"Invalid Email Format.": "Formato de correo electrónico no válido.",
diff --git a/l10n/fr.js b/l10n/fr.js
index 16ef5256..11002b93 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -4,10 +4,11 @@ OC.L10N.register(
 		"Email Address": "Adresse e-mail",
 		"Options": "Options",
 		"We are going to proceed with your cloud account suppression.": "Nous allons procéder à la suppression de votre compte cloud.",
-		"Check the box below if you also want to delete the associated shop account.": "Cochez la case ci-dessous si vous souhaitez également supprimer le compte boutique associé.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Cochez la case ci-dessous si vous souhaitez également supprimer le(s) compte(s) boutique(s) associé(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Pour votre information, vous avez %d ordre(s) en  <a class='text-color-active' href='%s' target='_blank'>votre compte</a>.",
-		"I also want to delete my shop account": "I also want to delete my shop account",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Si vous souhaitez conserver votre compte boutique, veuillez valider ou modifier l'adresse e-mail ci-dessous. Cette adresse email deviendra votre nouveau login pour la boutique. ",
+		"For your information you have %d order(s) in your accounts: ": "Pour votre information, vous avez %d ordre(s) en vos comptes: ",
+		"I also want to delete my shop account": "Je souhaite également supprimer mon compte boutique",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Si vous souhaitez conserver votre compte boutique, veuillez valider ou modifier l'adresse e-mail ci-dessous. Cette adresse email deviendra votre nouveau login pour la boutique.",
 		"Error while setting shop delete preference": "Erreur lors de la configuration de la préférence de suppression de boutique",
 		"Shop email cannot be same as this account's email.": "L'adresse électronique de Murena.com ne peut pas être la même que celle de ce compte.",
 		"Invalid Email Format.": "Format d'email invalide.",
diff --git a/l10n/fr.json b/l10n/fr.json
index 963b412c..1a3e3ae4 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -3,10 +3,11 @@
 		"Email Address": "Adresse e-mail",
 		"Options": "Options",
 		"We are going to proceed with your cloud account suppression.": "Nous allons procéder à la suppression de votre compte cloud.",
-		"Check the box below if you also want to delete the associated shop account.": "Cochez la case ci-dessous si vous souhaitez également supprimer le compte boutique associé.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Cochez la case ci-dessous si vous souhaitez également supprimer le(s) compte(s) boutique(s) associé(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Pour votre information, vous avez %d ordre(s) en  <a class='text-color-active' href='%s' target='_blank'>votre compte</a>.",
-		"I also want to delete my shop account": "I also want to delete my shop account",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Si vous souhaitez conserver votre compte boutique, veuillez valider ou modifier l'adresse e-mail ci-dessous. Cette adresse email deviendra votre nouveau login pour la boutique. ",
+		"For your information you have %d order(s) in your accounts: ": "Pour votre information, vous avez %d ordre(s) en vos comptes: ",
+		"I also want to delete my shop account": "Je souhaite également supprimer mon compte boutique",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Si vous souhaitez conserver votre compte boutique, veuillez valider ou modifier l'adresse e-mail ci-dessous. Cette adresse email deviendra votre nouveau login pour la boutique.",
 		"Error while setting shop delete preference": "Erreur lors de la configuration de la préférence de suppression de boutique",
 		"Shop email cannot be same as this account's email.": "L'adresse électronique de Murena.com ne peut pas être la même que celle de ce compte.",
 		"Invalid Email Format.": "Format d'email invalide.",
diff --git a/l10n/it.js b/l10n/it.js
index 209b447a..12976c09 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -4,10 +4,11 @@ OC.L10N.register(
 		"Email Address": "Indirizzo e-mail",
 		"Options": "Opzioni",
 		"We are going to proceed with your cloud account suppression.": "Procederemo con la soppressione dell'account cloud.",
-		"Check the box below if you also want to delete the associated shop account.": "Selezionare la casella sottostante se si desidera eliminare anche l'account del negozio associato.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Selezionare la casella sottostante se si desidera eliminare anche gli account del negozio associati.",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Per vostra informazione, avete %d ordini in <a class='text-color-active' href='%s' target='_blank'>il tuo account</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Per vostra informazione, avete %d ordini in i vostri conti: ",
 		"I also want to delete my shop account": "Voglio anche cancellare il mio account del negozio",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Se volete mantenere il vostro account del negozio, convalidate o modificate l'indirizzo e-mail qui sotto. Questo indirizzo e-mail diventerà il vostro nuovo login al negozio. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Se volete mantenere il vostro account del negozio, convalidate o modificate l'indirizzo e-mail qui sotto. Questo indirizzo e-mail diventerà il vostro nuovo login al negozio.",
 		"Error while setting shop delete preference": "Errore durante l'impostazione della preferenza di cancellazione del negozio",
 		"Shop email cannot be same as this account's email.": "L'e-mail di Murena.com non può essere uguale a quella di questo account.",
 		"Invalid Email Format.": "Formato email non valido.",
diff --git a/l10n/it.json b/l10n/it.json
index c5af4a7b..2dc17b44 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -3,10 +3,11 @@
 		"Email Address": "Indirizzo e-mail",
 		"Options": "Opzioni",
 		"We are going to proceed with your cloud account suppression.": "Procederemo con la soppressione dell'account cloud. ",
-		"Check the box below if you also want to delete the associated shop account.": "Selezionare la casella sottostante se si desidera eliminare anche l'account del negozio associato.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Selezionare la casella sottostante se si desidera eliminare anche gli account del negozio associati.",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Per vostra informazione, avete %d ordini in <a class='text-color-active' href='%s' target='_blank'>il tuo account</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Per vostra informazione, avete %d ordini in i vostri conti: ",
 		"I also want to delete my shop account": "Voglio anche cancellare il mio account del negozio",
-		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop. ": "Se volete mantenere il vostro account del negozio, convalidate o modificate l'indirizzo e-mail qui sotto. Questo indirizzo e-mail diventerà il vostro nuovo login al negozio. ",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Se volete mantenere il vostro account del negozio, convalidate o modificate l'indirizzo e-mail qui sotto. Questo indirizzo e-mail diventerà il vostro nuovo login al negozio.",
 		"Error while setting shop delete preference": "Errore durante l'impostazione della preferenza di cancellazione del negozio",
 		"Shop email cannot be same as this account's email.": "L'e-mail di Murena.com non può essere uguale a quella di questo account.",
 		"Invalid Email Format.": "Formato email non valido.",
diff --git a/lib/Controller/ShopAccountController.php b/lib/Controller/ShopAccountController.php
index b53aa6f5..2b932535 100644
--- a/lib/Controller/ShopAccountController.php
+++ b/lib/Controller/ShopAccountController.php
@@ -10,19 +10,14 @@ use OCP\IUserSession;
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Http;
 use OCP\ILogger;
 
 class ShopAccountController extends Controller {
-	private $shopAccountService;
-	private $userSession;
+	private ShopAccountService $shopAccountService;
+	private IUserSession $userSession;
+
+	private ILogger $logger;
 
-	private $logger;
-	private const SUBSCRIPTION_STATUS_LIST = [
-		'pending',
-		'active',
-		'on-hold'
-	];
 
 	public function __construct($appName, IRequest $request, IUserSession $userSession, ShopAccountService $shopAccountService, ILogger $logger) {
 		parent::__construct($appName, $request);
@@ -81,66 +76,19 @@ class ShopAccountController extends Controller {
 	/**
 	 * @NoAdminRequired
 	 */
-	public function getOrderInfo(int $userId) {
-		try {
-			if (!$userId) {
-				throw new Exception("Invalid user id");
-			}
-			$data = ['order_count' => 0, 'my_orders_url' => $this->shopAccountService->getShopUrl() . '/my-account/orders'];
-			$orders = $this->shopAccountService->getOrders($userId);
-			$data['order_count'] = count($orders);
-			$response = new DataResponse();
-			$response->setData($data);
-			return $response;
-		} catch (Exception $e) {
-			$this->logger->error('There was an issue querying order for user : ' . strval($userId));
-			$this->logger->logException($e, ['app' => Application::APP_ID]);
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getSubscriptionInfo(int $userId) {
-		try {
-			if (!$userId) {
-				throw new Exception("Invalid user id");
-			}
-			$data = ['subscription_count' => 0];
-			$subscriptions = $this->shopAccountService->getSubscriptions($userId, 'any');
-			$total_subscriptions = 0;
-			foreach ($subscriptions as $subscription) {
-				if (in_array($subscription['status'], self::SUBSCRIPTION_STATUS_LIST)) {
-					$total_subscriptions++;
-				}
-			}
-			$data['subscription_count'] = $total_subscriptions;
-			$response = new DataResponse();
-			$response->setData($data);
-			return $response;
-		} catch (Exception $e) {
-			$this->logger->error('There was an issue querying subscription for user : ' . strval($userId));
-			$this->logger->logException($e, ['app' => Application::APP_ID]);
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getShopUser() {
+	public function getShopUsers() {
 		$response = new DataResponse();
 		$user = $this->userSession->getUser();
 		$email = $user->getEMailAddress();
 
-		$shopUser = $this->shopAccountService->getUser($email);
+		$shopUsers = $this->shopAccountService->getUsers($email);
 
-		if (!$shopUser || !$this->shopAccountService->isUserOIDC($shopUser)) {
+		if (empty($shopUsers)) {
 			$response->setStatus(404);
 			return $response;
 		}
-		$response->setData($shopUser);
+
+		$response->setData($shopUsers);
 		return $response;
 	}
 }
diff --git a/lib/Listeners/BeforeUserDeletedListener.php b/lib/Listeners/BeforeUserDeletedListener.php
index 9b87f22a..c69120df 100644
--- a/lib/Listeners/BeforeUserDeletedListener.php
+++ b/lib/Listeners/BeforeUserDeletedListener.php
@@ -60,14 +60,16 @@ class BeforeUserDeletedListener implements IEventListener {
 		}
 
 		$deleteShopAccount = $this->shopAccountService->getShopDeletePreference($uid);
-		$shopUser = $this->shopAccountService->getUser($email);
-
-		if ($shopUser && $this->shopAccountService->isUserOIDC($shopUser)) {
-			if ($deleteShopAccount) {
-				$this->shopAccountService->deleteUser($shopUser['id']);
-			} else {
-				$newEmail = $this->shopAccountService->getShopEmailPostDeletePreference($uid);
-				$newEmail = $this->shopAccountService->updateUserEmailAndEmptyOIDC($shopUser['id'], $newEmail);
+		$shopUsers = $this->shopAccountService->getUsers($email);
+
+		if (!empty($shopUsers)) {
+			foreach ($shopUsers as $shopUser) {
+				if ($deleteShopAccount) {
+					$this->shopAccountService->deleteUser($shopUser['shop_url'], $shopUser['id']);
+				} else {
+					$newEmail = $this->shopAccountService->getShopEmailPostDeletePreference($uid);
+					$newEmail = $this->shopAccountService->updateUserEmailAndEmptyOIDC($shopUser['shop_url'], $shopUser['id'], $newEmail);
+				}
 			}
 		}
 	}
diff --git a/lib/Service/ShopAccountService.php b/lib/Service/ShopAccountService.php
index 113109b8..2fa12a0b 100644
--- a/lib/Service/ShopAccountService.php
+++ b/lib/Service/ShopAccountService.php
@@ -9,39 +9,45 @@ use OCP\ILogger;
 use OCA\EcloudAccounts\AppInfo\Application;
 
 class ShopAccountService {
-	private $config;
-	private $appName;
-	private $curl;
-	private $logger;
+	private IConfig $config;
+	private string $appName;
+	private CurlService $curl;
+	private ILogger $logger;
+	private array $shops = [];
+
+	private const OIDC_USERS_ENDPOINT = '/wp-json/openid-connect-generic/users/get_by_email';
+	private const USERS_ENDPOINT = '/wp-json/wp/v2/users';
+	private const MY_ORDERS_URL = '/my-account/orders';
+	private const MULTISITE_KEY = 'is_multisite';
+	private const MULTISITE_DELETE_USERS_ENDPOINT = '/wp-json/wp/v2/multisite/users';
 
 	public function __construct($appName, IConfig $config, CurlService $curlService, ILogger $logger) {
 		$this->config = $config;
 		$this->appName = $appName;
 
-		$shopUsername = $this->config->getSystemValue('murena_shop_username');
-		$shopPassword = $this->config->getSystemValue('murena_shop_password');
-		$this->shopUrl = $this->config->getSystemValue('murena_shop_url', '');
-		$this->shopReassignUserId = $this->config->getSystemValue('murena_shop_reassign_user_id');
-
+		$shops = $this->config->getSystemValue('murena_shops', []);
+		foreach ($shops as $shop) {
+			if (!isset($shop[self::MULTISITE_KEY])) {
+				$shop[self::MULTISITE_KEY] = false;
+			}
+			$this->shops[$shop['url']] = $shop;
+		}
 
-		$this->shopUserUrl = $this->shopUrl . "/wp-json/wp/v2/users";
-		$this->shopOrdersUrl = $this->shopUrl . "/wp-json/wc/v3/orders";
-		$this->subscriptionUrl = $this->shopUrl . "/wp-json/wc/v3/subscriptions";
-		$this->shopCredentials = base64_encode($shopUsername . ":" . $shopPassword);
 		$this->curl = $curlService;
 		$this->logger = $logger;
 	}
 
-	public function getShopUrl() {
-		return $this->shopUrl;
-	}
-
 	public function setShopDeletePreference($userId, bool $delete) {
 		$this->config->setUserValue($userId, $this->appName, 'delete_shop_account', intval($delete));
 	}
 
 	public function shopEmailExists(string $shopEmail) : bool {
-		return !empty($this->getUser($shopEmail));
+		foreach ($this->shops as $shop) {
+			if (!empty($this->getUser($shop, $shopEmail))) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	public function validateShopEmailPostDelete(string $shopEmailPostDelete, string $cloudEmail) : void {
@@ -70,36 +76,51 @@ class ShopAccountService {
 		return $this->config->getUserValue($userId, $this->appName, 'shop_email_post_delete', $recoveryEmail);
 	}
 
-	public function getOrders(int $userId): ?array {
-		return $this->callShopAPI($this->shopOrdersUrl, 'GET', ['customer' => $userId]);
-	}
-
-	public function getUsers(string $searchTerm): ?array {
+	public function getUsers(string $email): ?array {
 		try {
-			return $this->callShopAPI($this->shopUserUrl, 'GET', ['search' => $searchTerm]);
+			$users = [];
+			foreach ($this->shops as $shop) {
+				$user = $this->getUser($shop, $email);
+				if (empty($user)) {
+					continue;
+				}
+				$users[] = $user;
+			}
+			
+			return $users;
 		} catch (Exception $e) {
-			$this->logger->error('There was an issue querying shop for users');
 			$this->logger->logException($e, ['app' => Application::APP_ID]);
 		}
 	}
 
-	public function getUser(string $email) : ?array {
-		$users = $this->getUsers($email);
-		if (empty($users)) {
+	public function getUser(array $shop, string $email) : ?array {
+		$user = $this->callShopAPI($shop, self::OIDC_USERS_ENDPOINT, 'GET', ['email' => $email]);
+		if (empty($user)) {
 			return null;
 		}
-		return $users[0];
+		$user['shop_url'] = $shop['url'];
+		$user['my_orders_url'] = $shop['url'] . self::MY_ORDERS_URL;
+		
+		return $user;
 	}
 
-	public function deleteUser(int $userId) : void {
+	public function deleteUser(string $shopUrl, int $userId) : void {
+		$shop = $this->shops[$shopUrl];
+
+		$deleteEndpoint = self::USERS_ENDPOINT;
+		if ($shop[self::MULTISITE_KEY]) {
+			$deleteEndpoint = self::MULTISITE_DELETE_USERS_ENDPOINT;
+		}
+
+		$deleteEndpoint = $deleteEndpoint . '/' . strval($userId);
+
 		$params = [
 			'force' => true,
-			'reassign' => $this->shopReassignUserId
+			'reassign' => $shop['reassign_user_id']
 		];
-		$deleteUrl = $this->shopUserUrl . '/' . strval($userId);
 
 		try {
-			$answer = $this->callShopAPI($deleteUrl, 'DELETE', $params);
+			$answer = $this->callShopAPI($shop, $deleteEndpoint, 'DELETE', $params);
 
 			if (!$answer['deleted']) {
 				throw new Exception('Unknown error while deleting!');
@@ -110,8 +131,9 @@ class ShopAccountService {
 		}
 	}
 
-	public function updateUserEmailAndEmptyOIDC(int $userId, string $email) : void {
-		$updateUrl = $this->shopUserUrl . '/' . strval($userId);
+	public function updateUserEmailAndEmptyOIDC(string $shopUrl, int $userId, string $email) : void {
+		$shop = $this->shops[$shopUrl];
+		$updateEndpoint = self::USERS_ENDPOINT . '/' . strval($userId);
 
 		$params = [
 			'email' => $email,
@@ -119,7 +141,7 @@ class ShopAccountService {
 		];
 
 		try {
-			$answer = $this->callShopAPI($updateUrl, 'POST', $params);
+			$answer = $this->callShopAPI($shop, $updateEndpoint, 'POST', $params);
 
 			if ($answer['email'] !== $email) {
 				throw new Exception('Unknown error while updating!');
@@ -130,26 +152,27 @@ class ShopAccountService {
 		}
 	}
 
-	private function callShopAPI(string $url, string $method, array $data = []) {
-		if (empty($this->shopUrl)) {
+	private function callShopAPI(array $shop, string $endpoint, string $method, array $data = []) {
+		if (empty($shop['url'])) {
 			return [];
 		}
+		$shopCredentials = base64_encode($shop['username'] . ':' . $shop['password']);
 		$headers = [
 			"cache-control: no-cache",
 			"content-type: application/json",
-			"Authorization: Basic " . $this->shopCredentials
+			"Authorization: Basic " . $shopCredentials
 		];
 
 		if ($method === 'GET') {
-			$answer = $this->curl->get($url, $data, $headers);
+			$answer = $this->curl->get($shop['url'] . $endpoint, $data, $headers);
 		}
 
 		if ($method === 'DELETE') {
-			$answer = $this->curl->delete($url, $data, $headers);
+			$answer = $this->curl->delete($shop['url'] . $endpoint, $data, $headers);
 		}
 
 		if ($method === 'POST') {
-			$answer = $this->curl->post($url, json_encode($data), $headers);
+			$answer = $this->curl->post($shop['url'] . $endpoint, json_encode($data), $headers);
 		}
 
 		$answer = json_decode($answer, true);
@@ -159,12 +182,4 @@ class ShopAccountService {
 
 		return $answer;
 	}
-
-	public function isUserOIDC(array $user) {
-		return !empty($user['openid-connect-generic-last-user-claim']);
-	}
-
-	public function getSubscriptions(int $userId, string $status): ?array {
-		return $this->callShopAPI($this->subscriptionUrl, 'GET', ['customer' => $userId , 'status' => $status]);
-	}
 }
diff --git a/lib/Settings/Personal.php b/lib/Settings/DeleteShopAccountSetting.php
similarity index 75%
rename from lib/Settings/Personal.php
rename to lib/Settings/DeleteShopAccountSetting.php
index 2e694e98..c79416a7 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/DeleteShopAccountSetting.php
@@ -4,15 +4,13 @@ namespace OCA\EcloudAccounts\Settings;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
-use OCP\IGroupManager;
 use OCP\IUserSession;
 use OCP\Settings\ISettings;
 use OCP\Util;
 use OCA\EcloudAccounts\Service\ShopAccountService;
 use OCP\App\IAppManager;
-use OCP\IUserManager;
 
-class Personal implements ISettings {
+class DeleteShopAccountSetting implements ISettings {
 	private const DROP_ACCOUNT_APP_ID = 'drop_account';
 	/** @var IUserSession */
 	private $userSession;
@@ -27,21 +25,15 @@ class Personal implements ISettings {
 
 	private $appManager;
 
-	private IGroupManager $groupManager;
-
-	private IUserManager $userManager;
-
 	/** @var Util */
 	protected $util;
 
-	public function __construct($appName, IUserSession $userSession, IInitialState $initialState, ShopAccountService $shopAccountService, IAppManager $appManager, IGroupManager $groupManager, IUserManager $userManager, Util $util) {
+	public function __construct($appName, IUserSession $userSession, IInitialState $initialState, ShopAccountService $shopAccountService, IAppManager $appManager, Util $util) {
 		$this->userSession = $userSession;
 		$this->initialState = $initialState;
 		$this->appName = $appName;
 		$this->shopAccountService = $shopAccountService;
 		$this->appManager = $appManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
 		$this->util = $util;
 	}
 
@@ -52,10 +44,7 @@ class Personal implements ISettings {
 	public function getForm(): TemplateResponse {
 		$user = $this->userSession->getUser();
 		if ($user) {
-			$onlyUser = $this->userManager->countUsers() < 2;
-			$adminGroup = $this->groupManager->get('admin');
-			$onlyAdmin = $adminGroup && $adminGroup->count() < 2 && $this->groupManager->isAdmin($user->getUID());
-			$this->util->addScript($this->appName, $this->appName.'-personal-settings');
+			$this->util->addScript($this->appName, $this->appName.'-delete-shop-account-setting');
 			$this->util->addScript($this->appName, $this->appName.'-delete-account-listeners');
 			$deleteShopAccount = $this->shopAccountService->getShopDeletePreference($user->getUID());
 			$shopEmailPostDelete = $this->shopAccountService->getShopEmailPostDeletePreference($user->getUID());
@@ -63,8 +52,6 @@ class Personal implements ISettings {
 			$this->initialState->provideInitialState('email', $user->getEMailAddress());
 			$this->initialState->provideInitialState('delete_shop_account', $deleteShopAccount);
 			$this->initialState->provideInitialState('shop_email_post_delete', $shopEmailPostDelete);
-			$this->initialState->provideInitialState('only_user', $onlyUser);
-			$this->initialState->provideInitialState('only_admin', $onlyAdmin);
 		}
 
 		return new TemplateResponse($this->appName, 'personal');
diff --git a/src/PersonalSettings.vue b/src/DeleteShopAccountSetting.vue
similarity index 55%
rename from src/PersonalSettings.vue
rename to src/DeleteShopAccountSetting.vue
index 69ad36f9..63bd3818 100644
--- a/src/PersonalSettings.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,23 +1,26 @@
 <template>
-	<SettingsSection v-if="shopUserExists" :title="t('ecloud-accounts', 'Options')">
-		<p v-if="loading">
-			{{
-				t('ecloud-accounts', 'Loading...')
-			}}
-		</p>
-		<div v-else>
+	<SettingsSection v-if="shopUsers.length > 0" :title="t(appName, 'Options')">
+		<div>
 			<p>
 				{{
-					t('ecloud-accounts', 'We are going to proceed with your cloud account suppression.')
+					t(appName, 'We are going to proceed with your cloud account suppression.')
 				}}
-				<span v-if="subscriptionCount === 0">
+				<span v-if="!hasActiveSubscription">
 					{{
-						t('ecloud-accounts', 'Check the box below if you also want to delete the associated shop account.')
+						t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
 					}}
 				</span>
 			</p>
+
 			<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
-			<p><b v-if="subscriptionCount > 0" v-html="subscriptionDescription" /></p>
+			<p v-if="hasActiveSubscription">
+				<b>
+					{{
+						t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
+					}}
+				</b>
+			</p>
+
 			<form @submit.prevent>
 				<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
 					<div class="delete-shop-input">
@@ -26,11 +29,11 @@
 							type="checkbox"
 							name="shop-accounts_confirm"
 							class="checkbox"
-							:disabled="subscriptionCount > 0 || !allowDelete"
+							:disabled="hasActiveSubscription || !allowDelete"
 							@change="updateDeleteShopPreference()">
 						<label for="shop-accounts_confirm">{{
 							t(
-								"ecloud-accounts",
+								appName,
 								"I also want to delete my shop account"
 							)
 						}}</label>
@@ -39,7 +42,7 @@
 						<label for="shop-alternate-email">
 							{{
 								t(
-									"ecloud-accounts",
+									appName,
 									"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
 								)
 							}}
@@ -48,29 +51,13 @@
 							v-model="shopEmailPostDelete"
 							type="email"
 							name="shop-alternate-email"
-							:placeholder="t('ecloud-accounts', 'Email Address')"
+							:placeholder="t(appName, 'Email Address')"
 							class="form-control"
-							:disabled="subscriptionCount > 0 || !allowDelete"
+							:disabled="hasActiveSubscription || !allowDelete"
 							@blur="updateEmailPostDelete($event)">
 					</div>
 				</div>
 			</form>
-			<p v-if="onlyUser" class="warnings">
-				{{
-					t(
-						"drop_account",
-						"You are the only user of this instance, you can't delete your account."
-					)
-				}}
-			</p>
-			<p v-if="onlyAdmin" class="warnings">
-				{{
-					t(
-						"drop_account",
-						"You are the only admin of this instance, you can't delete your account."
-					)
-				}}
-			</p>
 		</div>
 	</SettingsSection>
 </template>
@@ -82,55 +69,48 @@ import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
+const APPLICATION_NAME = 'ecloud-accounts'
+
 export default {
-	name: 'PersonalSettings',
+	name: 'DeleteShopAccountSetting',
 	components: {
 		SettingsSection,
 	},
 	data() {
 		return {
-			shopUserExists: false,
-			shopUser: {},
-			deleteShopAccount: false,
-			shopEmailPostDelete: '',
-			shopEmailDefault: '',
-			appName: 'ecloud-accounts',
-			userEmail: '',
-			onlyAdmin: false,
-			onlyUser: false,
-			orderCount: 0,
-			subscriptionCount: 0,
-			ordersDescription: this.t('ecloud-accounts', "For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>."),
-			subscriptionDescription: this.t('ecloud-accounts', 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.'),
-			loading: true,
+			shopUsers: [],
+			deleteShopAccount: loadState(APPLICATION_NAME, 'delete_shop_account'),
+			shopEmailPostDelete: loadState(APPLICATION_NAME, 'shop_email_post_delete'),
+			appName: APPLICATION_NAME,
+			userEmail: loadState(APPLICATION_NAME, 'email'),
 			showError: false,
 			allowDelete: true,
+			ordersDescription: ''
 		}
 	},
-	created() {
-		try {
-			this.onlyUser = loadState(this.appName, 'only_user')
-			this.onlyAdmin = loadState(this.appName, 'only_admin')
-			this.deleteShopAccount = loadState(this.appName, 'delete_shop_account')
-			this.shopEmailPostDelete = loadState(this.appName, 'shop_email_post_delete')
-			this.shopEmailDefault = loadState(this.appName, 'shop_email_post_delete')
-			this.userEmail = loadState(this.appName, 'email')
-			this.getShopUser().then(() => {
-				if (this.shopUserExists) {
-					this.getOrdersInfo()
-					this.getSubscriptionInfo()
-				} else {
-					this.disableOrEnableDeleteAccount()
+	computed: {
+		hasActiveSubscription() {
+			for (let index = 0; index < this.shopUsers.length; index++) {
+				if (this.shopUsers[index].has_active_subscription) {
+					return true
 				}
-
-			})
-		} catch (e) {
-			console.error('Error fetching initial state', e)
+			}
+			return false
+		},
+		orderCount() {
+			return this.shopUsers.reduce((accumulator, user) => {
+				return accumulator + user.order_count
+			}, 0)
 		}
 	},
+	mounted() {
+		this.getShopUsers()
+	},
 	methods: {
 		async disableOrEnableDeleteAccount() {
-			if (this.shopUserExists && !this.deleteShopAccount) {
+			if (!this.allowDelete || this.hasActiveSubscription) {
+				this.disableDeleteAccountEvent()
+			} else if (this.shopUsers.length > 0 && !this.deleteShopAccount) {
 				this.disableDeleteAccountEvent()
 				const status = await this.checkShopEmailPostDelete()
 				if (status === 200) {
@@ -159,60 +139,40 @@ export default {
 				return err.response.status
 			}
 		},
-		async getShopUser() {
-			try {
-				const url = generateUrl(
-					`/apps/${this.appName}/shop-accounts/user`
-				)
-				const { status, data } = await Axios.get(url)
-				if (status === 200) {
-					this.shopUserExists = true
-					this.shopUser = data
-				}
-				if (status === 400) {
-					this.enableDeleteAccountEvent()
-				}
-			} catch (e) {
+		setOrderDescription() {
+			if (this.shopUsers.length === 1) {
+				const ordersDescription = this.t(APPLICATION_NAME, "For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.")
+				const myOrdersUrl = this.shopUsers[0].my_orders_url
+				this.ordersDescription = ordersDescription.replace('%d', this.orderCount).replace('%s', myOrdersUrl)
+			} else if (this.shopUsers.length >= 1) {
+				let ordersDescription = this.t(APPLICATION_NAME, 'For your information you have %d order(s) in your accounts: ')
+
+				ordersDescription = ordersDescription.replace('%d', this.orderCount)
+
+				const links = this.shopUsers.map((user, index) => {
+					return `<a href='${user.my_orders_url}' target='_blank'>[${index}]</a>`
+				})
+				this.ordersDescription = ordersDescription + links.join(' ')
 			}
 		},
-		async getOrdersInfo() {
+		async getShopUsers() {
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/shop-accounts/order_info?userId=${this.shopUser.id}`
+					`/apps/${this.appName}/shop-accounts/users`
 				)
-				const { status, data } = await Axios.get(url)
-				if (status === 200) {
-					this.orderCount = data.order_count
-					if (this.orderCount) {
-						this.ordersDescription = this.ordersDescription.replace('%d', this.orderCount).replace('%s', data.my_orders_url)
-					}
-				}
-				this.loading = false
+				const { data } = await Axios.get(url)
+				this.shopUsers = data
+				this.setOrderDescription()
 			} catch (e) {
-				this.loading = false
-			}
-		},
-		async getSubscriptionInfo() {
-			try {
-				const url = generateUrl(
-					`/apps/${this.appName}/shop-accounts/subscription_info?userId=${this.shopUser.id}`
-				)
-				const { status, data } = await Axios.get(url)
-				if (status === 200) {
-					this.subscriptionCount = data.subscription_count
-					if (this.subscriptionCount > 0) {
-						this.disableDeleteAccountEvent()
-					}
+				if (e.response.status !== 404) {
+					this.disableDeleteAccountEvent()
+					showError(
+						t(APPLICATION_NAME, 'Temporary error contacting murena.com; please try again later!')
+					)
+					this.allowDelete = false
 				}
-				this.loading = false
-			} catch (e) {
-				this.disableDeleteAccountEvent()
-				showError(
-					t('ecloud-accounts', 'Temporary error contacting murena.com; please try again later!')
-				)
-				this.loading = false
-				this.allowDelete = false
 			}
+			this.disableOrEnableDeleteAccount()
 		},
 		async updateDeleteShopPreference() {
 			await this.disableOrEnableDeleteAccount()
@@ -225,12 +185,12 @@ export default {
 				})
 				if (status !== 200) {
 					showError(
-						t('ecloud-accounts', 'Error while setting shop delete preference')
+						t(APPLICATION_NAME, 'Error while setting shop delete preference')
 					)
 				}
 			} catch (e) {
 				showError(
-					t('ecloud-accounts', 'Error while setting shop delete preference')
+					t(APPLICATION_NAME, 'Error while setting shop delete preference')
 				)
 			}
 		},
@@ -254,7 +214,7 @@ export default {
 			if (this.shopEmailPostDelete === this.userEmail) {
 				showError(
 					t(
-						'ecloud-accounts',
+						APPLICATION_NAME,
 						"Murena.com email cannot be same as this account's email."
 					)
 				)
@@ -264,7 +224,7 @@ export default {
 					this.disableDeleteAccountEvent()
 					showError(
 						t(
-							'ecloud-accounts',
+							APPLICATION_NAME,
 							data.message
 						)
 					)
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index 6710f7ff..a8a190b8 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -1,17 +1,19 @@
 document.addEventListener('DOMContentLoaded', function() {
+	const checkboxSelector = '#delete-account-settings .checkbox-radio-switch__input'
+	const buttonSelector = '#delete-account-settings .delete-button-wrapper .button-vue'
 	// Disable initially
-	document.getElementById('drop_account_confirm').disabled = true
-	document.getElementById('deleteaccount').disabled = true
+	document.querySelector(checkboxSelector).disabled = true
+	document.querySelector(buttonSelector).disabled = true
 
 	const elem = document.getElementById('body-settings')
 	elem.addEventListener('disable-delete-account', function() {
-	  document.getElementById('deleteaccount').disabled = true
-	  document.getElementById('drop_account_confirm').disabled = true
+	  document.querySelector(checkboxSelector).disabled = true
+	  document.querySelector(buttonSelector).disabled = true
 	})
 
 	elem.addEventListener('enable-delete-account', function() {
-	  document.getElementById('drop_account_confirm').disabled = false
-	  const enableDeleteAccount = document.getElementById('drop_account_confirm').checked
-	  document.getElementById('deleteaccount').disabled = !enableDeleteAccount
+	  document.querySelector(checkboxSelector).disabled = false
+	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
+	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	})
 })
diff --git a/src/personal.js b/src/delete-shop-account-setting.js
similarity index 69%
rename from src/personal.js
rename to src/delete-shop-account-setting.js
index ad8127b0..4ab00df5 100644
--- a/src/personal.js
+++ b/src/delete-shop-account-setting.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import './common.js'
-import PersonalSettings from './PersonalSettings.vue'
+import PersonalSettings from './DeleteShopAccountSetting.vue'
 
 export default new Vue({
 	el: '#ecloud-accounts-settings',
diff --git a/webpack.config.js b/webpack.config.js
index ea2fb2f2..b2b5fbb0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,7 +6,7 @@ const path = require('path')
 module.exports = {
 	...webpackConfig,
 	entry: {
-		'personal-settings': path.join(__dirname, 'src/personal.js'),
+		'delete-shop-account-setting': path.join(__dirname, 'src/delete-shop-account-setting.js'),
 		'delete-account-listeners': path.join(__dirname, 'src/delete-account-listeners.js'),
 		'beta-user-setting': path.join(__dirname, 'src/beta-user-setting.js'),
 	},
-- 
GitLab


From 038d65e1cac861fb4ebc6396a074207adad7affe Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 21 Jun 2023 11:27:53 +0000
Subject: [PATCH 024/185] Checkbox UI change in drop account

---
 .gitlab-ci.yml                   | 99 +++++++++++++++++++++++++++++---
 src/DeleteShopAccountSetting.vue | 37 +++++++-----
 src/delete-account-listeners.js  |  5 ++
 3 files changed, 119 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6119917f..0b0f2817 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,92 @@
+#include:
+#  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+#    ref: main
+#    file: "nc-apps-lint-build-frontend.yml"
+#  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+#    ref: main
+#    file: "nc-apps-deploy.yml"
+
 variables:
-    TO_PACKAGE: 'appinfo l10n lib templates js img'
-include:
-  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-    ref: main
-    file: "nc-apps-lint-build-frontend.yml"
-  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-    ref: main
-    file: "nc-apps-deploy.yml"
+  APP_NAME: $CI_PROJECT_NAME
+  TO_PACKAGE: 'appinfo js css l10n lib img templates'
+  CONTAINER_IMAGE: ubuntu
+  CONTAINER_TAG: focal
+  CONTAINER_NAME: nextcloud
+  APP_ENABLE_ARGS: ''
+
+.frontend:base:
+  image: node:15.14.0-stretch
+  before_script:
+    - npm set cache .npm
+    - npm install --prefer-offline --no-audit
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}
+    paths:
+      - .npm/
+      - node_modules/
+
+install-node-deps:
+  extends: .frontend:base
+  stage: .pre
+  before_script:
+      - node --version
+      - npm --version
+  script:
+      - npm ci --cache .npm --prefer-offline
+  only:
+      changes:
+          - package*.json
+
+build-frontend:
+  extends: .frontend:base
+  stage: build
+  script:
+    - npm run build
+    - mkdir -p dist/${APP_NAME}
+    - rm -f dist/js/*.map
+    - echo "packaging ${TO_PACKAGE}" && cp -a ${TO_PACKAGE} dist/${APP_NAME} && rm -rf dist/js
+    - find dist/${APP_NAME} -type d -exec chmod 755 {} \;
+    - find dist/${APP_NAME} -type f -exec chmod 644 {} \;
+  artifacts:
+    paths:
+      - dist/
+
+.deploy:nextcloud-app:
+  stage: deploy
+  # assuming all deployment will happen with sames image
+  image: $CONTAINER_IMAGE:$CONTAINER_TAG
+  # assuming we will need to add SSH for all deployment
+  before_script:
+    - echo "FAIL" > .job_status
+    - mkdir $HOME/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
+    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
+    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
+    - chmod 600 ~/.ssh/id_ed25519
+    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
+    - apt-get update && apt-get install -y openssh-client rsync
+  script:
+    - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+    - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} && 
+      sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ && 
+      sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
+    - echo "SUCCESS" > .job_status
+  after_script:
+    # reading job status, checking it and implementing additional steps
+    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
+
+deploy:staging:
+  extends: .deploy:nextcloud-app
+  when: manual
+  only:
+    - main
+    - murena-main
+    - production
+    - tags
+    - dev/checkbox-issue-drop-account
+  environment:
+    name: staging/01
+    url: https://eeo.one
diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 63bd3818..03c7d4fa 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -24,19 +24,17 @@
 			<form @submit.prevent>
 				<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
 					<div class="delete-shop-input">
-						<input id="shop-accounts_confirm"
-							v-model="deleteShopAccount"
-							type="checkbox"
-							name="shop-accounts_confirm"
-							class="checkbox"
+						<CheckboxRadioSwitch id="shop-accounts_confirm"
+							:checked.sync="deleteShopAccount"
 							:disabled="hasActiveSubscription || !allowDelete"
-							@change="updateDeleteShopPreference()">
-						<label for="shop-accounts_confirm">{{
-							t(
-								appName,
-								"I also want to delete my shop account"
-							)
-						}}</label>
+							@update:checked="updateDeleteShopPreference">
+							{{
+								t(
+									appName,
+									"I also want to delete my shop account"
+								)
+							}}
+						</CheckboxRadioSwitch>
 					</div>
 					<div v-if="!deleteShopAccount" class="delete-shop-input">
 						<label for="shop-alternate-email">
@@ -68,6 +66,7 @@ import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
+import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch.js'
 
 const APPLICATION_NAME = 'ecloud-accounts'
 
@@ -75,6 +74,7 @@ export default {
 	name: 'DeleteShopAccountSetting',
 	components: {
 		SettingsSection,
+		CheckboxRadioSwitch,
 	},
 	data() {
 		return {
@@ -85,7 +85,7 @@ export default {
 			userEmail: loadState(APPLICATION_NAME, 'email'),
 			showError: false,
 			allowDelete: true,
-			ordersDescription: ''
+			ordersDescription: '',
 		}
 	},
 	computed: {
@@ -101,7 +101,7 @@ export default {
 			return this.shopUsers.reduce((accumulator, user) => {
 				return accumulator + user.order_count
 			}, 0)
-		}
+		},
 	},
 	mounted() {
 		this.getShopUsers()
@@ -274,4 +274,13 @@ input#shop-alternate-email:disabled {
 .delete-shop-input {
 	margin-bottom: 1em;
 }
+#delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label .checkbox-radio-switch__icon{
+	color: var(--color-text-light);
+}
+#delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label{
+	opacity: 0.5;
+}
+#delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label:hover{
+	background-color: unset;
+}
 </style>
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index a8a190b8..4b786556 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -1,19 +1,24 @@
 document.addEventListener('DOMContentLoaded', function() {
 	const checkboxSelector = '#delete-account-settings .checkbox-radio-switch__input'
 	const buttonSelector = '#delete-account-settings .delete-button-wrapper .button-vue'
+	const checkboxSpanSelector = '#delete-account-settings span.checkbox-radio-switch'
+	const disabledClass = 'checkbox-radio-switch--disabled'
 	// Disable initially
 	document.querySelector(checkboxSelector).disabled = true
 	document.querySelector(buttonSelector).disabled = true
+	document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 
 	const elem = document.getElementById('body-settings')
 	elem.addEventListener('disable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
+	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 	})
 
 	elem.addEventListener('enable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = false
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
+	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
 	})
 })
-- 
GitLab


From a06fb44b375dc6a2ec3edfd876fa90c32ee9b854 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Wed, 21 Jun 2023 04:29:55 -0700
Subject: [PATCH 025/185] bump version and revert gitlab

---
 .gitlab-ci.yml   | 99 ++++--------------------------------------------
 appinfo/info.xml |  2 +-
 2 files changed, 9 insertions(+), 92 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b0f2817..6119917f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,92 +1,9 @@
-#include:
-#  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-#    ref: main
-#    file: "nc-apps-lint-build-frontend.yml"
-#  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
-#    ref: main
-#    file: "nc-apps-deploy.yml"
-
 variables:
-  APP_NAME: $CI_PROJECT_NAME
-  TO_PACKAGE: 'appinfo js css l10n lib img templates'
-  CONTAINER_IMAGE: ubuntu
-  CONTAINER_TAG: focal
-  CONTAINER_NAME: nextcloud
-  APP_ENABLE_ARGS: ''
-
-.frontend:base:
-  image: node:15.14.0-stretch
-  before_script:
-    - npm set cache .npm
-    - npm install --prefer-offline --no-audit
-  cache:
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-      - .npm/
-      - node_modules/
-
-install-node-deps:
-  extends: .frontend:base
-  stage: .pre
-  before_script:
-      - node --version
-      - npm --version
-  script:
-      - npm ci --cache .npm --prefer-offline
-  only:
-      changes:
-          - package*.json
-
-build-frontend:
-  extends: .frontend:base
-  stage: build
-  script:
-    - npm run build
-    - mkdir -p dist/${APP_NAME}
-    - rm -f dist/js/*.map
-    - echo "packaging ${TO_PACKAGE}" && cp -a ${TO_PACKAGE} dist/${APP_NAME} && rm -rf dist/js
-    - find dist/${APP_NAME} -type d -exec chmod 755 {} \;
-    - find dist/${APP_NAME} -type f -exec chmod 644 {} \;
-  artifacts:
-    paths:
-      - dist/
-
-.deploy:nextcloud-app:
-  stage: deploy
-  # assuming all deployment will happen with sames image
-  image: $CONTAINER_IMAGE:$CONTAINER_TAG
-  # assuming we will need to add SSH for all deployment
-  before_script:
-    - echo "FAIL" > .job_status
-    - mkdir $HOME/.ssh
-    - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
-    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
-    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
-    - chmod 600 ~/.ssh/id_ed25519
-    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
-    - apt-get update && apt-get install -y openssh-client rsync
-  script:
-    - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
-    - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} && 
-      sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ && 
-      sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
-    - echo "SUCCESS" > .job_status
-  after_script:
-    # reading job status, checking it and implementing additional steps
-    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
-
-deploy:staging:
-  extends: .deploy:nextcloud-app
-  when: manual
-  only:
-    - main
-    - murena-main
-    - production
-    - tags
-    - dev/checkbox-issue-drop-account
-  environment:
-    name: staging/01
-    url: https://eeo.one
+    TO_PACKAGE: 'appinfo l10n lib templates js img'
+include:
+  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+    ref: main
+    file: "nc-apps-lint-build-frontend.yml"
+  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+    ref: main
+    file: "nc-apps-deploy.yml"
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1bc21400..5f7d600a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.2.0</version>
+    <version>3.2.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 27355495032b19bbc874b0524f2e12b88574f1af Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 11 Jul 2023 15:47:39 +0000
Subject: [PATCH 026/185] Add event listener to sync 2fa state change

---
 .gitlab-ci.yml                                |  47 ++++-
 lib/AppInfo/Application.php                   |   8 +-
 lib/Command/Migrate2FASecrets.php             | 199 ++----------------
 lib/Db/SSOMapper.php                          | 167 ++++++++++++++-
 lib/Db/TwoFactorMapper.php                    |  48 +++++
 .../TwoFactorStateChangedListener.php         |  54 +++++
 6 files changed, 332 insertions(+), 191 deletions(-)
 create mode 100644 lib/Db/TwoFactorMapper.php
 create mode 100644 lib/Listeners/TwoFactorStateChangedListener.php

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6119917f..b6233d12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,10 @@
 variables:
-    TO_PACKAGE: 'appinfo l10n lib templates js img'
+  CONTAINER_IMAGE: ubuntu
+  CONTAINER_TAG: focal
+  CONTAINER_NAME: nextcloud
+  APP_NAME: $CI_PROJECT_NAME
+  APP_ENABLE_ARGS: ''
+  TO_PACKAGE: 'appinfo l10n lib templates js img'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -7,3 +12,43 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-deploy.yml"
+
+.deploy:nextcloud-app:
+  stage: deploy
+  # assuming all deployment will happen with sames image
+  image: $CONTAINER_IMAGE:$CONTAINER_TAG
+  # assuming we will need to add SSH for all deployment
+  before_script:
+    - echo "FAIL" > .job_status
+    - mkdir $HOME/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
+    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
+    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
+    - chmod 600 ~/.ssh/id_ed25519
+    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
+    - apt-get update && apt-get install -y openssh-client rsync
+  script:
+    - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+    - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} && 
+      sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ && 
+      sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
+    - echo "SUCCESS" > .job_status
+  after_script:
+    # reading job status, checking it and implementing additional steps
+    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
+
+deploy:staging:
+  extends: .deploy:nextcloud-app
+  when: manual
+  only:
+    - main
+    - murena-main
+    - production
+    - dev/sync-new-secrets
+    - tags
+  environment:
+    name: staging/01
+    url: https://eeo.one
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 3574f538..47cc7b6b 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -37,6 +37,9 @@ use OCP\User\Events\UserChangedEvent;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
+use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
+use OCA\TwoFactorTOTP\Event\StateChanged;
+use OCP\IUserManager;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
@@ -48,13 +51,16 @@ class Application extends App implements IBootstrap {
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
+		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
 		// $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
 		$serverContainer = $context->getServerContainer();
 		$serverContainer->registerService('LDAPConnectionService', function ($c) {
-			return new LDAPConnectionService();
+			return new LDAPConnectionService(
+				$c->get(IUserManager::class)
+			);
 		});
 	}
 }
diff --git a/lib/Command/Migrate2FASecrets.php b/lib/Command/Migrate2FASecrets.php
index 8155d7b1..13bddf36 100644
--- a/lib/Command/Migrate2FASecrets.php
+++ b/lib/Command/Migrate2FASecrets.php
@@ -8,96 +8,36 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use OCP\Security\ICrypto;
-use OCP\IDBConnection;
-use OCP\IUserManager;
-use OCP\IUser;
-use OCP\IConfig;
 use OCA\EcloudAccounts\Db\SSOMapper;
-use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
-use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Connection;
+use OCA\EcloudAccounts\Db\TwoFactorMapper;
 
 class Migrate2FASecrets extends Command {
 	private SSOMapper $ssoMapper;
-	private IDBConnection $dbConn;
-	private Connection $ssoDbConn;
-	private ICrypto $crypto;
-	private IUserManager $userManager;
+	private TwoFactorMapper $twoFactorMapper;
 	private OutputInterface $commandOutput;
-	private IConfig $config;
-	private const TOTP_SECRET_TABLE = 'twofactor_totp_secrets';
-	private const USER_LABELS = [
-		'en' => 'Murena Cloud 2FA',
-		'es' => 'Murena Cloud 2FA',
-		'de' => 'Murena Cloud 2FA',
-		'it' => 'Murena Cloud 2FA',
-		'fr' => 'Murena Cloud 2FA',
-	];
 
-	public function __construct(IDBConnection $dbConn, ICrypto $crypto, SSOMapper $ssoMapper, IUserManager $userManager, IConfig $config) {
+	public function __construct(SSOMapper $ssoMapper, TwoFactorMapper $twoFactorMapper) {
 		$this->ssoMapper = $ssoMapper;
-		$this->userManager = $userManager;
-		$this->dbConn = $dbConn;
-		$this->crypto = $crypto;
-		$this->config = $config;
+		$this->twoFactorMapper = $twoFactorMapper;
 		parent::__construct();
 	}
 
 	protected function configure(): void {
 		$this
-				->setName('ecloud-accounts:migrate-2fa-secrets')
-				->setDescription('Migrates 2FA secrets to SSO database')
-				->addOption(
-					'users',
-					null,
-					InputOption::VALUE_OPTIONAL,
-					'comma separated list of users',
-					''
-				)
-				->addOption(
-					'sso-db-name',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'SSO database name',
-				)
-				->addOption(
-					'sso-db-user',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'SSO database user',
-				)
-				->addOption(
-					'sso-db-password',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'SSO database password',
-				)
-				->addOption(
-					'sso-db-host',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'SSO database host',
-				)
-				->addOption(
-					'sso-db-port',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'SSO database port',
-					3306
-				);
+			->setName('ecloud-accounts:migrate-2fa-secrets')
+			->setDescription('Migrates 2FA secrets to SSO database')
+			->addOption(
+				'users',
+				null,
+				InputOption::VALUE_OPTIONAL,
+				'comma separated list of users',
+				''
+			);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		try {
 			$this->commandOutput = $output;
-			$dbName = $input->getOption('sso-db-name');
-			$dbHost = $input->getOption('sso-db-host');
-			$dbPort = $input->getOption('sso-db-port');
-			$dbPassword = $input->getOption('sso-db-password');
-			$dbUser = $input->getOption('sso-db-user');
-			$this->ssoDbConn = $this->getDatabaseConnection($dbName, $dbHost, $dbPort, $dbPassword, $dbUser);
-			
 			$usernames = [];
 			$usernameList = $input->getOption('users');
 			if (!empty($usernameList)) {
@@ -117,119 +57,14 @@ class Migrate2FASecrets extends Command {
 	 * @return void
 	 */
 	private function migrateUsers(array $usernames = []) : void {
-		$entries = [];
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('user_id', 'secret')
-			->from(self::TOTP_SECRET_TABLE);
-
-		if (!empty($usernames)) {
-			$qb->where('user_id IN (:usernames)')
-				->setParameter('usernames', implode(',', $usernames));
-		}
-
-		$result = $qb->execute();
-		while ($row = $result->fetch()) {
+		$entries = $this->twoFactorMapper->getEntries($usernames);
+		foreach ($entries as $entry) {
 			try {
-				$username = (string) $row['user_id'];
-				if (!$this->userManager->get($username) instanceof IUser) {
-					throw new \Exception('No user found in nextcloud with given username');
-				}
-				
-				$secret = (string) $row['secret'];
-				$decryptedSecret = $this->crypto->decrypt($secret);
-				$ssoUserId = $this->ssoMapper->getUserId($username, $this->ssoDbConn);
-				if (empty($ssoUserId)) {
-					throw new \Exception('Does not exist in SSO database');
-				}
-
-				$language = $this->config->getUserValue($uid, 'core', 'lang', 'en');
-				if (!array_key_exists($language, self::USER_LABELS)) {
-					$language = 'en';
-				}
-				$entry = $this->getSSOSecretEntry($decryptedSecret, $ssoUserId, $language);
-				$this->ssoMapper->insertCredential($entry, $this->ssoDbConn);
+				$this->ssoMapper->migrateCredential($entry['username'], $entry['secret']);
 			} catch(\Exception $e) {
-				$this->commandOutput->writeln('Error inserting entry for user ' . $username . ' message: ' . $e->getMessage());
+				$this->commandOutput->writeln('Error inserting entry for user ' . $entry['username'] . ' message: ' . $e->getMessage());
 				continue;
 			}
 		}
 	}
-
-	/**
-	 * Create secret entry compatible with Keycloak schema
-	 *
-	 * @return array
-	 */
-
-	private function getSSOSecretEntry(string $secret, string $ssoUserId, string $language) : array {
-		// Create the random UUID from the sso user ID so multiple entries of same credential do not happen
-		$id = $this->randomUUID(substr($ssoUserId, 0, 16));
-
-		$userLabel = self::USER_LABELS[$language];
-		$credentialEntry = [
-			'ID' => $id,
-			'USER_ID' => $ssoUserId,
-			'USER_LABEL' => 'Murena Cloud 2FA',
-			'TYPE' => 'otp',
-			'SECRET_DATA' => json_encode([
-				'value' => $secret
-			]),
-			'CREDENTIAL_DATA' => json_encode([
-				'subType' => 'nextcloud_totp',
-				'period' => 30,
-				'digits' => 6,
-				'algorithm' => 'HmacSHA1',
-			]),
-		];
-
-		foreach ($credentialEntry as $key => &$value) {
-			$value = "'" . $value . "'";
-		}
-		$credentialEntry['CREATED_DATE'] = round(microtime(true) * 1000);
-		$credentialEntry['PRIORITY'] = 10;
-
-		return $credentialEntry;
-	}
-
-	/**
-	 * Attempt to connect to a non-NC database
-	 *
-	 * @return Connection
-	 */
-	private function getDatabaseConnection(string $dbName, string $dbHost, int $dbPort, string $dbPassword, string $dbUser) : Connection {
-		if (empty($dbName) || empty($dbHost) || empty($dbPort) || empty($dbPassword) || empty($dbUser)) {
-			throw new DbConnectionParamsException('Invalid database parameters!');
-		}
-		
-		$params = [
-			'dbname' => $dbName,
-			'user' => $dbUser,
-			'password' => $dbPassword,
-			'host' => $dbHost,
-			'port' => $dbPort,
-			'driver' => 'pdo_mysql'
-		];
-
-		return  DriverManager::getConnection($params);
-	}
-
-	/**
-	 *	From https://www.uuidgenerator.net/dev-corner/php
-	 *	As keycloak generates random UUIDs using the java.util.UUID class which is RFC 4122 compliant
-	 *
-	 *   @return string
-	 */
-	private function randomUUID($data = null) : string {
-		// Generate 16 bytes (128 bits) of random data or use the data passed into the function.
-		$data = $data ?? random_bytes(16);
-		assert(strlen($data) == 16);
-	
-		// Set version to 0100
-		$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
-		// Set bits 6-7 to 10
-		$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
-	
-		// Output the 36 character UUID.
-		return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
-	}
 }
diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
index 1e711eda..d172ddda 100644
--- a/lib/Db/SSOMapper.php
+++ b/lib/Db/SSOMapper.php
@@ -4,21 +4,42 @@ namespace OCA\EcloudAccounts\Db;
 
 use OCP\IConfig;
 use OCP\ILogger;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Connection;
+use OCP\IUserManager;
+use OCP\Security\ICrypto;
+use OCP\IUser;
+use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
 
 class SSOMapper {
-	private $config;
-	private $logger;
+	private IConfig $config;
+	private ILogger $logger;
+	private Connection $conn;
+	private IUserManager $userManager;
+	private ICrypto $crypto;
+
 	private const USER_ATTRIBUTE_TABLE = 'USER_ATTRIBUTE';
 	private const CREDENTIAL_TABLE = 'CREDENTIAL';
 
-	public function __construct(IConfig $config, ILogger $logger) {
+	private const SSO_CONFIG_KEY = 'keycloak';
+	private const USER_LABELS = [
+		'en' => 'Murena Cloud 2FA',
+		'es' => 'Murena Cloud 2FA',
+		'de' => 'Murena Cloud 2FA',
+		'it' => 'Murena Cloud 2FA',
+		'fr' => 'Murena Cloud 2FA',
+	];
+
+	public function __construct(IConfig $config, IUserManager $userManager, ILogger $logger, ICrypto $crypto) {
 		$this->config = $config;
 		$this->logger = $logger;
+		$this->userManager = $userManager;
+		$this->crypto = $crypto;
+		$this->initConnection();
 	}
 
-	public function getUserId(string $username, Connection $conn) : string {
-		$qb = $conn->createQueryBuilder();
+	public function getUserId(string $username) : string {
+		$qb = $this->conn->createQueryBuilder();
 		$qb->select('USER_ID')
 			->from(self::USER_ATTRIBUTE_TABLE)
 			->where('NAME = "LDAP_ID"')
@@ -29,10 +50,142 @@ class SSOMapper {
 		return (string) $result->fetchOne();
 	}
 
-	public function insertCredential(array $entry, Connection $conn) {
-		$qb = $conn->createQueryBuilder();
+	public function deleteCredential(string $username) {
+		$userId = $this->getUserId($username);
+		$qb = $this->conn->createQueryBuilder();
+		$qb->delete(self::CREDENTIAL_TABLE)
+			->where('USER_ID = :username')
+			->andWhere('TYPE = "otp"')
+			->andWhere('CREDENTIAL_DATA LIKE "%\"subType\":\"nextcloud_totp\"%"')
+			->setParameter('username', $userId)
+			->execute();
+	}
+
+	public function migrateCredential(string $username, string $secret) {
+		if (!$this->userManager->get($username) instanceof IUser) {
+			throw new \Exception('No user found in nextcloud with given username');
+		}
+
+		$decryptedSecret = $this->crypto->decrypt($secret);
+		$ssoUserId = $this->getUserId($username);
+		if (empty($ssoUserId)) {
+			throw new \Exception('Does not exist in SSO database');
+		}
+
+		$language = $this->config->getUserValue($username, 'core', 'lang', 'en');
+		if (!array_key_exists($language, self::USER_LABELS)) {
+			$language = 'en';
+		}
+
+		// Only one "nextcloud_totp" at a time
+		$this->deleteCredential($username);
+
+		$entry = $this->getCredentialEntry($decryptedSecret, $ssoUserId, $language);
+		$this->insertCredential($entry);
+	}
+
+	public function insertCredential(array $entry) : void {
+		$qb = $this->conn->createQueryBuilder();
 		$qb->insert(self::CREDENTIAL_TABLE)
 			->values($entry)
 			->execute();
 	}
+
+	/**
+	 * Create secret entry compatible with Keycloak schema
+	 *
+	 * @return array
+	 */
+
+	private function getCredentialEntry(string $secret, string $ssoUserId, string $language) : array {
+		// Create the random UUID from the sso user ID so multiple entries of same credential do not happen
+		$id = $this->randomUUID(substr($ssoUserId, 0, 16));
+
+		$userLabel = self::USER_LABELS[$language];
+		$credentialEntry = [
+			'ID' => $id,
+			'USER_ID' => $ssoUserId,
+			'USER_LABEL' => $userLabel,
+			'TYPE' => 'otp',
+			'SECRET_DATA' => json_encode([
+				'value' => $secret
+			]),
+			'CREDENTIAL_DATA' => json_encode([
+				'subType' => 'nextcloud_totp',
+				'period' => 30,
+				'digits' => 6,
+				'algorithm' => 'HmacSHA1',
+			]),
+		];
+
+		foreach ($credentialEntry as $key => &$value) {
+			$value = "'" . $value . "'";
+		}
+		$credentialEntry['CREATED_DATE'] = round(microtime(true) * 1000);
+		$credentialEntry['PRIORITY'] = 10;
+
+		return $credentialEntry;
+	}
+
+	private function initConnection() : void {
+		try {
+			$params = $this->getConnectionParams();
+			$this->conn = DriverManager::getConnection($params);
+		} catch (Throwable $e) {
+			$this->logger->error('Error connecting to Keycloak database: ' . $e->getMessage());
+		}
+	}
+
+	private function isDbConfigValid($config) : bool {
+		if (!$config || !is_array($config)) {
+			return false;
+		}
+		if (!isset($config['db_port'])) {
+			$config['db_port'] = 3306;
+		}
+
+		return isset($config['db_name'])
+			&& isset($config['db_user'])
+			&& isset($config['db_password'])
+			&& isset($config['db_host'])
+			&& isset($config['db_port']) ;
+	}
+
+	private function getConnectionParams() : array {
+		$config = $this->config->getSystemValue(self::SSO_CONFIG_KEY);
+		
+		if (!$this->isDbConfigValid($config)) {
+			throw new DbConnectionParamsException('Invalid SSO database configuration!');
+		}
+
+		$params = [
+			'dbname' => $config['db_name'],
+			'user' => $config['db_user'],
+			'password' => $config['db_password'],
+			'host' => $config['db_host'],
+			'port' => $config['db_port'],
+			'driver' => 'pdo_mysql'
+		];
+		return $params;
+	}
+
+		/**
+		 *	From https://www.uuidgenerator.net/dev-corner/php
+		 *	As keycloak generates random UUIDs using the java.util.UUID class which is RFC 4122 compliant
+		 *
+		 *   @return string
+		 */
+	private function randomUUID($data = null) : string {
+		// Generate 16 bytes (128 bits) of random data or use the data passed into the function.
+		$data = $data ?? random_bytes(16);
+		assert(strlen($data) == 16);
+	
+		// Set version to 0100
+		$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
+		// Set bits 6-7 to 10
+		$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
+	
+		// Output the 36 character UUID.
+		return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
+	}
 }
diff --git a/lib/Db/TwoFactorMapper.php b/lib/Db/TwoFactorMapper.php
new file mode 100644
index 00000000..5b9739ab
--- /dev/null
+++ b/lib/Db/TwoFactorMapper.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace OCA\EcloudAccounts\Db;
+
+use OCP\IDBConnection;
+
+class TwoFactorMapper {
+	private IDBConnection $conn;
+	private const TOTP_SECRET_TABLE = 'twofactor_totp_secrets';
+
+
+	public function __construct(IDBConnection $conn) {
+		$this->conn = $conn;
+	}
+
+	public function getEntries(array $usernames = []) : array {
+		$entries = [];
+		$qb = $this->conn->getQueryBuilder();
+		$qb->select('user_id', 'secret')
+			->from(self::TOTP_SECRET_TABLE);
+
+		if (!empty($usernames)) {
+			$qb->where('user_id IN (:usernames)')
+				->setParameter('usernames', implode(',', $usernames));
+		}
+
+		$result = $qb->execute();
+		while ($row = $result->fetch()) {
+			$entry = [
+				'username' => (string) $row['user_id'],
+				'secret' => (string) $row['secret']
+			];
+			$entries[] = $entry;
+		}
+		return $entries;
+	}
+
+	public function getSecret(string $username) : string {
+		$qb = $this->conn->getQueryBuilder();
+		$qb->select('secret')
+			->from(self::TOTP_SECRET_TABLE)
+			->where('user_id = :username')
+			->setParameter('username', $username);
+		$result = $qb->execute();
+
+		return (string) $result->fetchOne();
+	}
+}
diff --git a/lib/Listeners/TwoFactorStateChangedListener.php b/lib/Listeners/TwoFactorStateChangedListener.php
new file mode 100644
index 00000000..860ad4b6
--- /dev/null
+++ b/lib/Listeners/TwoFactorStateChangedListener.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Listeners;
+
+use Exception;
+use OCA\TwoFactorTOTP\Event\StateChanged;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\App\IAppManager;
+use OCA\EcloudAccounts\Db\SSOMapper;
+use OCA\EcloudAccounts\Db\TwoFactorMapper;
+use OCP\ILogger;
+
+class TwoFactorStateChangedListener implements IEventListener {
+	private IAppManager $appManager;
+	private TwoFactorMapper $twoFactorMapper;
+	private SSOMapper $ssoMapper;
+	private ILogger $logger;
+
+	private const TWOFACTOR_APP_ID = 'twofactor_totp';
+
+
+	public function __construct(IAppManager $appManager, SSOMapper $ssoMapper, TwoFactorMapper $twoFactorMapper, ILogger $logger) {
+		$this->appManager = $appManager;
+		$this->ssoMapper = $ssoMapper;
+		$this->twoFactorMapper = $twoFactorMapper;
+		$this->logger = $logger;
+	}
+
+
+	public function handle(Event $event): void {
+		if (!($event instanceof StateChanged) || !$this->appManager->isEnabledForUser(self::TWOFACTOR_APP_ID)) {
+			return;
+		}
+
+		$user = $event->getUser();
+		$username = $user->getUID();
+		try {
+			// When state change event is fired by user disabling 2FA, delete existing credential and return
+			if (!$event->isEnabled()) {
+				$this->ssoMapper->deleteCredential($username);
+				return;
+			}
+
+			$secret = $this->twoFactorMapper->getSecret($username);
+			$this->ssoMapper->migrateCredential($username, $secret);
+		} catch (Exception $e) {
+			$stateText = $event->isEnabled() ? 'new secret enabled' : 'disabled';
+			$this->logger->error('Error updating secret state(' . $stateText  .') for user: ' . $username . ': ' . $e->getMessage());
+		}
+	}
+}
-- 
GitLab


From c8b77db61f9d20e2e2c10ea7f5b54b644f5e8f69 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Wed, 12 Jul 2023 15:39:48 +0530
Subject: [PATCH 027/185] Revert gitlab ci

---
 .gitlab-ci.yml | 47 +----------------------------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6233d12..6119917f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,5 @@
 variables:
-  CONTAINER_IMAGE: ubuntu
-  CONTAINER_TAG: focal
-  CONTAINER_NAME: nextcloud
-  APP_NAME: $CI_PROJECT_NAME
-  APP_ENABLE_ARGS: ''
-  TO_PACKAGE: 'appinfo l10n lib templates js img'
+    TO_PACKAGE: 'appinfo l10n lib templates js img'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -12,43 +7,3 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-deploy.yml"
-
-.deploy:nextcloud-app:
-  stage: deploy
-  # assuming all deployment will happen with sames image
-  image: $CONTAINER_IMAGE:$CONTAINER_TAG
-  # assuming we will need to add SSH for all deployment
-  before_script:
-    - echo "FAIL" > .job_status
-    - mkdir $HOME/.ssh
-    - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
-    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
-    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
-    - chmod 600 ~/.ssh/id_ed25519
-    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
-    - apt-get update && apt-get install -y openssh-client rsync
-  script:
-    - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
-    - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} && 
-      sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ && 
-      sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
-    - echo "SUCCESS" > .job_status
-  after_script:
-    # reading job status, checking it and implementing additional steps
-    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
-
-deploy:staging:
-  extends: .deploy:nextcloud-app
-  when: manual
-  only:
-    - main
-    - murena-main
-    - production
-    - dev/sync-new-secrets
-    - tags
-  environment:
-    name: staging/01
-    url: https://eeo.one
-- 
GitLab


From 8aeee82e2a6fe722adbdfe0e263efa8d1331bb34 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Thu, 13 Jul 2023 09:01:29 +0000
Subject: [PATCH 028/185] Update info.xml

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5f7d600a..ea1d40e8 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.2.1</version>
+    <version>3.3.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 560ebdd6055ed052e4f744851dc470c41b72d6b1 Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Mon, 17 Jul 2023 09:05:52 +0000
Subject: [PATCH 029/185] ecloud account debug logger

---
 lib/Settings/BetaUserSetting.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 79c6b95c..0b1301a2 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -47,12 +47,12 @@ class BetaUserSetting implements ISettings {
 	public function getSection(): ?string {
 		$betaGroupName = $this->config->getSystemValue("beta_group_name");
 		if (empty($betaGroupName)) {
-			$this->logger->warning('Beta group name is not set in config.php', ['app' => 'ecloud-accounts']);
+			$this->logger->debug('Beta group name is not set in config.php', ['app' => 'ecloud-accounts']);
 			return null;
 		}
 		$groupExists = $this->groupManager->groupExists($betaGroupName);
 		if (! $groupExists) {
-			$this->logger->warning('Beta group does not exist!', ['app' => 'ecloud-accounts']);
+			$this->logger->debug('Beta group does not exist!', ['app' => 'ecloud-accounts']);
 			return null;
 		}
 		return 'beta-user';
-- 
GitLab


From 85df58d4bb3da0220f991d54f34e09504f13899c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 17 Jul 2023 15:15:57 +0530
Subject: [PATCH 030/185] version bump

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index ea1d40e8..ee4fda38 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.3.0</version>
+    <version>3.3.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From a06c460e59d2e6a1892f91b6271d396e14160c32 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 17 Jul 2023 13:30:24 +0000
Subject: [PATCH 031/185] Delete all totp secrets, not just the nextcloud one

---
 l10n/de.js                                    |  4 ++-
 l10n/de.json                                  |  3 +-
 l10n/en.js                                    |  3 +-
 l10n/en.json                                  |  3 +-
 l10n/es.js                                    |  3 +-
 l10n/es.json                                  |  3 +-
 l10n/fr.js                                    |  3 +-
 l10n/fr.json                                  |  3 +-
 l10n/it.js                                    |  3 +-
 l10n/it.json                                  |  3 +-
 lib/Db/SSOMapper.php                          | 35 +++++++++----------
 .../TwoFactorStateChangedListener.php         |  7 ++--
 12 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/l10n/de.js b/l10n/de.js
index 46823807..47243d09 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -38,6 +38,8 @@ OC.L10N.register(
 		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",
 		"Loading...": "Laden...",
-		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!"
+		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!",
+		"Murena Cloud 2FA": "Murena Cloud 2FA"
+
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index b94ac709..d70e6d9c 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -37,7 +37,8 @@
 		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",
 		"Loading...": "Laden...",
-		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!"
+		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!",
+		"Murena Cloud 2FA": "Murena Cloud 2FA"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index bc284754..422054cf 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -40,6 +40,7 @@ OC.L10N.register(
 		"Here is the list of currently available beta features:": "Here is the list of currently available beta features:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "A subscription is active in this account. Please cancel it or let it expire before deleting your account.",
 		"Loading...": "Loading...",
-		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!"
+		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!",
+		"Murena Cloud 2FA": "Murena Cloud 2FA"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index bdcda7af..83db6b42 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -37,7 +37,8 @@
 		"Here is the list of currently available beta features:": "Here is the list of currently available beta features:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "A subscription is active in this account. Please cancel it or let it expire before deleting your account.",
 		"Loading...": "Loading...",
-		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!"
+		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!",
+		"Murena Cloud 2FA": "Murena Cloud 2FA"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index 713bffb6..3a081dd1 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -39,6 +39,7 @@ OC.L10N.register(
 		"Here is the list of currently available beta features:": "Esta es la lista de funciones de la versión beta disponibles actualmente:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Hay una suscripción activa en esta cuenta. Por favor, cancélala o deja que expire antes de eliminar tu cuenta.",
 		"Loading...": "Cargando...",
-		"Temporary error contacting murena.com; please try again later!": "Error temporal al contactar con murena.com; ¡por favor, inténtalo más tarde!"
+		"Temporary error contacting murena.com; please try again later!": "Error temporal al contactar con murena.com; ¡por favor, inténtalo más tarde!",
+		"Murena Cloud 2FA": "Nube Murena A2F"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index fc0959d3..b8594865 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -37,7 +37,8 @@
 		"Here is the list of currently available beta features:": "Esta es la lista de funciones de la versión beta disponibles actualmente:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Hay una suscripción activa en esta cuenta. Por favor, cancélala o deja que expire antes de eliminar tu cuenta.",
 		"Loading...": "Cargando...",
-		"Temporary error contacting murena.com; please try again later!": "Error temporal al contactar con murena.com; ¡por favor, inténtalo más tarde!"
+		"Temporary error contacting murena.com; please try again later!": "Error temporal al contactar con murena.com; ¡por favor, inténtalo más tarde!",
+		"Murena Cloud 2FA": "Nube Murena A2F"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 11002b93..1f668c1f 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -38,6 +38,7 @@ OC.L10N.register(
 		"Here is the list of currently available beta features:": "Voici la liste des fonctionnalités de la version bêta actuellement disponibles :",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Un abonnement est actif dans ce compte. Veuillez l'annuler ou le laisser expirer avant de supprimer votre compte.",
 		"Loading...": "Chargement...",
-		"Temporary error contacting murena.com; please try again later!": "Erreur temporaire en contactant murena.com ; veuillez réessayer plus tard !"
+		"Temporary error contacting murena.com; please try again later!": "Erreur temporaire en contactant murena.com ; veuillez réessayer plus tard !",
+		"Murena Cloud 2FA": "Authentification à 2 facteurs Murena Cloud"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 1a3e3ae4..48a79c47 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -37,7 +37,8 @@
 		"Here is the list of currently available beta features:": "Voici la liste des fonctionnalités de la version bêta actuellement disponibles :",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Un abonnement est actif dans ce compte. Veuillez l'annuler ou le laisser expirer avant de supprimer votre compte.",
 		"Loading...": "Chargement...",
-		"Temporary error contacting murena.com; please try again later!": "Erreur temporaire en contactant murena.com ; veuillez réessayer plus tard !"
+		"Temporary error contacting murena.com; please try again later!": "Erreur temporaire en contactant murena.com ; veuillez réessayer plus tard !",
+		"Murena Cloud 2FA": "Authentification à 2 facteurs Murena Cloud"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 12976c09..7dbe4434 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -38,6 +38,7 @@ OC.L10N.register(
 		"Here is the list of currently available beta features:": "Ecco l'elenco delle funzioni beta attualmente disponibili:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "In questo account è attivo un abbonamento. Si prega di annullarlo o di lasciarlo scadere prima di cancellare l'account.",
 		"Loading...": "Caricamento...",
-		"Temporary error contacting murena.com; please try again later!": "Errore temporaneo nel contattare murena.com; riprova più tardi!"
+		"Temporary error contacting murena.com; please try again later!": "Errore temporaneo nel contattare murena.com; riprova più tardi!",
+		"Murena Cloud 2FA": "Codice di Autenticazione a 2 Fattori Murena Cloud"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 2dc17b44..1c9cb7a0 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -37,7 +37,8 @@
 		"Here is the list of currently available beta features:": "Ecco l'elenco delle funzioni beta attualmente disponibili:",
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "In questo account è attivo un abbonamento. Si prega di annullarlo o di lasciarlo scadere prima di cancellare l'account.",
 		"Loading...": "Caricamento...",
-		"Temporary error contacting murena.com; please try again later!": "Errore temporaneo nel contattare murena.com; riprova più tardi!"
+		"Temporary error contacting murena.com; please try again later!": "Errore temporaneo nel contattare murena.com; riprova più tardi!",
+		"Murena Cloud 2FA": "Codice di Autenticazione a 2 Fattori Murena Cloud"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
index d172ddda..3cb62a85 100644
--- a/lib/Db/SSOMapper.php
+++ b/lib/Db/SSOMapper.php
@@ -6,10 +6,12 @@ use OCP\IConfig;
 use OCP\ILogger;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Connection;
+use OCA\EcloudAccounts\AppInfo\Application;
 use OCP\IUserManager;
 use OCP\Security\ICrypto;
 use OCP\IUser;
 use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
+use OCP\L10N\IFactory;
 
 class SSOMapper {
 	private IConfig $config;
@@ -17,20 +19,14 @@ class SSOMapper {
 	private Connection $conn;
 	private IUserManager $userManager;
 	private ICrypto $crypto;
+	private IFactory $l10nFactory;
 
 	private const USER_ATTRIBUTE_TABLE = 'USER_ATTRIBUTE';
 	private const CREDENTIAL_TABLE = 'CREDENTIAL';
-
 	private const SSO_CONFIG_KEY = 'keycloak';
-	private const USER_LABELS = [
-		'en' => 'Murena Cloud 2FA',
-		'es' => 'Murena Cloud 2FA',
-		'de' => 'Murena Cloud 2FA',
-		'it' => 'Murena Cloud 2FA',
-		'fr' => 'Murena Cloud 2FA',
-	];
-
-	public function __construct(IConfig $config, IUserManager $userManager, ILogger $logger, ICrypto $crypto) {
+
+	public function __construct(IConfig $config, IUserManager $userManager, ILogger $logger, ICrypto $crypto, IFactory $l10nFactory) {
+		$this->l10nFactory = $l10nFactory;
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->userManager = $userManager;
@@ -38,6 +34,10 @@ class SSOMapper {
 		$this->initConnection();
 	}
 
+	public function isSSOEnabled() : bool {
+		return isset($this->conn);
+	}
+
 	public function getUserId(string $username) : string {
 		$qb = $this->conn->createQueryBuilder();
 		$qb->select('USER_ID')
@@ -50,13 +50,13 @@ class SSOMapper {
 		return (string) $result->fetchOne();
 	}
 
-	public function deleteCredential(string $username) {
+	public function deleteCredentials(string $username) {
 		$userId = $this->getUserId($username);
 		$qb = $this->conn->createQueryBuilder();
 		$qb->delete(self::CREDENTIAL_TABLE)
 			->where('USER_ID = :username')
 			->andWhere('TYPE = "otp"')
-			->andWhere('CREDENTIAL_DATA LIKE "%\"subType\":\"nextcloud_totp\"%"')
+			->andWhere('CREDENTIAL_DATA LIKE "%\"subType\":\"nextcloud_totp\"%" OR CREDENTIAL_DATA LIKE "%\"subType\":\"totp\"%"')
 			->setParameter('username', $userId)
 			->execute();
 	}
@@ -73,12 +73,9 @@ class SSOMapper {
 		}
 
 		$language = $this->config->getUserValue($username, 'core', 'lang', 'en');
-		if (!array_key_exists($language, self::USER_LABELS)) {
-			$language = 'en';
-		}
 
-		// Only one "nextcloud_totp" at a time
-		$this->deleteCredential($username);
+		// Only one 2FA device at  a time
+		$this->deleteCredentials($username);
 
 		$entry = $this->getCredentialEntry($decryptedSecret, $ssoUserId, $language);
 		$this->insertCredential($entry);
@@ -101,7 +98,9 @@ class SSOMapper {
 		// Create the random UUID from the sso user ID so multiple entries of same credential do not happen
 		$id = $this->randomUUID(substr($ssoUserId, 0, 16));
 
-		$userLabel = self::USER_LABELS[$language];
+		$l10n = $this->l10nFactory->get(Application::APP_ID, $language);
+		$userLabel = $l10n->t('Murena Cloud 2FA');
+
 		$credentialEntry = [
 			'ID' => $id,
 			'USER_ID' => $ssoUserId,
diff --git a/lib/Listeners/TwoFactorStateChangedListener.php b/lib/Listeners/TwoFactorStateChangedListener.php
index 860ad4b6..9624abdb 100644
--- a/lib/Listeners/TwoFactorStateChangedListener.php
+++ b/lib/Listeners/TwoFactorStateChangedListener.php
@@ -31,16 +31,17 @@ class TwoFactorStateChangedListener implements IEventListener {
 
 
 	public function handle(Event $event): void {
-		if (!($event instanceof StateChanged) || !$this->appManager->isEnabledForUser(self::TWOFACTOR_APP_ID)) {
+		if (!($event instanceof StateChanged) || !$this->appManager->isEnabledForUser(self::TWOFACTOR_APP_ID) || !$this->ssoMapper->isSSOEnabled()) {
 			return;
 		}
 
 		$user = $event->getUser();
 		$username = $user->getUID();
 		try {
-			// When state change event is fired by user disabling 2FA, delete existing credential and return
+			// When state change event is fired by user disabling 2FA, delete existing 2FA credentials and return
+			// i.e. disable 2FA for user at SSO
 			if (!$event->isEnabled()) {
-				$this->ssoMapper->deleteCredential($username);
+				$this->ssoMapper->deleteCredentials($username);
 				return;
 			}
 
-- 
GitLab


From 350605c2f3de64a91972622e0d246a9cfaf425b0 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 18 Jul 2023 06:57:21 +0000
Subject: [PATCH 032/185] Update info.xml

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index ee4fda38..28063944 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.3.1</version>
+    <version>3.3.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 44da22860777a78da75f66ed659bcacd253c2930 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Jul 2023 14:29:08 +0530
Subject: [PATCH 033/185] init conn only if config is defined

---
 lib/Db/SSOMapper.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
index 3cb62a85..d0f0c69c 100644
--- a/lib/Db/SSOMapper.php
+++ b/lib/Db/SSOMapper.php
@@ -31,7 +31,9 @@ class SSOMapper {
 		$this->logger = $logger;
 		$this->userManager = $userManager;
 		$this->crypto = $crypto;
-		$this->initConnection();
+		if (!empty($this->config->getSystemValue(self::SSO_CONFIG_KEY))) {
+			$this->initConnection();
+		}
 	}
 
 	public function isSSOEnabled() : bool {
-- 
GitLab


From 7a98d3716f38c7aa3d1d37c3b1e6c4759ebb97c4 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 18 Jul 2023 10:03:25 +0000
Subject: [PATCH 034/185] Update info.xml

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 28063944..367f746d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.3.2</version>
+    <version>3.3.3</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From c3e5c1fdca20cbf49009f931695b0060cb52793a Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Wed, 9 Aug 2023 22:56:58 +0530
Subject: [PATCH 035/185] Throw an exception if shop user has active
 subscription

---
 ...eletingUserWithActiveSubscriptionException.php |  9 +++++++++
 lib/Listeners/BeforeUserDeletedListener.php       | 15 +++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 lib/Exception/DeletingUserWithActiveSubscriptionException.php

diff --git a/lib/Exception/DeletingUserWithActiveSubscriptionException.php b/lib/Exception/DeletingUserWithActiveSubscriptionException.php
new file mode 100644
index 00000000..edbc393b
--- /dev/null
+++ b/lib/Exception/DeletingUserWithActiveSubscriptionException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class DeletingUserWithActiveSubscriptionException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Listeners/BeforeUserDeletedListener.php b/lib/Listeners/BeforeUserDeletedListener.php
index c69120df..15e42d65 100644
--- a/lib/Listeners/BeforeUserDeletedListener.php
+++ b/lib/Listeners/BeforeUserDeletedListener.php
@@ -13,6 +13,7 @@ use OCP\User\Events\BeforeUserDeletedEvent;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCA\EcloudAccounts\Service\ShopAccountService;
 use OCA\EcloudAccounts\Service\UserService;
+use OCA\EcloudAccounts\Exception\DeletingUserWithActiveSubscriptionException;
 
 class BeforeUserDeletedListener implements IEventListener {
 	private $logger;
@@ -38,6 +39,10 @@ class BeforeUserDeletedListener implements IEventListener {
 		$user = $event->getUser();
 		$email = $user->getEMailAddress();
 		$uid = $user->getUID();
+
+		// Handle shop accounts first; none of the other things should happen before the active subscription check
+		$this->handleShopAccounts($uid, $email);
+
 		$isUserOnLDAP = $this->LDAPConnectionService->isUserOnLDAPBackend($user);
 
 		$this->logger->info("PostDelete user {user}", array('user' => $uid));
@@ -58,12 +63,22 @@ class BeforeUserDeletedListener implements IEventListener {
 		} catch (Exception $e) {
 			$this->logger->error('Error deleting aliases for user '. $uid . ' :' . $e->getMessage());
 		}
+	}
 
+	private function handleShopAccounts(string $uid, string $email) {
 		$deleteShopAccount = $this->shopAccountService->getShopDeletePreference($uid);
 		$shopUsers = $this->shopAccountService->getUsers($email);
 
 		if (!empty($shopUsers)) {
 			foreach ($shopUsers as $shopUser) {
+				if ($shopUser['has_active_subscription']) {
+					throw new DeletingUserWithActiveSubscriptionException('Cannot delete user ' . $uid . ' as an active subscription exists');
+				}
+
+				if (!isset($shopUser['id'])) {
+					continue;
+				}
+
 				if ($deleteShopAccount) {
 					$this->shopAccountService->deleteUser($shopUser['shop_url'], $shopUser['id']);
 				} else {
-- 
GitLab


From 6afb1dacfa7d580d30357dd90e5586a015893b93 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 5 Sep 2023 08:38:36 +0000
Subject: [PATCH 036/185] Add migration as occ command

---
 .gitlab-ci.yml                             |  47 +++++-
 appinfo/info.xml                           |   1 +
 lib/Command/Migrate2FASecrets.php          |   2 +-
 lib/Command/MigrateWebmailAddressbooks.php | 102 ++++++++++++
 lib/Db/SSOMapper.php                       |  12 +-
 lib/Db/WebmailMapper.php                   | 182 +++++++++++++++++++++
 6 files changed, 338 insertions(+), 8 deletions(-)
 create mode 100644 lib/Command/MigrateWebmailAddressbooks.php
 create mode 100644 lib/Db/WebmailMapper.php

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6119917f..bbaf00ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,10 @@
 variables:
-    TO_PACKAGE: 'appinfo l10n lib templates js img'
+  CONTAINER_IMAGE: ubuntu
+  CONTAINER_TAG: focal
+  CONTAINER_NAME: nextcloud
+  APP_NAME: $CI_PROJECT_NAME
+  APP_ENABLE_ARGS: ''
+  TO_PACKAGE: 'appinfo l10n lib templates js img'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -7,3 +12,43 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-deploy.yml"
+
+.deploy:nextcloud-app:
+  stage: deploy
+  # assuming all deployment will happen with sames image
+  image: $CONTAINER_IMAGE:$CONTAINER_TAG
+  # assuming we will need to add SSH for all deployment
+  before_script:
+    - echo "FAIL" > .job_status
+    - mkdir $HOME/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
+    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
+    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
+    - chmod 600 ~/.ssh/id_ed25519
+    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
+    - apt-get update && apt-get install -y openssh-client rsync
+  script:
+    - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
+    - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} && 
+      sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ && 
+      sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
+    - echo "SUCCESS" > .job_status
+  after_script:
+    # reading job status, checking it and implementing additional steps
+    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
+
+deploy:staging:
+  extends: .deploy:nextcloud-app
+  when: manual
+  only:
+    - main
+    - murena-main
+    - production
+    - dev/migrate-webmail-contacts
+    - tags
+  environment:
+    name: staging/01
+    url: https://eeo.one
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 367f746d..97353b22 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,5 +26,6 @@
 	</settings>
     <commands>
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
+        <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
     </commands>
 </info>
diff --git a/lib/Command/Migrate2FASecrets.php b/lib/Command/Migrate2FASecrets.php
index 13bddf36..1dd8cb38 100644
--- a/lib/Command/Migrate2FASecrets.php
+++ b/lib/Command/Migrate2FASecrets.php
@@ -61,7 +61,7 @@ class Migrate2FASecrets extends Command {
 		foreach ($entries as $entry) {
 			try {
 				$this->ssoMapper->migrateCredential($entry['username'], $entry['secret']);
-			} catch(\Exception $e) {
+			} catch (\Exception $e) {
 				$this->commandOutput->writeln('Error inserting entry for user ' . $entry['username'] . ' message: ' . $e->getMessage());
 				continue;
 			}
diff --git a/lib/Command/MigrateWebmailAddressbooks.php b/lib/Command/MigrateWebmailAddressbooks.php
new file mode 100644
index 00000000..4f089fb8
--- /dev/null
+++ b/lib/Command/MigrateWebmailAddressbooks.php
@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use OCA\EcloudAccounts\Db\WebmailMapper;
+use OCP\IUserManager;
+use OCP\IUser;
+
+class MigrateWebmailAddressbooks extends Command {
+	private OutputInterface $commandOutput;
+	private WebmailMapper $webmailMapper;
+	private IUserManager $userManager;
+
+	public function __construct(WebmailMapper $webmailMapper, IUserManager $userManager) {
+		$this->webmailMapper = $webmailMapper;
+		$this->userManager = $userManager;
+		parent::__construct();
+	}
+
+	protected function configure(): void {
+		$this
+			->setName('ecloud-accounts:migrate-webmail-addressbooks')
+			->setDescription('Migrates Webmail addressbooks to cloud')
+			->addOption(
+				'users',
+				null,
+				InputOption::VALUE_OPTIONAL,
+				'comma separated list of users',
+				''
+			)
+			->addOption(
+				'limit',
+				null,
+				InputOption::VALUE_OPTIONAL,
+				'Limit of users to migrate',
+				null
+			)
+			->addOption(
+				'offset',
+				null,
+				InputOption::VALUE_OPTIONAL,
+				'Offset',
+				0
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		try {
+			$this->commandOutput = $output;
+			$usernames = [];
+			$usernameList = $input->getOption('users');
+			if (!empty($usernameList)) {
+				$usernames = explode(',', $usernameList);
+			}
+			$limit = (int) $input->getOption('limit');
+			$offset = (int) $input->getOption('offset');
+			$this->migrateUsers($limit, $offset, $usernames);
+			return 0;
+		} catch (\Exception $e) {
+			$this->commandOutput->writeln($e->getMessage());
+			return 1;
+		}
+	}
+
+	/**
+	 * Migrate user secrets to the SSO database
+	 *
+	 * @return void
+	 */
+	private function migrateUsers(int $limit, int $offset = 0, array $usernames = []) : void {
+		$users = [];
+		if (!empty($usernames)) {
+			$emails = [];
+			foreach ($usernames as $username) {
+				$user = $this->userManager->get($username);
+				if (!$user instanceof IUser) {
+					$this->commandOutput->writeln('User ' . $username . ' does not exist!');
+					continue;
+				}
+
+				$email = $user->getEMailAddress();
+				$emails[] = $email;
+			}
+
+			
+			$users = $this->webmailMapper->getUsers($limit, $offset, $emails);
+			if (empty($users)) {
+				return;
+			}
+			$this->webmailMapper->migrateContacts($users);
+			return;
+		}
+		$users = $this->webmailMapper->getUsers($limit, $offset);
+		$this->webmailMapper->migrateContacts($users);
+	}
+}
diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
index d0f0c69c..a879660d 100644
--- a/lib/Db/SSOMapper.php
+++ b/lib/Db/SSOMapper.php
@@ -170,12 +170,12 @@ class SSOMapper {
 		return $params;
 	}
 
-		/**
-		 *	From https://www.uuidgenerator.net/dev-corner/php
-		 *	As keycloak generates random UUIDs using the java.util.UUID class which is RFC 4122 compliant
-		 *
-		 *   @return string
-		 */
+	/**
+	 *	From https://www.uuidgenerator.net/dev-corner/php
+	 *	As keycloak generates random UUIDs using the java.util.UUID class which is RFC 4122 compliant
+	 *
+	 *   @return string
+	 */
 	private function randomUUID($data = null) : string {
 		// Generate 16 bytes (128 bits) of random data or use the data passed into the function.
 		$data = $data ?? random_bytes(16);
diff --git a/lib/Db/WebmailMapper.php b/lib/Db/WebmailMapper.php
new file mode 100644
index 00000000..1c524cbf
--- /dev/null
+++ b/lib/Db/WebmailMapper.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace OCA\EcloudAccounts\Db;
+
+use OCP\IConfig;
+use OCP\ILogger;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Connection;
+use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
+use Sabre\VObject\UUIDUtil;
+use \Sabre\VObject\Reader;
+use OCP\IUserManager;
+use OCP\IUser;
+use OCA\DAV\CardDAV\CardDavBackend;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use Throwable;
+
+class WebmailMapper {
+	private IConfig $config;
+	private ILogger $logger;
+	private Connection $conn;
+	private CardDavBackend $cardDavBackend;
+	private IUserManager $userManager;
+
+
+	private const WEBMAIL_DB_CONFIG_KEY = 'webmail_db';
+	private const USERS_TABLE = 'rainloop_users';
+
+	public function __construct(IConfig $config, ILogger $logger, CardDavBackend $cardDavBackend, IUserManager $userManager) {
+		$this->config = $config;
+		$this->logger = $logger;
+		$this->cardDavBackend = $cardDavBackend;
+		$this->userManager = $userManager;
+		if (!empty($this->config->getSystemValue(self::WEBMAIL_DB_CONFIG_KEY))) {
+			$this->initConnection();
+		}
+	}
+
+	private function isDbConfigValid($config) : bool {
+		if (!$config || !is_array($config)) {
+			return false;
+		}
+		if (!isset($config['db_port'])) {
+			$config['db_port'] = 3306;
+		}
+
+		return isset($config['db_name'])
+			&& isset($config['db_user'])
+			&& isset($config['db_password'])
+			&& isset($config['db_host'])
+			&& isset($config['db_port']) ;
+	}
+
+
+	public function getUsers(int $limit, int $offset = 0, array $emails = []) : array {
+		$qb = $this->conn->createQueryBuilder();
+		$qb->select('rl_email, id_user')
+			->from(self::USERS_TABLE, 'u')
+			->setFirstResult($offset);
+		if ($limit) {
+			$qb->setMaxResults($limit);
+		}
+		if (!empty($emails)) {
+			$qb->where('rl_email in (:emails)');
+			$qb->setParameter('emails', $emails, IQueryBuilder::PARAM_STR_ARRAY);
+		}
+		
+		$result = $qb->execute();
+
+		$users = [];
+		while ($row = $result->fetch()) {
+			$user = [
+				'email' => $row['rl_email'],
+				'id' => $row['id_user']
+			];
+			$users[] = $user;
+		}
+		return $users;
+	}
+
+	private function getUserContacts(string $uid) : array {
+		$qb = $this->conn->createQueryBuilder();
+
+		$qb->select('p.prop_value')
+			->from('rainloop_ab_contacts', 'c')
+			->where('c.id_user = :uid')
+			->andWhere('p.prop_value IS NOT NULL')
+			->setParameter('uid', $uid)
+			->leftJoin('c', 'rainloop_ab_properties', 'p', 'p.id_contact = c.id_contact AND p.prop_type = 251');
+
+		$result = $qb->execute();
+		$contacts = [];
+		while ($row = $result->fetch()) {
+			$contacts[] = Reader::readJson($row['prop_value']);
+		}
+		return $contacts;
+	}
+
+	private function createCloudAddressBook(array $contacts, string $email) {
+		$users = $this->userManager->getByEmail($email);
+		$user = $users[0];
+
+		if (!$user instanceof IUser) {
+			return;
+		}
+
+		$username = $user->getUID();
+
+		$principalUri = 'principals/users/'. $username;
+		$addressbookUri = 'webmail'; // some unique identifier
+		try {
+			$alreadyImported = $this->cardDavBackend->getAddressBooksByUri($principalUri, $addressbookUri);
+
+			if ($alreadyImported) {
+				return;
+			}
+
+			$addressBookId = $this->cardDavBackend->createAddressBook(
+				$principalUri,
+				$addressbookUri,
+				[
+					'{DAV:}displayname' => 'Webmail',
+					'{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'Contacts imported from snappymail'
+				]
+			);
+		} catch (Throwable $e) {
+			$this->logger->error('Error creating address book for user: ' . $username . ' ' . $e->getMessage());
+		}
+		foreach ($contacts as $contact) {
+			try {
+				$contact->PRODID = '-//IDN murena.io//Migrated contact//EN';
+
+				$this->cardDavBackend->createCard(
+					$addressBookId,
+					UUIDUtil::getUUID() . '.vcf',
+					$contact->serialize(),
+					true
+				);
+			} catch (Throwable $e) {
+				$this->logger->error('Error inserting contact for user: ' . $username . ' contact: ' . $contact->serialize() . ' ' . $e->getMessage());
+			}
+		}
+	}
+
+	public function migrateContacts(array $users) {
+		foreach ($users as $user) {
+			$contacts = $this->getUserContacts($user['id']);
+			if (!count($contacts)) {
+				return;
+			}
+			$this->createCloudAddressBook($contacts, $user['email']);
+		}
+	}
+
+
+	private function initConnection() : void {
+		try {
+			$params = $this->getConnectionParams();
+			$this->conn = DriverManager::getConnection($params);
+		} catch (Throwable $e) {
+			$this->logger->error('Error connecting to Webmail database: ' . $e->getMessage());
+		}
+	}
+
+	private function getConnectionParams() : array {
+		$config = $this->config->getSystemValue(self::WEBMAIL_DB_CONFIG_KEY);
+		
+		if (!$this->isDbConfigValid($config)) {
+			throw new DbConnectionParamsException('Invalid Webmail database configuration!');
+		}
+
+		$params = [
+			'dbname' => $config['db_name'],
+			'user' => $config['db_user'],
+			'password' => $config['db_password'],
+			'host' => $config['db_host'],
+			'port' => $config['db_port'],
+			'driver' => 'pdo_mysql'
+		];
+		return $params;
+	}
+}
-- 
GitLab


From 2b36f2ce3ef649ff17069838f9d023744e892792 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 5 Sep 2023 09:43:49 +0000
Subject: [PATCH 037/185] 3.4.0

---
 .gitlab-ci.yml   | 47 +----------------------------------------------
 appinfo/info.xml |  2 +-
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbaf00ac..6119917f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,5 @@
 variables:
-  CONTAINER_IMAGE: ubuntu
-  CONTAINER_TAG: focal
-  CONTAINER_NAME: nextcloud
-  APP_NAME: $CI_PROJECT_NAME
-  APP_ENABLE_ARGS: ''
-  TO_PACKAGE: 'appinfo l10n lib templates js img'
+    TO_PACKAGE: 'appinfo l10n lib templates js img'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
@@ -12,43 +7,3 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-deploy.yml"
-
-.deploy:nextcloud-app:
-  stage: deploy
-  # assuming all deployment will happen with sames image
-  image: $CONTAINER_IMAGE:$CONTAINER_TAG
-  # assuming we will need to add SSH for all deployment
-  before_script:
-    - echo "FAIL" > .job_status
-    - mkdir $HOME/.ssh
-    - chmod 700 ~/.ssh
-    - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519
-    - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub
-    - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
-    - chmod 600 ~/.ssh/id_ed25519
-    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
-    - apt-get update && apt-get install -y openssh-client rsync
-  script:
-    - echo "Deploying ${APP_NAME} to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"
-    - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:disable ${APP_NAME} && 
-      sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/custom_apps/ && 
-      sudo docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ app:enable ${APP_ENABLE_ARGS} ${APP_NAME}"
-    - echo "SUCCESS" > .job_status
-  after_script:
-    # reading job status, checking it and implementing additional steps
-    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
-    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
-
-deploy:staging:
-  extends: .deploy:nextcloud-app
-  when: manual
-  only:
-    - main
-    - murena-main
-    - production
-    - dev/migrate-webmail-contacts
-    - tags
-  environment:
-    name: staging/01
-    url: https://eeo.one
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 97353b22..d72581ef 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.3.3</version>
+    <version>3.4.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From a32b4ee6bc46b3521f4b840e7fa277b12241afd1 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 5 Sep 2023 11:16:25 +0000
Subject: [PATCH 038/185] Add more logging to the migrate command

---
 lib/Command/MigrateWebmailAddressbooks.php | 16 ++++++++++------
 lib/Db/WebmailMapper.php                   | 20 ++++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/lib/Command/MigrateWebmailAddressbooks.php b/lib/Command/MigrateWebmailAddressbooks.php
index 4f089fb8..7a866223 100644
--- a/lib/Command/MigrateWebmailAddressbooks.php
+++ b/lib/Command/MigrateWebmailAddressbooks.php
@@ -30,21 +30,21 @@ class MigrateWebmailAddressbooks extends Command {
 			->addOption(
 				'users',
 				null,
-				InputOption::VALUE_OPTIONAL,
+				InputOption::VALUE_REQUIRED,
 				'comma separated list of users',
 				''
 			)
 			->addOption(
 				'limit',
 				null,
-				InputOption::VALUE_OPTIONAL,
+				InputOption::VALUE_REQUIRED,
 				'Limit of users to migrate',
-				null
+				0
 			)
 			->addOption(
 				'offset',
 				null,
-				InputOption::VALUE_OPTIONAL,
+				InputOption::VALUE_REQUIRED,
 				'Offset',
 				0
 			);
@@ -88,12 +88,16 @@ class MigrateWebmailAddressbooks extends Command {
 				$emails[] = $email;
 			}
 
-			
+			if ($limit === 0) {
+				$this->commandOutput->writeln('Migrating all users starting at ' . $offset);
+			} else {
+				$this->commandOutput->writeln('Migrating ' . $limit . ' users starting at ' . $offset);
+			}
 			$users = $this->webmailMapper->getUsers($limit, $offset, $emails);
 			if (empty($users)) {
 				return;
 			}
-			$this->webmailMapper->migrateContacts($users);
+			$this->webmailMapper->migrateContacts($users, $this->commandOutput);
 			return;
 		}
 		$users = $this->webmailMapper->getUsers($limit, $offset);
diff --git a/lib/Db/WebmailMapper.php b/lib/Db/WebmailMapper.php
index 1c524cbf..614d13ea 100644
--- a/lib/Db/WebmailMapper.php
+++ b/lib/Db/WebmailMapper.php
@@ -52,12 +52,12 @@ class WebmailMapper {
 	}
 
 
-	public function getUsers(int $limit, int $offset = 0, array $emails = []) : array {
+	public function getUsers(int $limit = 0, int $offset = 0, array $emails = []) : array {
 		$qb = $this->conn->createQueryBuilder();
 		$qb->select('rl_email, id_user')
 			->from(self::USERS_TABLE, 'u')
 			->setFirstResult($offset);
-		if ($limit) {
+		if ($limit > 0) {
 			$qb->setMaxResults($limit);
 		}
 		if (!empty($emails)) {
@@ -142,13 +142,21 @@ class WebmailMapper {
 		}
 	}
 
-	public function migrateContacts(array $users) {
+	public function migrateContacts(array $users, $commandOutput = null) {
+		$userCount = 0;
 		foreach ($users as $user) {
+			$userCount += 1;
+			if ($commandOutput) {
+				$commandOutput->writeln('Migrating user ' . $userCount . ' with email: '.  $user['email']);
+			}
 			$contacts = $this->getUserContacts($user['id']);
-			if (!count($contacts)) {
-				return;
+			$numberOfContacts = count($contacts);
+			if ($commandOutput) {
+				$commandOutput->writeln('Number of contacts for ' . $user['email'] . ':' . $numberOfContacts);
+			}
+			if ($numberOfContacts > 0) {
+				$this->createCloudAddressBook($contacts, $user['email']);
 			}
-			$this->createCloudAddressBook($contacts, $user['email']);
 		}
 	}
 
-- 
GitLab


From 9177c52f5938478c72307c5237dd70e382127a50 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 5 Sep 2023 17:01:42 +0530
Subject: [PATCH 039/185] Fix logging for webmail migration

---
 lib/Command/MigrateWebmailAddressbooks.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Command/MigrateWebmailAddressbooks.php b/lib/Command/MigrateWebmailAddressbooks.php
index 7a866223..36ccb610 100644
--- a/lib/Command/MigrateWebmailAddressbooks.php
+++ b/lib/Command/MigrateWebmailAddressbooks.php
@@ -73,7 +73,7 @@ class MigrateWebmailAddressbooks extends Command {
 	 *
 	 * @return void
 	 */
-	private function migrateUsers(int $limit, int $offset = 0, array $usernames = []) : void {
+	private function migrateUsers(int $limit = 0 , int $offset = 0, array $usernames = []) : void {
 		$users = [];
 		if (!empty($usernames)) {
 			$emails = [];
@@ -87,12 +87,6 @@ class MigrateWebmailAddressbooks extends Command {
 				$email = $user->getEMailAddress();
 				$emails[] = $email;
 			}
-
-			if ($limit === 0) {
-				$this->commandOutput->writeln('Migrating all users starting at ' . $offset);
-			} else {
-				$this->commandOutput->writeln('Migrating ' . $limit . ' users starting at ' . $offset);
-			}
 			$users = $this->webmailMapper->getUsers($limit, $offset, $emails);
 			if (empty($users)) {
 				return;
@@ -101,6 +95,11 @@ class MigrateWebmailAddressbooks extends Command {
 			return;
 		}
 		$users = $this->webmailMapper->getUsers($limit, $offset);
-		$this->webmailMapper->migrateContacts($users);
+		if ($limit === 0) {
+			$this->commandOutput->writeln('Migrating all users starting at ' . $offset);
+		} else {
+			$this->commandOutput->writeln('Migrating ' . $limit . ' users starting at ' . $offset);
+		}
+		$this->webmailMapper->migrateContacts($users, $this->commandOutput);
 	}
 }
-- 
GitLab


From ced5ecec69765160715604b4df33d91ddea835cf Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 5 Sep 2023 17:07:45 +0530
Subject: [PATCH 040/185] Fix lint

---
 lib/Command/MigrateWebmailAddressbooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Command/MigrateWebmailAddressbooks.php b/lib/Command/MigrateWebmailAddressbooks.php
index 36ccb610..cce07a14 100644
--- a/lib/Command/MigrateWebmailAddressbooks.php
+++ b/lib/Command/MigrateWebmailAddressbooks.php
@@ -73,7 +73,7 @@ class MigrateWebmailAddressbooks extends Command {
 	 *
 	 * @return void
 	 */
-	private function migrateUsers(int $limit = 0 , int $offset = 0, array $usernames = []) : void {
+	private function migrateUsers(int $limit = 0, int $offset = 0, array $usernames = []) : void {
 		$users = [];
 		if (!empty($usernames)) {
 			$emails = [];
-- 
GitLab


From 5f7bb495c00fd2a77aaa70e763a563bf3d5291e9 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Wed, 6 Sep 2023 12:46:31 +0000
Subject: [PATCH 041/185] Use pdo addressbook

---
 lib/Command/MigrateWebmailAddressbooks.php | 10 ++--
 lib/Db/WebmailMapper.php                   | 66 +++++++++++-----------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/lib/Command/MigrateWebmailAddressbooks.php b/lib/Command/MigrateWebmailAddressbooks.php
index cce07a14..0ce63dee 100644
--- a/lib/Command/MigrateWebmailAddressbooks.php
+++ b/lib/Command/MigrateWebmailAddressbooks.php
@@ -74,7 +74,6 @@ class MigrateWebmailAddressbooks extends Command {
 	 * @return void
 	 */
 	private function migrateUsers(int $limit = 0, int $offset = 0, array $usernames = []) : void {
-		$users = [];
 		if (!empty($usernames)) {
 			$emails = [];
 			foreach ($usernames as $username) {
@@ -87,19 +86,18 @@ class MigrateWebmailAddressbooks extends Command {
 				$email = $user->getEMailAddress();
 				$emails[] = $email;
 			}
-			$users = $this->webmailMapper->getUsers($limit, $offset, $emails);
-			if (empty($users)) {
+			if (empty($emails)) {
 				return;
 			}
-			$this->webmailMapper->migrateContacts($users, $this->commandOutput);
+			$this->webmailMapper->migrateContacts($emails, $this->commandOutput);
 			return;
 		}
-		$users = $this->webmailMapper->getUsers($limit, $offset);
+		$emails = $this->webmailMapper->getEmails($limit, $offset);
 		if ($limit === 0) {
 			$this->commandOutput->writeln('Migrating all users starting at ' . $offset);
 		} else {
 			$this->commandOutput->writeln('Migrating ' . $limit . ' users starting at ' . $offset);
 		}
-		$this->webmailMapper->migrateContacts($users, $this->commandOutput);
+		$this->webmailMapper->migrateContacts($emails, $this->commandOutput);
 	}
 }
diff --git a/lib/Db/WebmailMapper.php b/lib/Db/WebmailMapper.php
index 614d13ea..13c994e3 100644
--- a/lib/Db/WebmailMapper.php
+++ b/lib/Db/WebmailMapper.php
@@ -8,11 +8,13 @@ use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Connection;
 use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
 use Sabre\VObject\UUIDUtil;
-use \Sabre\VObject\Reader;
 use OCP\IUserManager;
 use OCP\IUser;
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use RainLoop\Providers\AddressBook\PdoAddressBook;
+
 use Throwable;
 
 class WebmailMapper {
@@ -52,9 +54,9 @@ class WebmailMapper {
 	}
 
 
-	public function getUsers(int $limit = 0, int $offset = 0, array $emails = []) : array {
+	public function getEmails(int $limit = 0, int $offset = 0, array $emails = []) : array {
 		$qb = $this->conn->createQueryBuilder();
-		$qb->select('rl_email, id_user')
+		$qb->select('rl_email')
 			->from(self::USERS_TABLE, 'u')
 			->setFirstResult($offset);
 		if ($limit > 0) {
@@ -67,33 +69,18 @@ class WebmailMapper {
 		
 		$result = $qb->execute();
 
-		$users = [];
+		$emails = [];
 		while ($row = $result->fetch()) {
-			$user = [
-				'email' => $row['rl_email'],
-				'id' => $row['id_user']
-			];
-			$users[] = $user;
+			$users[] = (string) $row['rl_email'];
 		}
-		return $users;
+		return $emails;
 	}
 
-	private function getUserContacts(string $uid) : array {
-		$qb = $this->conn->createQueryBuilder();
-
-		$qb->select('p.prop_value')
-			->from('rainloop_ab_contacts', 'c')
-			->where('c.id_user = :uid')
-			->andWhere('p.prop_value IS NOT NULL')
-			->setParameter('uid', $uid)
-			->leftJoin('c', 'rainloop_ab_properties', 'p', 'p.id_contact = c.id_contact AND p.prop_type = 251');
-
-		$result = $qb->execute();
-		$contacts = [];
-		while ($row = $result->fetch()) {
-			$contacts[] = Reader::readJson($row['prop_value']);
-		}
-		return $contacts;
+	private function getUserContacts(string $email) : array {
+		SnappyMailHelper::loadApp();
+		$pdoAddressBook = new PdoAddressBook();
+		$pdoAddressBook->SetEmail($email);
+		return $pdoAddressBook->GetContacts(0, PHP_INT_MAX);
 	}
 
 	private function createCloudAddressBook(array $contacts, string $email) {
@@ -129,11 +116,22 @@ class WebmailMapper {
 		foreach ($contacts as $contact) {
 			try {
 				$contact->PRODID = '-//IDN murena.io//Migrated contact//EN';
-
+				if (isset($contact->vCard->REV)) {
+					try {
+						$timeString = $contact->vCard->REV[0]->getJsonValue()[0];
+						$timestamp = strtotime($timeString);
+					} catch (Throwable $e) {
+						// Do nothing
+					}
+				}
+				if (!isset($timestamp)) {
+					$timestamp = time();
+				}
+				$contact->vCard->REV = \gmdate('Ymd\\THis\\Z', $timestamp);
 				$this->cardDavBackend->createCard(
 					$addressBookId,
 					UUIDUtil::getUUID() . '.vcf',
-					$contact->serialize(),
+					$contact->vCard->serialize(),
 					true
 				);
 			} catch (Throwable $e) {
@@ -142,20 +140,20 @@ class WebmailMapper {
 		}
 	}
 
-	public function migrateContacts(array $users, $commandOutput = null) {
+	public function migrateContacts(array $emails, $commandOutput = null) {
 		$userCount = 0;
-		foreach ($users as $user) {
+		foreach ($emails as $email) {
 			$userCount += 1;
 			if ($commandOutput) {
-				$commandOutput->writeln('Migrating user ' . $userCount . ' with email: '.  $user['email']);
+				$commandOutput->writeln('Migrating user ' . $userCount . ' with email: '. $email);
 			}
-			$contacts = $this->getUserContacts($user['id']);
+			$contacts = $this->getUserContacts($email);
 			$numberOfContacts = count($contacts);
 			if ($commandOutput) {
-				$commandOutput->writeln('Number of contacts for ' . $user['email'] . ':' . $numberOfContacts);
+				$commandOutput->writeln('Number of contacts for ' . $email . ':' . $numberOfContacts);
 			}
 			if ($numberOfContacts > 0) {
-				$this->createCloudAddressBook($contacts, $user['email']);
+				$this->createCloudAddressBook($contacts, $email);
 			}
 		}
 	}
-- 
GitLab


From ad3e9f5b101714017db3fef2f116781391796d39 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Mon, 11 Sep 2023 22:11:39 +0530
Subject: [PATCH 042/185] Fix errors while running migrate command

---
 lib/Db/WebmailMapper.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Db/WebmailMapper.php b/lib/Db/WebmailMapper.php
index 13c994e3..92d43ac1 100644
--- a/lib/Db/WebmailMapper.php
+++ b/lib/Db/WebmailMapper.php
@@ -71,7 +71,7 @@ class WebmailMapper {
 
 		$emails = [];
 		while ($row = $result->fetch()) {
-			$users[] = (string) $row['rl_email'];
+			$emails[] = (string) $row['rl_email'];
 		}
 		return $emails;
 	}
@@ -85,6 +85,9 @@ class WebmailMapper {
 
 	private function createCloudAddressBook(array $contacts, string $email) {
 		$users = $this->userManager->getByEmail($email);
+		if (empty($users)) {
+			return;
+		}
 		$user = $users[0];
 
 		if (!$user instanceof IUser) {
@@ -135,7 +138,7 @@ class WebmailMapper {
 					true
 				);
 			} catch (Throwable $e) {
-				$this->logger->error('Error inserting contact for user: ' . $username . ' contact: ' . $contact->serialize() . ' ' . $e->getMessage());
+				$this->logger->error('Error inserting contact for user: ' . $username . ' ' . $e->getMessage());
 			}
 		}
 	}
-- 
GitLab


From 0fdd3f84e16ae7ee1819d288d72117c018bfcf5b Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 14 Sep 2023 09:09:17 +0000
Subject: [PATCH 043/185] Send email on first login

---
 .gitlab-ci.yml                                |   14 +
 README.md                                     |   14 +
 composer.json                                 |    3 +
 composer.lock                                 | 2053 +----------------
 lib/AppInfo/Application.php                   |   18 +-
 lib/Command/Migrate2FASecrets.php             |    6 +-
 lib/Command/MigrateWebmailAddressbooks.php    |    8 +-
 lib/Controller/BetaUserController.php         |    4 +-
 lib/Controller/ShopAccountController.php      |    4 +-
 lib/Controller/UserController.php             |   11 +-
 lib/Db/MailUsageMapper.php                    |    2 +-
 lib/Db/MailboxMapper.php                      |    4 +-
 lib/Db/SSOMapper.php                          |   12 +-
 lib/Db/WebmailMapper.php                      |   16 +-
 .../BeforeTemplateRenderedListener.php        |   10 +-
 lib/Listeners/BeforeUserDeletedListener.php   |   10 +-
 .../TwoFactorStateChangedListener.php         |    6 +-
 lib/Listeners/UserChangedListener.php         |    6 +-
 lib/Service/BetaUserService.php               |    2 +-
 lib/Service/ShopAccountService.php            |    2 +-
 lib/Service/UserService.php                   |   92 +-
 lib/Settings/BetaUserSetting.php              |    8 +-
 lib/Settings/DeleteShopAccountSetting.php     |    4 +-
 23 files changed, 310 insertions(+), 1999 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6119917f..68fe5ad2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,3 +7,17 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-deploy.yml"
+
+build-vendor:
+  stage: build
+  extends: .composer:base
+  needs: ["build-frontend"]
+  before_script:
+    - composer install --no-dev
+  script:
+    - cp -a vendor dist/${APP_NAME}
+    - find dist/${APP_NAME} -type d -exec chmod 755 {} \;
+    - find dist/${APP_NAME} -type f -exec chmod 644 {} \;
+  artifacts:
+    paths:
+      - dist/
diff --git a/README.md b/README.md
index 1c3a89f9..d5a0529d 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,17 @@ The values are:
 'beta_group_name' => 'beta',
 'beta_gitlab_email_id' => 'xyz@e.email',
 ```
+
+## Welcome User Email notification
+
+- Configure the following parameters in `config.php` for welcome emails via Sendgrid:
+ - sendgrid_api_key
+ - sendgrid_template_ids
+
+The values should be set as follows:
+```
+...
+'sendgrid_api_key' => 'SENDGRID_API_KEY',
+'welcome_sendgrid_template_ids' => [ 'en' => 'EN_TEMPLATE_ID', 'es' => 'ES_TEMPLATE_ID', ... ]
+...
+```
diff --git a/composer.json b/composer.json
index 01f45f58..e061bddd 100644
--- a/composer.json
+++ b/composer.json
@@ -6,5 +6,8 @@
     "scripts": {
         "cs:check": "php-cs-fixer fix --dry-run --diff",
         "cs:fix": "php-cs-fixer fix"
+    },
+    "require": {
+        "sendgrid/sendgrid": "^8.0"
     }
 }
diff --git a/composer.lock b/composer.lock
index 1e955cd4..fb7ca3a5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,110 +4,41 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5c8676ef88653f041796c086ecdf00db",
-    "packages": [],
-    "packages-dev": [
+    "content-hash": "6d0f53432c77aa33e1562c40d5f39632",
+    "packages": [
         {
-            "name": "composer/pcre",
-            "version": "3.0.2",
+            "name": "sendgrid/php-http-client",
+            "version": "3.14.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb"
+                "url": "https://github.com/sendgrid/php-http-client.git",
+                "reference": "6d589564522be290c7d7c18e51bcd8b03aeaf0b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb",
-                "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb",
+                "url": "https://api.github.com/repos/sendgrid/php-http-client/zipball/6d589564522be290c7d7c18e51bcd8b03aeaf0b6",
+                "reference": "6d589564522be290c7d7c18e51bcd8b03aeaf0b6",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.6"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Pcre\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
-            "keywords": [
-                "PCRE",
-                "preg",
-                "regex",
-                "regular expression"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T20:24:16+00:00"
-        },
-        {
-            "name": "composer/semver",
-            "version": "3.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "friendsofphp/php-cs-fixer": "^2.16",
+                "phpunit/phpunit": "^5.7 || ^6.5",
+                "sebastian/version": "^1.0.6",
+                "squizlabs/php_codesniffer": "~2.0"
             },
-            "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+            "suggest": {
+                "composer/ca-bundle": "Including this library will ensure that a valid CA bundle is available for secure connections"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Composer\\Semver\\": "src"
+                    "SendGrid\\": "lib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -116,148 +47,116 @@
             ],
             "authors": [
                 {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
+                    "name": "Matt Bernier",
+                    "email": "mbernier@twilio.com"
                 },
                 {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
+                    "name": "Elmer Thomas",
+                    "email": "ethomas@twilio.com"
                 }
             ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "description": "HTTP REST client, simplified for PHP",
+            "homepage": "http://github.com/sendgrid/php-http-client",
             "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
+                "api",
+                "fluent",
+                "http",
+                "rest",
+                "sendgrid"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.3.2"
+                "issues": "https://github.com/sendgrid/php-http-client/issues",
+                "source": "https://github.com/sendgrid/php-http-client/tree/3.14.4"
             },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-04-01T19:23:25+00:00"
+            "time": "2022-03-09T20:21:55+00:00"
         },
         {
-            "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "name": "sendgrid/sendgrid",
+            "version": "8.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "url": "https://github.com/sendgrid/sendgrid-php.git",
+                "reference": "285381257100b73aa50d8d70f0bcfb1f48b63747"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/sendgrid/sendgrid-php/zipball/285381257100b73aa50d8d70f0bcfb1f48b63747",
+                "reference": "285381257100b73aa50d8d70f0bcfb1f48b63747",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1 || ^2 || ^3",
-                "php": "^7.2.5 || ^8.0",
-                "psr/log": "^1 || ^2 || ^3"
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "php": ">=7.3",
+                "sendgrid/php-http-client": "~3.10",
+                "starkbank/ecdsa": "0.*"
+            },
+            "replace": {
+                "sendgrid/sendgrid-php": "*"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^9",
+                "squizlabs/php_codesniffer": "3.*",
+                "swaggest/json-diff": "^3.4"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
+                    "SendGrid\\Mail\\": "lib/mail/",
+                    "SendGrid\\Stats\\": "lib/stats/",
+                    "SendGrid\\Helper\\": "lib/helper/",
+                    "SendGrid\\Contacts\\": "lib/contacts/",
+                    "SendGrid\\EventWebhook\\": "lib/eventwebhook/"
+                },
+                "classmap": [
+                    "lib/BaseSendGridClientInterface.php",
+                    "lib/SendGrid.php",
+                    "lib/TwilioEmail.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
-                }
-            ],
-            "description": "Restarts a process without Xdebug.",
+            "description": "This library allows you to quickly and easily send emails through Twilio SendGrid using PHP.",
+            "homepage": "http://github.com/sendgrid/sendgrid-php",
             "keywords": [
-                "Xdebug",
-                "performance"
+                "email",
+                "grid",
+                "send",
+                "sendgrid",
+                "twilio sendgrid"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "source": "https://github.com/sendgrid/sendgrid-php/tree/8.0.1"
             },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2022-08-10T18:37:45+00:00"
         },
         {
-            "name": "doctrine/annotations",
-            "version": "1.13.3",
+            "name": "starkbank/ecdsa",
+            "version": "0.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
+                "url": "https://github.com/starkbank/ecdsa-php.git",
+                "reference": "484bedac47bac4012dc73df91da221f0a66845cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
-                "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
+                "url": "https://api.github.com/repos/starkbank/ecdsa-php/zipball/484bedac47bac4012dc73df91da221f0a66845cb",
+                "reference": "484bedac47bac4012dc73df91da221f0a66845cb",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "1.*",
-                "ext-tokenizer": "*",
-                "php": "^7.1 || ^8.0",
-                "psr/cache": "^1 || ^2 || ^3"
-            },
-            "require-dev": {
-                "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^1.4.10 || ^1.8.0",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2",
-                "vimeo/psalm": "^4.10"
+                "php": ">=5.5"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
+                "files": [
+                    "src/ellipticcurve.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -265,66 +164,44 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "StarkBank",
+                    "email": "developers@starkbank.com",
+                    "homepage": "https://starkbank.com",
+                    "role": "Developer"
                 }
             ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "https://www.doctrine-project.org/projects/annotations.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
+            "description": "fast openSSL-compatible implementation of the Elliptic Curve Digital Signature Algorithm (ECDSA)",
+            "homepage": "https://github.com/starkbank/ecdsa-php",
             "support": {
-                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.3"
+                "issues": "https://github.com/starkbank/ecdsa-php/issues",
+                "source": "https://github.com/starkbank/ecdsa-php/tree/v0.0.5"
             },
-            "time": "2022-07-02T10:48:51+00:00"
-        },
+            "time": "2021-06-06T22:24:49+00:00"
+        }
+    ],
+    "packages-dev": [
         {
-            "name": "doctrine/lexer",
-            "version": "1.2.3",
+            "name": "nextcloud/coding-standard",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
+                "url": "https://github.com/nextcloud/coding-standard.git",
+                "reference": "55def702fb9a37a219511e1d8c6fe8e37164c1fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/55def702fb9a37a219511e1d8c6fe8e37164c1fb",
+                "reference": "55def702fb9a37a219511e1d8c6fe8e37164c1fb",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9.0",
-                "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.11"
+                "php": "^7.3|^8.0",
+                "php-cs-fixer/shim": "^3.17"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                    "Nextcloud\\CodingStandard\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -333,109 +210,48 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Christoph Wurst",
+                    "email": "christoph@winzerhof-wurst.at"
                 }
             ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
-            ],
+            "description": "Nextcloud coding standards for the php cs fixer",
             "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+                "issues": "https://github.com/nextcloud/coding-standard/issues",
+                "source": "https://github.com/nextcloud/coding-standard/tree/v1.1.1"
             },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-28T11:07:21+00:00"
+            "time": "2023-06-01T12:05:01+00:00"
         },
         {
-            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.13.0",
+            "name": "php-cs-fixer/shim",
+            "version": "v3.26.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "a6232229a8309e8811dc751c28b91cb34b2943e1"
+                "url": "https://github.com/PHP-CS-Fixer/shim.git",
+                "reference": "13145f5f270b06259608a41389e08c027ba70e75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a6232229a8309e8811dc751c28b91cb34b2943e1",
-                "reference": "a6232229a8309e8811dc751c28b91cb34b2943e1",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/13145f5f270b06259608a41389e08c027ba70e75",
+                "reference": "13145f5f270b06259608a41389e08c027ba70e75",
                 "shasum": ""
             },
             "require": {
-                "composer/semver": "^3.2",
-                "composer/xdebug-handler": "^3.0.3",
-                "doctrine/annotations": "^1.13",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^7.4 || ^8.0",
-                "sebastian/diff": "^4.0",
-                "symfony/console": "^5.4 || ^6.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0",
-                "symfony/filesystem": "^5.4 || ^6.0",
-                "symfony/finder": "^5.4 || ^6.0",
-                "symfony/options-resolver": "^5.4 || ^6.0",
-                "symfony/polyfill-mbstring": "^1.23",
-                "symfony/polyfill-php80": "^1.25",
-                "symfony/polyfill-php81": "^1.25",
-                "symfony/process": "^5.4 || ^6.0",
-                "symfony/stopwatch": "^5.4 || ^6.0"
+                "php": "^7.4 || ^8.0"
             },
-            "require-dev": {
-                "justinrainbow/json-schema": "^5.2",
-                "keradus/cli-executor": "^2.0",
-                "mikey179/vfsstream": "^1.6.10",
-                "php-coveralls/php-coveralls": "^2.5.2",
-                "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy": "^1.15",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "phpunitgoodpractices/polyfill": "^1.6",
-                "phpunitgoodpractices/traits": "^1.9.2",
-                "symfony/phpunit-bridge": "^6.0",
-                "symfony/yaml": "^5.4 || ^6.0"
+            "replace": {
+                "friendsofphp/php-cs-fixer": "self.version"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
                 "ext-mbstring": "For handling non-UTF8 characters."
             },
             "bin": [
-                "php-cs-fixer"
+                "php-cs-fixer",
+                "php-cs-fixer.phar"
             ],
             "type": "application",
-            "autoload": {
-                "psr-4": {
-                    "PhpCsFixer\\": "src/"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
@@ -452,1629 +268,10 @@
             ],
             "description": "A tool to automatically fix PHP code style",
             "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
-            "time": "2022-10-31T19:28:50+00:00"
-        },
-        {
-            "name": "nextcloud/coding-standard",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nextcloud/coding-standard.git",
-                "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/f3d1f9375e89c605deb1734f59a9f51ecbe80578",
-                "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578",
-                "shasum": ""
-            },
-            "require": {
-                "friendsofphp/php-cs-fixer": "^3.2",
-                "php": "^7.3|^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Nextcloud\\CodingStandard\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christoph Wurst",
-                    "email": "christoph@winzerhof-wurst.at"
-                }
-            ],
-            "description": "Nextcloud coding standards for the php cs fixer",
-            "support": {
-                "issues": "https://github.com/nextcloud/coding-standard/issues",
-                "source": "https://github.com/nextcloud/coding-standard/tree/v1.0.0"
-            },
-            "time": "2021-11-10T08:44:10+00:00"
-        },
-        {
-            "name": "psr/cache",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
-                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/cache/tree/3.0.0"
-            },
-            "time": "2021-02-03T23:26:27+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
-            },
-            "time": "2021-11-05T16:47:00+00:00"
-        },
-        {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Standard interfaces for event handling.",
-            "keywords": [
-                "events",
-                "psr",
-                "psr-14"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
-            },
-            "time": "2019-01-08T18:20:26+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0"
+                "issues": "https://github.com/PHP-CS-Fixer/shim/issues",
+                "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.26.1"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
-            },
-            "time": "2021-07-14T16:46:02+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "4.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:10:38+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v6.1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a1282bd0c096e0bdb8800b104177e2ce404d8815",
-                "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.4|^6.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0|2.0|3.0"
-            },
-            "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Eases the creation of beautiful and testable command line interfaces",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "cli",
-                "command line",
-                "console",
-                "terminal"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.1.7"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-10-26T21:42:49+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-25T11:15:52+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v6.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a0449a7ad7daa0f7c0acd508259f80544ab5a347",
-                "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/event-dispatcher-contracts": "^2|^3"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<5.4"
-            },
-            "provide": {
-                "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "2.0|3.0"
-            },
-            "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/stopwatch": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.1.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-05T16:51:07+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "02ff5eea2f453731cfbc6bc215e456b781480448"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/02ff5eea2f453731cfbc6bc215e456b781480448",
-                "reference": "02ff5eea2f453731cfbc6bc215e456b781480448",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/event-dispatcher": "^1"
-            },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to dispatching event",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-25T11:15:52+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v6.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "4d216a2beef096edf040a070117c39ca2abce307"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d216a2beef096edf040a070117c39ca2abce307",
-                "reference": "4d216a2beef096edf040a070117c39ca2abce307",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides basic utilities for the filesystem",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.1.5"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-09-21T20:29:40+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v6.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709",
-                "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "require-dev": {
-                "symfony/filesystem": "^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Finds files and directories via an intuitive fluent interface",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-07-29T07:42:06+00:00"
-        },
-        {
-            "name": "symfony/options-resolver",
-            "version": "v6.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a3016f5442e28386ded73c43a32a5b68586dd1c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a3016f5442e28386ded73c43a32a5b68586dd1c4",
-                "reference": "a3016f5442e28386ded73c43a32a5b68586dd1c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\OptionsResolver\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides an improved replacement for the array_replace PHP function",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "config",
-                "configuration",
-                "options"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.1.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-25T11:15:52+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
-                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's grapheme_* functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "grapheme",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
-                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-mbstring": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-10T07:21:04+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
-                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v6.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/a6506e99cfad7059b1ab5cab395854a0a0c21292",
-                "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Executes commands in sub-processes",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/process/tree/v6.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-06-27T17:24:16+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239",
-                "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/container": "^2.0"
-            },
-            "conflict": {
-                "ext-psr": "<1.1|>=2"
-            },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Test/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-30T19:18:58+00:00"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v6.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "266636bb8f3fbdccc302491df7b3a1b9a8c238a7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/266636bb8f3fbdccc302491df7b3a1b9a8c238a7",
-                "reference": "266636bb8f3fbdccc302491df7b3a1b9a8c238a7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/service-contracts": "^1|^2|^3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides a way to profile code",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.1.5"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-09-28T16:00:52+00:00"
-        },
-        {
-            "name": "symfony/string",
-            "version": "v6.1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "823f143370880efcbdfa2dbca946b3358c4707e5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/823f143370880efcbdfa2dbca946b3358c4707e5",
-                "reference": "823f143370880efcbdfa2dbca946b3358c4707e5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/translation-contracts": "<2.0"
-            },
-            "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "Resources/functions.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "grapheme",
-                "i18n",
-                "string",
-                "unicode",
-                "utf-8",
-                "utf8"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.1.7"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-10-10T09:34:31+00:00"
+            "time": "2023-09-08T19:10:08+00:00"
         }
     ],
     "aliases": [],
@@ -2084,5 +281,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 47cc7b6b..6683fcf3 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,20 +26,20 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
+use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
+use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
+use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
+use OCA\EcloudAccounts\Listeners\UserChangedListener;
+use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\Bootstrap\IBootContext;
-use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
-use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use OCP\User\Events\BeforeUserDeletedEvent;
-use OCP\User\Events\UserChangedEvent;
-use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
-use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
-use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\IUserManager;
+use OCP\User\Events\BeforeUserDeletedEvent;
+use OCP\User\Events\UserChangedEvent;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
diff --git a/lib/Command/Migrate2FASecrets.php b/lib/Command/Migrate2FASecrets.php
index 1dd8cb38..79228be2 100644
--- a/lib/Command/Migrate2FASecrets.php
+++ b/lib/Command/Migrate2FASecrets.php
@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
+use OCA\EcloudAccounts\Db\SSOMapper;
+use OCA\EcloudAccounts\Db\TwoFactorMapper;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use OCA\EcloudAccounts\Db\SSOMapper;
-use OCA\EcloudAccounts\Db\TwoFactorMapper;
 
 class Migrate2FASecrets extends Command {
 	private SSOMapper $ssoMapper;
diff --git a/lib/Command/MigrateWebmailAddressbooks.php b/lib/Command/MigrateWebmailAddressbooks.php
index 0ce63dee..b4e4ce6c 100644
--- a/lib/Command/MigrateWebmailAddressbooks.php
+++ b/lib/Command/MigrateWebmailAddressbooks.php
@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
+use OCA\EcloudAccounts\Db\WebmailMapper;
+use OCP\IUser;
+use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use OCA\EcloudAccounts\Db\WebmailMapper;
-use OCP\IUserManager;
-use OCP\IUser;
 
 class MigrateWebmailAddressbooks extends Command {
 	private OutputInterface $commandOutput;
diff --git a/lib/Controller/BetaUserController.php b/lib/Controller/BetaUserController.php
index be1b970f..651fe81f 100644
--- a/lib/Controller/BetaUserController.php
+++ b/lib/Controller/BetaUserController.php
@@ -7,10 +7,10 @@
 namespace OCA\EcloudAccounts\Controller;
 
 use OCP\AppFramework\Controller;
-use OCP\IRequest;
 use OCP\IConfig;
-use OCP\IUserManager;
 use OCP\IGroupManager;
+use OCP\IRequest;
+use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Mail\IMailer;
 use OCP\Util;
diff --git a/lib/Controller/ShopAccountController.php b/lib/Controller/ShopAccountController.php
index 2b932535..bba48631 100644
--- a/lib/Controller/ShopAccountController.php
+++ b/lib/Controller/ShopAccountController.php
@@ -6,11 +6,11 @@ namespace OCA\EcloudAccounts\Controller;
 
 use Exception;
 use OCA\EcloudAccounts\Service\ShopAccountService;
-use OCP\IUserSession;
-use OCP\IRequest;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\ILogger;
+use OCP\IRequest;
+use OCP\IUserSession;
 
 class ShopAccountController extends Controller {
 	private ShopAccountService $shopAccountService;
diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 975e7aa7..d5bf3651 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -5,13 +5,13 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Controller;
 
 use Exception;
-use OCP\IRequest;
-use OCP\ILogger;
-use OCP\IConfig;
+use OCA\EcloudAccounts\Db\MailUsageMapper;
+use OCA\EcloudAccounts\Service\UserService;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\DataResponse;
-use OCA\EcloudAccounts\Service\UserService;
-use OCA\EcloudAccounts\Db\MailUsageMapper;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\IRequest;
 
 class UserController extends ApiController {
 	/** @var UserService */
@@ -87,6 +87,7 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
+		$this->userService->sendWelcomeEmail($uid, $email);
 		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
diff --git a/lib/Db/MailUsageMapper.php b/lib/Db/MailUsageMapper.php
index 649cda5e..8b2da108 100644
--- a/lib/Db/MailUsageMapper.php
+++ b/lib/Db/MailUsageMapper.php
@@ -3,8 +3,8 @@
 namespace OCA\EcloudAccounts\Db;
 
 use Exception;
-use OCP\IDBConnection;
 use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\ILogger;
 
 class MailUsageMapper {
diff --git a/lib/Db/MailboxMapper.php b/lib/Db/MailboxMapper.php
index 9d1104e1..ff74ab5d 100644
--- a/lib/Db/MailboxMapper.php
+++ b/lib/Db/MailboxMapper.php
@@ -2,10 +2,10 @@
 
 namespace OCA\EcloudAccounts\Db;
 
+use Doctrine\DBAL\DriverManager;
+use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
 use OCP\IConfig;
 use OCP\ILogger;
-use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
-use Doctrine\DBAL\DriverManager;
 use Throwable;
 
 class MailboxMapper {
diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
index a879660d..3c04b982 100644
--- a/lib/Db/SSOMapper.php
+++ b/lib/Db/SSOMapper.php
@@ -2,16 +2,16 @@
 
 namespace OCA\EcloudAccounts\Db;
 
-use OCP\IConfig;
-use OCP\ILogger;
-use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DriverManager;
 use OCA\EcloudAccounts\AppInfo\Application;
-use OCP\IUserManager;
-use OCP\Security\ICrypto;
-use OCP\IUser;
 use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\IUser;
+use OCP\IUserManager;
 use OCP\L10N\IFactory;
+use OCP\Security\ICrypto;
 
 class SSOMapper {
 	private IConfig $config;
diff --git a/lib/Db/WebmailMapper.php b/lib/Db/WebmailMapper.php
index 92d43ac1..67e6b3c9 100644
--- a/lib/Db/WebmailMapper.php
+++ b/lib/Db/WebmailMapper.php
@@ -2,18 +2,18 @@
 
 namespace OCA\EcloudAccounts\Db;
 
-use OCP\IConfig;
-use OCP\ILogger;
-use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Connection;
-use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
-use Sabre\VObject\UUIDUtil;
-use OCP\IUserManager;
-use OCP\IUser;
+use Doctrine\DBAL\DriverManager;
 use OCA\DAV\CardDAV\CardDavBackend;
-use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
 use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\IUser;
+use OCP\IUserManager;
 use RainLoop\Providers\AddressBook\PdoAddressBook;
+use Sabre\VObject\UUIDUtil;
 
 use Throwable;
 
diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
index 9c6369c3..86b5f99b 100644
--- a/lib/Listeners/BeforeTemplateRenderedListener.php
+++ b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Listeners;
 
-use OCP\EventDispatcher\Event;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use \OCP\EventDispatcher\IEventListener;
-use OCP\IUserSession;
-use OCP\ISession;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\EventDispatcher\Event;
 use OCP\IConfig;
 use OCP\IRequest;
-use OCP\App\IAppManager;
+use OCP\ISession;
+use OCP\IUserSession;
 
 class BeforeTemplateRenderedListener implements IEventListener {
 	private $userSession;
diff --git a/lib/Listeners/BeforeUserDeletedListener.php b/lib/Listeners/BeforeUserDeletedListener.php
index 15e42d65..66d483d6 100644
--- a/lib/Listeners/BeforeUserDeletedListener.php
+++ b/lib/Listeners/BeforeUserDeletedListener.php
@@ -5,15 +5,15 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Listeners;
 
 use Exception;
+use OCA\EcloudAccounts\Exception\DeletingUserWithActiveSubscriptionException;
+use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCA\EcloudAccounts\Service\ShopAccountService;
+use OCA\EcloudAccounts\Service\UserService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\ILogger;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\User\Events\BeforeUserDeletedEvent;
-use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use OCA\EcloudAccounts\Service\ShopAccountService;
-use OCA\EcloudAccounts\Service\UserService;
-use OCA\EcloudAccounts\Exception\DeletingUserWithActiveSubscriptionException;
 
 class BeforeUserDeletedListener implements IEventListener {
 	private $logger;
diff --git a/lib/Listeners/TwoFactorStateChangedListener.php b/lib/Listeners/TwoFactorStateChangedListener.php
index 9624abdb..1c93df33 100644
--- a/lib/Listeners/TwoFactorStateChangedListener.php
+++ b/lib/Listeners/TwoFactorStateChangedListener.php
@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Listeners;
 
 use Exception;
+use OCA\EcloudAccounts\Db\SSOMapper;
+use OCA\EcloudAccounts\Db\TwoFactorMapper;
 use OCA\TwoFactorTOTP\Event\StateChanged;
+use OCP\App\IAppManager;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\App\IAppManager;
-use OCA\EcloudAccounts\Db\SSOMapper;
-use OCA\EcloudAccounts\Db\TwoFactorMapper;
 use OCP\ILogger;
 
 class TwoFactorStateChangedListener implements IEventListener {
diff --git a/lib/Listeners/UserChangedListener.php b/lib/Listeners/UserChangedListener.php
index a9eeb81c..48d2ddb9 100644
--- a/lib/Listeners/UserChangedListener.php
+++ b/lib/Listeners/UserChangedListener.php
@@ -5,13 +5,13 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Listeners;
 
 use Exception;
+use OCA\EcloudAccounts\Db\MailboxMapper;
+use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\Util;
 use OCP\ILogger;
 use OCP\User\Events\UserChangedEvent;
-use OCA\EcloudAccounts\Db\MailboxMapper;
-use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCP\Util;
 
 class UserChangedListener implements IEventListener {
 	private const QUOTA_FEATURE = 'quota';
diff --git a/lib/Service/BetaUserService.php b/lib/Service/BetaUserService.php
index 3f6f84d2..1bac223c 100644
--- a/lib/Service/BetaUserService.php
+++ b/lib/Service/BetaUserService.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Service;
 
+use OCP\App\IAppManager;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IUserSession;
-use OCP\App\IAppManager;
 
 class BetaUserService {
 	private $config;
diff --git a/lib/Service/ShopAccountService.php b/lib/Service/ShopAccountService.php
index 2fa12a0b..6d5f9a34 100644
--- a/lib/Service/ShopAccountService.php
+++ b/lib/Service/ShopAccountService.php
@@ -4,9 +4,9 @@
 namespace OCA\EcloudAccounts\Service;
 
 use Exception;
+use OCA\EcloudAccounts\AppInfo\Application;
 use OCP\IConfig;
 use OCP\ILogger;
-use OCA\EcloudAccounts\AppInfo\Application;
 
 class ShopAccountService {
 	private IConfig $config;
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 11c64901..a95bd408 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -4,11 +4,15 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Service;
 
-use OCP\IUserManager;
-use OCP\IUser;
+require __DIR__ . '/../../vendor/autoload.php';
+
+use OCA\EcloudAccounts\AppInfo\Application;
+use OCP\Defaults;
 use OCP\IConfig;
 use OCP\ILogger;
-use OCA\EcloudAccounts\AppInfo\Application;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Util;
 
 use UnexpectedValueException;
 
@@ -23,14 +27,16 @@ class UserService {
 	private $config;
 
 	private $curl;
+	private Defaults $defaults;
+	private ILogger $logger;
 
-
-	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger) {
+	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->appConfig = $this->config->getSystemValue($appName);
 		$this->curl = $curlService;
 		$this->logger = $logger;
+		$this->defaults = $defaults;
 	}
 
 
@@ -131,4 +137,80 @@ class UserService {
 
 		return null;
 	}
+	public function sendWelcomeEmail(string $uid, string $toEmail) : bool {
+		$sendgridAPIkey = $this->getSendGridAPIKey();
+		if (empty($sendgridAPIkey)) {
+			$this->logger->warning("sendgrid_api_key is missing or empty.", ['app' => Application::APP_ID]);
+			return false;
+		}
+		
+		$templateIDs = $this->getSendGridTemplateIDs();
+		if (empty($templateIDs)) {
+			$this->logger->warning("welcome_sendgrid_template_ids is missing or empty.", ['app' => Application::APP_ID]);
+			return false;
+		}
+			
+		$language = $this->getUserLanguage($uid);
+		$templateID = $templateIDs['en'];
+		if (isset($templateIDs[$language])) {
+			$templateID = $templateIDs[$language];
+		}
+		
+		$fromEmail = Util::getDefaultEmailAddress('noreply');
+		$fromName = $this->defaults->getName();
+		
+		$user = $this->userManager->get($uid);
+		$toName = $user->getDisplayName();
+			
+		$mainDomain = $this->getMainDomain();
+		$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);
+		
+		try {
+			return $this->sendEmailWithSendGrid($email, $sendgridAPIkey);
+		} catch (\Exception $e) {
+			$this->logger->error($e, ['app' => Application::APP_ID]);
+			return false;
+		}
+	}
+	private function getSendGridAPIKey() : string {
+		return $this->config->getSystemValue('sendgrid_api_key', '');
+	}
+	private function getSendGridTemplateIDs() : array {
+		return $this->config->getSystemValue('welcome_sendgrid_template_ids', '');
+	}
+	private function getMainDomain() : string {
+		return $this->config->getSystemValue('main_domain', '');
+	}
+	private function getUserLanguage(string $username) : string {
+		return $this->config->getUserValue($username, 'core', 'lang', 'en');
+	}
+	private function createSendGridEmail(string $fromEmail, string  $fromName, string $toEmail, string  $toName, string  $templateID, string  $username, string  $mainDomain) : \SendGrid\Mail\Mail {
+		$email = new \SendGrid\Mail\Mail();
+		$email->setFrom($fromEmail, $fromName);
+		$email->addTo($toEmail, $toName);
+		$email->setTemplateId($templateID);
+		$email->addDynamicTemplateDatas([
+			"username" => $username,
+			"mail_domain" => $mainDomain,
+			"display_name" => $toName
+		]);
+		return $email;
+	}
+	private function sendEmailWithSendGrid(\SendGrid\Mail\Mail $email, string $sendgridAPIkey): bool {
+		try {
+			$sendgrid = new \SendGrid($sendgridAPIkey);
+			$response = $sendgrid->send($email);
+	
+			if ($response->statusCode() !== 200) {
+				throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());
+			}
+			return true;
+		} catch (\Exception $e) {
+			$this->logger->error(
+				"Error while sending sendEmailWithSendGrid: " . $e->getMessage(),
+				['app' => Application::APP_ID]
+			);
+			return false;
+		}
+	}
 }
diff --git a/lib/Settings/BetaUserSetting.php b/lib/Settings/BetaUserSetting.php
index 0b1301a2..2703f87f 100644
--- a/lib/Settings/BetaUserSetting.php
+++ b/lib/Settings/BetaUserSetting.php
@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Settings;
 
+use OCA\EcloudAccounts\Service\BetaUserService;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IGroupManager;
-use OCP\Settings\ISettings;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
+use OCP\IGroupManager;
 use OCP\ILogger;
-use OCP\AppFramework\Services\IInitialState;
-use OCA\EcloudAccounts\Service\BetaUserService;
+use OCP\Settings\ISettings;
 
 class BetaUserSetting implements ISettings {
 	protected $groupManager;
diff --git a/lib/Settings/DeleteShopAccountSetting.php b/lib/Settings/DeleteShopAccountSetting.php
index c79416a7..9d4d1d65 100644
--- a/lib/Settings/DeleteShopAccountSetting.php
+++ b/lib/Settings/DeleteShopAccountSetting.php
@@ -2,13 +2,13 @@
 
 namespace OCA\EcloudAccounts\Settings;
 
+use OCA\EcloudAccounts\Service\ShopAccountService;
+use OCP\App\IAppManager;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IUserSession;
 use OCP\Settings\ISettings;
 use OCP\Util;
-use OCA\EcloudAccounts\Service\ShopAccountService;
-use OCP\App\IAppManager;
 
 class DeleteShopAccountSetting implements ISettings {
 	private const DROP_ACCOUNT_APP_ID = 'drop_account';
-- 
GitLab


From f1db9dd71e1027e5821b642c5b18bf037b2cd142 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 15 Sep 2023 08:54:53 +0000
Subject: [PATCH 044/185] Changing condition to check if user taken

---
 appinfo/info.xml                  | 2 +-
 lib/Controller/UserController.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index d72581ef..7ee2a930 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>
diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index d5bf3651..96bf75a3 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -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);
-- 
GitLab


From 6e44231856e0cdb922f3db18e600aad853564c40 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Fri, 15 Sep 2023 09:11:08 +0000
Subject: [PATCH 045/185] Update info.xml

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7ee2a930..38c8f5bd 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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.1</version>
+    <version>3.5.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From d1d9da08d767ab6f6753bd02f8600f5ec2d8631e Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 18 Sep 2023 13:10:15 +0000
Subject: [PATCH 046/185] removed a try catch from method

---
 lib/Service/UserService.php | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index a95bd408..c1ccdc31 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -13,6 +13,7 @@ use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Util;
+use Throwable;
 
 use UnexpectedValueException;
 
@@ -137,17 +138,17 @@ class UserService {
 
 		return null;
 	}
-	public function sendWelcomeEmail(string $uid, string $toEmail) : bool {
+	public function sendWelcomeEmail(string $uid, string $toEmail) : void {
 		$sendgridAPIkey = $this->getSendGridAPIKey();
 		if (empty($sendgridAPIkey)) {
 			$this->logger->warning("sendgrid_api_key is missing or empty.", ['app' => Application::APP_ID]);
-			return false;
+			return;
 		}
 		
 		$templateIDs = $this->getSendGridTemplateIDs();
 		if (empty($templateIDs)) {
 			$this->logger->warning("welcome_sendgrid_template_ids is missing or empty.", ['app' => Application::APP_ID]);
-			return false;
+			return;
 		}
 			
 		$language = $this->getUserLanguage($uid);
@@ -163,13 +164,11 @@ class UserService {
 		$toName = $user->getDisplayName();
 			
 		$mainDomain = $this->getMainDomain();
-		$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);
-		
 		try {
-			return $this->sendEmailWithSendGrid($email, $sendgridAPIkey);
-		} catch (\Exception $e) {
+			$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);
+			$this->sendEmailWithSendGrid($email, $sendgridAPIkey);
+		} catch (Throwable $e) {
 			$this->logger->error($e, ['app' => Application::APP_ID]);
-			return false;
 		}
 	}
 	private function getSendGridAPIKey() : string {
@@ -196,21 +195,12 @@ class UserService {
 		]);
 		return $email;
 	}
-	private function sendEmailWithSendGrid(\SendGrid\Mail\Mail $email, string $sendgridAPIkey): bool {
-		try {
-			$sendgrid = new \SendGrid($sendgridAPIkey);
-			$response = $sendgrid->send($email);
-	
-			if ($response->statusCode() !== 200) {
-				throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());
-			}
-			return true;
-		} catch (\Exception $e) {
-			$this->logger->error(
-				"Error while sending sendEmailWithSendGrid: " . $e->getMessage(),
-				['app' => Application::APP_ID]
-			);
-			return false;
+	private function sendEmailWithSendGrid(\SendGrid\Mail\Mail $email, string $sendgridAPIkey): void {
+		$sendgrid = new \SendGrid($sendgridAPIkey);
+		$response = $sendgrid->send($email);
+
+		if ($response->statusCode() !== 200) {
+			throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());
 		}
 	}
 }
-- 
GitLab


From 53d2659f2bad11dc670cdad21122bc1bdd983a2c Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 18 Sep 2023 18:49:43 +0000
Subject: [PATCH 047/185] Dev/fix welcome email

---
 lib/Service/UserService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index c1ccdc31..8803fcd9 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -168,7 +168,7 @@ class UserService {
 			$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);
 			$this->sendEmailWithSendGrid($email, $sendgridAPIkey);
 		} catch (Throwable $e) {
-			$this->logger->error($e, ['app' => Application::APP_ID]);
+			$this->logger->error('Error sending email to: ' . $email . ': ' . $e->getMessage());
 		}
 	}
 	private function getSendGridAPIKey() : string {
@@ -197,7 +197,7 @@ class UserService {
 	}
 	private function sendEmailWithSendGrid(\SendGrid\Mail\Mail $email, string $sendgridAPIkey): void {
 		$sendgrid = new \SendGrid($sendgridAPIkey);
-		$response = $sendgrid->send($email);
+		$response = $sendgrid->send($email, [ CURLOPT_TIMEOUT => 15 ]);
 
 		if ($response->statusCode() !== 200) {
 			throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());
-- 
GitLab


From a214bea632fbf91786db8584908b45bf89bdfcaf Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 19 Sep 2023 10:14:27 +0000
Subject: [PATCH 048/185] Dev/fix welcome email type

---
 lib/Service/UserService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 8803fcd9..e74854d0 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -168,7 +168,7 @@ class UserService {
 			$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);
 			$this->sendEmailWithSendGrid($email, $sendgridAPIkey);
 		} catch (Throwable $e) {
-			$this->logger->error('Error sending email to: ' . $email . ': ' . $e->getMessage());
+			$this->logger->error('Error sending email to: ' . $toEmail . ': ' . $e->getMessage());
 		}
 	}
 	private function getSendGridAPIKey() : string {
@@ -199,7 +199,7 @@ class UserService {
 		$sendgrid = new \SendGrid($sendgridAPIkey);
 		$response = $sendgrid->send($email, [ CURLOPT_TIMEOUT => 15 ]);
 
-		if ($response->statusCode() !== 200) {
+		if ($response->statusCode() < 200 || $response->statusCode() > 299) {
 			throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());
 		}
 	}
-- 
GitLab


From 2801a2cf16ede06d755d351bd40eb0ffd347620f Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 25 Sep 2023 12:51:47 +0000
Subject: [PATCH 049/185] User Lanauge

---
 lib/Controller/UserController.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 96bf75a3..1d0745d6 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -12,6 +12,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IRequest;
+use OCP\L10N\IFactory;
 
 class UserController extends ApiController {
 	/** @var UserService */
@@ -22,13 +23,14 @@ class UserController extends ApiController {
 	private $logger;
 
 	private $config;
-
-	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper) {
+	protected $l10nFactory;
+	public function __construct($appName, IRequest $request, ILogger $logger, IConfig $config, UserService $userService, MailUsageMapper $mailUsageMapper, IFactory $l10nFactory) {
 		parent::__construct($appName, $request);
 		$this->userService = $userService;
 		$this->mailUsageMapper = $mailUsageMapper;
 		$this->logger = $logger;
 		$this->config = $config;
+		$this->l10nFactory = $l10nFactory;
 	}
 
 	/**
@@ -65,7 +67,7 @@ class UserController extends ApiController {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted = false): DataResponse {
+	public function setAccountData(string $token, string $uid, string $email, string $recoveryEmail, string $hmeAlias, string $quota = '1024 MB', bool $tosAccepted = false, string $userLanguage = 'en'): DataResponse {
 		$response = new DataResponse();
 
 		if (!$this->checkAppCredentials($token)) {
@@ -87,7 +89,10 @@ class UserController extends ApiController {
 
 		$user->setEMailAddress($email);
 		$user->setQuota($quota);
-		$this->userService->sendWelcomeEmail($uid, $email);
+		if ($this->l10nFactory->languageExists(null, $userLanguage)) {
+			$this->config->setUserValue($uid, 'core', 'lang', $userLanguage);
+		}
+		// $this->userService->sendWelcomeEmail($uid, $email);
 		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
 		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		if (!$recoveryEmailUpdated) {
-- 
GitLab


From 9648e2cb458addaabc77c405ae1cc595162de913 Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Thu, 19 Oct 2023 11:07:33 +0000
Subject: [PATCH 050/185] ecloud account -nextcloud 26

---
 appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 38c8f5bd..a4d9725f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>3.5.0</version>
+    <version>4.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="24" max-version="25"/>
+        <nextcloud min-version="26" max-version="26"/>
     </dependencies>
 	<settings>
 		<personal>OCA\EcloudAccounts\Settings\DeleteShopAccountSetting</personal>
-- 
GitLab


From ffdfa2676ac1f604e9385941d2b65eb9e5a1add9 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 28 Nov 2023 15:21:46 +0000
Subject: [PATCH 051/185] Signup page

---
 appinfo/routes.php                    |   9 +-
 img/success.svg                       |   4 +
 l10n/de.js                            |  37 +-
 l10n/de.json                          |  35 +-
 l10n/en.js                            |  39 +-
 l10n/en.json                          |  37 +-
 l10n/es.js                            |  37 +-
 l10n/es.json                          |  40 +-
 l10n/fr.js                            |  37 +-
 l10n/fr.json                          |  37 +-
 l10n/it.js                            |  37 +-
 l10n/it.json                          |  34 +-
 lib/AppInfo/Application.php           |   3 -
 lib/Controller/AccountController.php  | 213 +++++++++++
 lib/Service/CaptchaService.php        | 228 +++++++++++
 lib/Service/LDAPConnectionService.php |  41 +-
 lib/Service/UserService.php           | 248 ++++++++++--
 package-lock.json                     |  33 +-
 package.json                          |   7 +-
 src/Signup.vue                        | 115 ++++++
 src/signup.js                         |   8 +
 src/signup/CaptchaForm.vue            | 246 ++++++++++++
 src/signup/RecoveryEmailForm.vue      | 270 +++++++++++++
 src/signup/RegistrationForm.vue       | 531 ++++++++++++++++++++++++++
 src/signup/SuccessSection.vue         |  93 +++++
 templates/signup.php                  |   4 +
 webpack.config.js                     |   1 +
 27 files changed, 2357 insertions(+), 67 deletions(-)
 create mode 100644 img/success.svg
 create mode 100644 lib/Controller/AccountController.php
 create mode 100644 lib/Service/CaptchaService.php
 create mode 100644 src/Signup.vue
 create mode 100644 src/signup.js
 create mode 100644 src/signup/CaptchaForm.vue
 create mode 100644 src/signup/RecoveryEmailForm.vue
 create mode 100644 src/signup/RegistrationForm.vue
 create mode 100644 src/signup/SuccessSection.vue
 create mode 100644 templates/signup.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index aedd9131..5eab965e 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -23,5 +23,12 @@ return ['routes' => [
 	[
 		'name' => 'beta_user#submit_issue',
 		'url' => '/issue/submit', 'verb' => 'POST'
-	]
+	],
+	
+	['name' => 'account#index', 'url' => '/accounts/{lang}/signup', 'verb' => 'GET'],
+	['name' => 'account#create', 'url' => '/accounts/create', 'verb' => 'POST'],
+	['name' => 'account#captcha', 'url' => '/accounts/captcha', 'verb' => 'GET'],
+	['name' => 'account#verify_captcha', 'url' => '/accounts/verify_captcha', 'verb' => 'POST'],
+	['name' => 'account#check_username_available', 'url' => '/accounts/check_username_available', 'verb' => 'POST'],
+
 ]];
diff --git a/img/success.svg b/img/success.svg
new file mode 100644
index 00000000..d3c0bed9
--- /dev/null
+++ b/img/success.svg
@@ -0,0 +1,4 @@
+<svg width="90" height="72" viewBox="0 0 90 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M65.25 9C68.9766 9 72 12.022 72 15.75C72 17.8734 71.0016 19.8703 69.3 21.15L67.3453 22.6125C57.9797 23.5125 50.1328 29.6437 46.7719 38.0531L38.7 44.1C37.0969 45.2953 34.9031 45.2953 33.3 44.1L2.7 21.15C1.00027 19.8703 0 17.8734 0 15.75C0 12.022 3.02203 9 6.75 9H65.25ZM41.4 47.7L45.1125 44.9156C45.0422 45.6891 45 46.4625 45 47.25C45 53.2266 47.1234 58.725 50.6531 63H9C4.02891 63 0 58.9641 0 54V24.75L30.6 47.7C33.8063 50.1047 38.1937 50.1047 41.4 47.7Z" fill="#0086FF"/>
+<path d="M90 47.25C90 58.4297 80.9297 67.5 69.75 67.5C58.5703 67.5 49.5 58.4297 49.5 47.25C49.5 36.0703 58.5703 27 69.75 27C80.9297 27 90 36.0703 90 47.25ZM76.0359 41.1609L67.5 49.6969L63.464 45.6609C62.5922 44.775 61.1578 44.775 60.2859 45.6609C59.4 46.5328 59.4 47.9672 60.2859 48.8391L65.9109 54.4641C66.7828 55.35 68.2172 55.35 69.089 54.4641L79.214 44.3391C80.1 43.4672 80.1 42.0328 79.214 41.1609C78.3422 40.275 76.9078 40.275 76.0359 41.1609Z" fill="#00B13C"/>
+</svg>
diff --git a/l10n/de.js b/l10n/de.js
index 47243d09..a205f974 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -39,7 +39,40 @@ OC.L10N.register(
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",
 		"Loading...": "Laden...",
 		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!",
-		"Murena Cloud 2FA": "Murena Cloud 2FA"
-
+		"Create Murena Account": "Murena-Konto erstellen",
+		"Captcha Verification": "Captcha-Prüfung",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Aus Sicherheitsgründen müssen Sie eine Wiederherstellungsadresse für Ihr Murena Cloud-Konto festlegen.",
+		"As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.",
+		"Create My Account": "Mein Konto erstellen",
+		"Verify": "Überprüfen Sie",
+		"Later": "Später",
+		"Set my recovery email address": "Meine Wiederherstellungs-E-Mail-Adresse festlegen",
+		"Display name": "Name anzeigen",
+		"Username": "Benutzername",
+		"Enter Password": "Passwort eingeben",
+		"I want to receive news about Murena products and promotions": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten",
+		"I want to receive news about /e/OS": "Ich möchte Nachrichten über /e/OS erhalten.",
+		"Your name as shown to others": "Ihr Name, wie er für andere sichtbar ist",
+		"Password": "Passwort",
+		"Confirm": "Bestätigen Sie",
+		"Human Verification": "Menschliche Verifizierung",
+		"Recovery Email": "Wiederherstellung E-Mail",
+		"Display name is required.": "Anzeigename ist erforderlich.",
+		"Username is required.": "Der Benutzername ist erforderlich.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
+		"Username is already taken.": "Benutzername ist bereits vergeben.",
+		"Password is required.": "Passwort ist erforderlich.",
+		"Confirm password is required.": "Passwortbestätigung ist erforderlich.",
+		"The confirm password does not match the password.": "Das Bestätigungskennwort stimmt nicht mit dem Kennwort überein.",
+		"Human Verification is required.": "Eine menschliche Verifizierung ist erforderlich.",
+		"Human Verification code is not correct.": "Der Human Verification Code ist nicht korrekt.",
+		"Recovery Email is required.": "Eine Wiederherstellungs-E-Mail ist erforderlich.",
+		"You must read and accept the Terms of Service to create your account.": "Sie müssen die Allgemeinen Geschäftsbedingungen lesen und akzeptieren, um Ihr Konto zu erstellen.",
+		"Use My Account Now": "Mein Konto jetzt verwenden",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ich habe die <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Nutzungsbedingungen</a> gelesen und akzeptiere diese.",
+		"Success!": "Erfolgreich!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='__supportURL__'>diese Seite</a>."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index d70e6d9c..54c2e888 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -38,7 +38,40 @@
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",
 		"Loading...": "Laden...",
 		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!",
-		"Murena Cloud 2FA": "Murena Cloud 2FA"
+		"Create Murena Account": "Murena-Konto erstellen",
+		"Captcha Verification": "Captcha-Prüfung",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Aus Sicherheitsgründen müssen Sie eine Wiederherstellungsadresse für Ihr Murena Cloud-Konto festlegen.",
+		"As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.",
+		"Create My Account": "Mein Konto erstellen",
+		"Verify": "Überprüfen Sie",
+		"Later": "Später",
+		"Set my recovery email address": "Meine Wiederherstellungs-E-Mail-Adresse festlegen",
+		"Display name": "Name anzeigen",
+		"Username": "Benutzername",
+		"Enter Password": "Passwort eingeben",
+		"I want to receive news about Murena products and promotions": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten",
+		"I want to receive news about /e/OS": "Ich möchte Nachrichten über /e/OS erhalten.",
+		"Your name as shown to others": "Ihr Name, wie er für andere sichtbar ist",
+		"Password": "Passwort",
+		"Confirm": "Bestätigen Sie",
+		"Human Verification": "Menschliche Verifizierung",
+		"Recovery Email": "Wiederherstellung E-Mail",
+		"Display name is required.": "Anzeigename ist erforderlich.",
+		"Username is required.": "Der Benutzername ist erforderlich.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
+		"Username is already taken.": "Benutzername ist bereits vergeben.",
+		"Password is required.": "Passwort ist erforderlich.",
+		"Confirm password is required.": "Passwortbestätigung ist erforderlich.",
+		"The confirm password does not match the password.": "Das Bestätigungskennwort stimmt nicht mit dem Kennwort überein.",
+		"Human Verification is required.": "Eine menschliche Verifizierung ist erforderlich.",
+		"Human Verification code is not correct.": "Der Human Verification Code ist nicht korrekt.",
+		"Recovery Email is required.": "Eine Wiederherstellungs-E-Mail ist erforderlich.",
+		"You must read and accept the Terms of Service to create your account.": "Sie müssen die Allgemeinen Geschäftsbedingungen lesen und akzeptieren, um Ihr Konto zu erstellen.",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ich habe die <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Nutzungsbedingungen</a> gelesen und akzeptiere diese.",
+		"Success!": "Erfolgreich!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='__supportURL__'>diese Seite</a>."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 422054cf..3a55d272 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -41,6 +41,43 @@ OC.L10N.register(
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "A subscription is active in this account. Please cancel it or let it expire before deleting your account.",
 		"Loading...": "Loading...",
 		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!",
-		"Murena Cloud 2FA": "Murena Cloud 2FA"
+		"Murena Cloud 2FA": "Murena Cloud 2FA",
+		"Create Murena Account": "Create Murena Account",
+		"Captcha Verification": "Captcha Verification",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "For security reasons you need to set a recovery address for your Murena Cloud account.",
+		"As long as you don't, you'll have limited access to your account.": "As long as you don't, you'll have limited access to your account.",
+		"Create My Account": "Create My Account",
+		"Verify": "Verify",
+		"Later": "Later",
+		"Set my recovery email address": "Set my recovery email address",
+		"Display name": "Display name",
+		"Username": "Username",
+		"Enter Password": "Enter Password",
+		"I want to receive news about Murena products and promotions": "I want to receive news about Murena products and promotions",
+		"I want to receive news about /e/OS": "I want to receive news about /e/OS",
+		"Your name as shown to others": "Your name as shown to others",
+		"Password": "Password",
+		"Confirm": "Confirm",
+		"Human Verification": "Human Verification",
+		"Recovery Email": "Recovery Email",
+		"Display name is required.": "Display name is required.",
+		"Username is required.": "Username is required.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Username must consist of letters, numbers, hyphens, and underscores only.",
+		"Username must be at least 3 characters long.": "Username must be at least 3 characters long.",
+		"Username is already taken.": "Username is already taken.",
+		"Password is required.": "Password is required.",
+		"Confirm password is required.": "Confirm password is required.",
+		"The confirm password does not match the password.": "The confirm password does not match the password.",
+		"Human Verification is required.": "Human Verification is required.",
+		"Human Verification code is not correct.": "Human Verification code is not correct.",
+		"Recovery Email is required.": "Recovery Email is required.",
+		"You must read and accept the Terms of Service to create your account.": "You must read and accept the Terms of Service to create your account.",
+		"Use My Account Now": "Use My Account Now",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.",
+		"Success!": "Success!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.",
+		
+		"Recovery email address is already taken.": "Recovery email address is already taken."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 83db6b42..5d15841a 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -38,7 +38,42 @@
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "A subscription is active in this account. Please cancel it or let it expire before deleting your account.",
 		"Loading...": "Loading...",
 		"Temporary error contacting murena.com; please try again later!": "Temporary error contacting murena.com; please try again later!",
-		"Murena Cloud 2FA": "Murena Cloud 2FA"
+		"Murena Cloud 2FA": "Murena Cloud 2FA",
+		"Create Murena Account": "Create Murena Account",
+		"Captcha Verification": "Captcha Verification",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "For security reasons you need to set a recovery address for your Murena Cloud account.",
+		"As long as you don't, you'll have limited access to your account.": "As long as you don't, you'll have limited access to your account.",
+		"Create My Account": "Create My Account",
+		"Verify": "Verify",
+		"Later": "Later",
+		"Set my recovery email address": "Set my recovery email address",
+		"Display name": "Display name",
+		"Username": "Username",
+		"Enter Password": "Enter Password",
+		"I want to receive news about Murena products and promotions": "I want to receive news about Murena products and promotions",
+		"I want to receive news about /e/OS": "I want to receive news about /e/OS",
+		"Your name as shown to others": "Your name as shown to others",
+		"Password": "Password",
+		"Confirm": "Confirm",
+		"Human Verification": "Human Verification",
+		"Recovery Email": "Recovery Email",
+		"Display name is required.": "Display name is required.",
+		"Username is required.": "Username is required.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Username must consist of letters, numbers, hyphens, and underscores only.",
+		"Username must be at least 3 characters long.": "Username must be at least 3 characters long.",
+		"Username is already taken.": "Username is already taken.",
+		"Password is required.": "Password is required.",
+		"Confirm password is required.": "Confirm password is required.",
+		"The confirm password does not match the password.": "The confirm password does not match the password.",
+		"Human Verification is required.": "Human Verification is required.",
+		"Human Verification code is not correct.": "Human Verification code is not correct.",
+		"Recovery Email is required.": "Recovery Email is required.",
+		"You must read and accept the Terms of Service to create your account.": "You must read and accept the Terms of Service to create your account.",
+		"Use My Account Now": "Use My Account Now",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.",
+		"Success!": "Success!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index 3a081dd1..ea832b36 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -40,6 +40,41 @@ OC.L10N.register(
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Hay una suscripción activa en esta cuenta. Por favor, cancélala o deja que expire antes de eliminar tu cuenta.",
 		"Loading...": "Cargando...",
 		"Temporary error contacting murena.com; please try again later!": "Error temporal al contactar con murena.com; ¡por favor, inténtalo más tarde!",
-		"Murena Cloud 2FA": "Nube Murena A2F"
+		"Murena Cloud 2FA": "Nube Murena A2F",
+		"Create Murena Account": "Crear cuenta Murena",
+		"Captcha Verification": "Verificación Captcha",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Por razones de seguridad, debe establecer una dirección de recuperación para su cuenta de Murena Cloud.",
+		"As long as you don't, you'll have limited access to your account.": "Mientras no lo hagas, tendrás acceso limitado a tu cuenta.",
+		"Create My Account": "Crear mi cuenta",
+		"Verify": "Verifique",
+		"Later": "Más tarde",
+		"Set my recovery email address": "Establecer mi dirección de correo electrónico de recuperación",
+		"Display name": "Mostrar nombre",
+		"Username": "Nombre de usuario",
+		"Enter Password": "Introducir contraseña",
+		"I want to receive news about Murena products and promotions": "Deseo recibir noticias sobre productos y promociones de Murena",
+		"I want to receive news about /e/OS": "Quiero recibir noticias sobre /e/OS",
+		"Your name as shown to others": "Su nombre ante los demás",
+		"Password": "Contraseña",
+		"Confirm": "Confirme",
+		"Human Verification": "Verificación humana",
+		"Recovery Email": "Correo electrónico de recuperación",
+		"Display name is required.": "El nombre para mostrar es obligatorio.",
+		"Username is required.": "Nombre de usuario obligatorio.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "El nombre de usuario debe estar compuesto únicamente por letras, números, guiones y guiones bajos.",
+		"Username must be at least 3 characters long.": "El nombre de usuario debe tener al menos 3 caracteres.",
+		"Username is already taken.": "El nombre de usuario ya está ocupado.",
+		"Password is required.": "Se requiere contraseña.",
+		"Confirm password is required.": "Es necesario confirmar la contraseña.",
+		"The confirm password does not match the password.": "La contraseña confirmada no coincide con la contraseña.",
+		"Human Verification is required.": "Se requiere verificación humana.",
+		"Human Verification code is not correct.": "El código de verificación humana no es correcto.",
+		"Recovery Email is required.": "Se requiere correo electrónico de recuperación.",
+		"You must read and accept the Terms of Service to create your account.": "Debe leer y aceptar las Condiciones del servicio para crear su cuenta.",
+		"Use My Account Now": "Utilizar mi cuenta ahora",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "He leído y acepto las <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Condiciones del servicio</a>.",
+		"Success!": "¡Éxito!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Su cuenta <b>__username__@__domain__</b> se ha creado correctamente.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='__supportURL__'>esta página</a>.",
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index b8594865..e5c3daa6 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -2,7 +2,7 @@
 	"translations": {
 		"Email Address": "Correo electrónico",
 		"Options": "Opciones",
-		"We are going to proceed with your cloud account suppression.": "Vamos a proceder a la supresión de su cuenta en la nube. ",
+		"We are going to proceed with your cloud account suppression.": "Vamos a proceder a la supresión de su cuenta en la nube.",
 		"Check the box below if you also want to delete the associated shop account(s).": "Marque la casilla siguiente si también desea eliminar la(s) cuenta(s) de la tienda asociada(s).",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Para su información tiene %d orden(es) en <a class='text-color-active' href='%s' target='_blank'>su cuenta</a>.",
 		"For your information you have %d order(s) in your accounts: ": "Para su información tiene %d orden(es) en sus cuentas: ",
@@ -18,6 +18,7 @@
 		"Do you want to become a beta user?": "Desea convertirse en usuario beta?",
 		"You want to experiment new features ahead of the others and provide feedback on them before and if they're released? This section is made for you!": "Quieres experimentar las nuevas funciones antes que los demás y dar tu opinión sobre ellas antes y si se publican? Esta sección está hecha para ti.",
 		"To get a preview of our new features you need to become part of our beta users. To do so, simply click on the button below. You can opt out of beta features at anytime.": "Para obtener una vista previa que muestre nuestras nuevas funciones, debe formar parte de nuestros usuarios beta. Para ello, simplemente haga clic en el botón de abajo. Puedes excluirte de las funciones beta en cualquier momento.",
+		"I agree with terms & conditions.": "Estoy de acuerdo con los términos y condiciones.",
 		"Opt out of beta features": "No participar en las funciones beta",
 		"Become a beta user": "Convertirse en usuario beta",
 		"Are you sure you want to opt out of beta features?": "Estás seguro de que quieres excluir las funciones beta?", 
@@ -38,7 +39,42 @@
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Hay una suscripción activa en esta cuenta. Por favor, cancélala o deja que expire antes de eliminar tu cuenta.",
 		"Loading...": "Cargando...",
 		"Temporary error contacting murena.com; please try again later!": "Error temporal al contactar con murena.com; ¡por favor, inténtalo más tarde!",
-		"Murena Cloud 2FA": "Nube Murena A2F"
+		"Murena Cloud 2FA": "Nube Murena A2F",
+		"Create Murena Account": "Crear cuenta Murena",
+		"Captcha Verification": "Verificación Captcha",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Por razones de seguridad, debe establecer una dirección de recuperación para su cuenta de Murena Cloud.",
+		"As long as you don't, you'll have limited access to your account.": "Mientras no lo hagas, tendrás acceso limitado a tu cuenta.",
+		"Create My Account": "Crear mi cuenta",
+		"Verify": "Verifique",
+		"Later": "Más tarde",
+		"Set my recovery email address": "Establecer mi dirección de correo electrónico de recuperación",
+		"Display name": "Mostrar nombre",
+		"Username": "Nombre de usuario",
+		"Enter Password": "Introducir contraseña",
+		"I want to receive news about Murena products and promotions": "Deseo recibir noticias sobre productos y promociones de Murena",
+		"I want to receive news about /e/OS": "Quiero recibir noticias sobre /e/OS",
+		"Your name as shown to others": "Su nombre ante los demás",
+		"Password": "Contraseña",
+		"Confirm": "Confirme",
+		"Human Verification": "Verificación humana",
+		"Recovery Email": "Correo electrónico de recuperación",
+		"Display name is required.": "El nombre para mostrar es obligatorio.",
+		"Username is required.": "Nombre de usuario obligatorio.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "El nombre de usuario debe estar compuesto únicamente por letras, números, guiones y guiones bajos.",
+		"Username must be at least 3 characters long.": "El nombre de usuario debe tener al menos 3 caracteres.",
+		"Username is already taken.": "El nombre de usuario ya está ocupado.",
+		"Password is required.": "Se requiere contraseña.",
+		"Confirm password is required.": "Es necesario confirmar la contraseña.",
+		"The confirm password does not match the password.": "La contraseña confirmada no coincide con la contraseña.",
+		"Human Verification is required.": "Se requiere verificación humana.",
+		"Human Verification code is not correct.": "El código de verificación humana no es correcto.",
+		"Recovery Email is required.": "Se requiere correo electrónico de recuperación.",
+		"You must read and accept the Terms of Service to create your account.": "Debe leer y aceptar las Condiciones del servicio para crear su cuenta.",
+		"Use My Account Now": "Utilizar mi cuenta ahora",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "He leído y acepto las <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Condiciones del servicio</a>.",
+		"Success!": "¡Éxito!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Su cuenta <b>__username__@__domain__</b> se ha creado correctamente.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='__supportURL__'>esta página</a>."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 1f668c1f..81fb0b81 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -39,6 +39,41 @@ OC.L10N.register(
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Un abonnement est actif dans ce compte. Veuillez l'annuler ou le laisser expirer avant de supprimer votre compte.",
 		"Loading...": "Chargement...",
 		"Temporary error contacting murena.com; please try again later!": "Erreur temporaire en contactant murena.com ; veuillez réessayer plus tard !",
-		"Murena Cloud 2FA": "Authentification à 2 facteurs Murena Cloud"
+		"Murena Cloud 2FA": "Authentification à 2 facteurs Murena Cloud",
+		"Create Murena Account": "Créer un compte Murena",
+		"Captcha Verification": "Vérification Captcha",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Pour des raisons de sécurité, vous devez définir une adresse de récupération pour votre compte Murena Cloud.",
+		"As long as you don't, you'll have limited access to your account.": "Si vous ne le faites pas, vous aurez un accès limité à votre compte.",
+		"Create My Account": "Créer mon compte",
+		"Verify": "Vérifier",
+		"Later": "Plus tard",
+		"Set my recovery email address": "Définir mon adresse e-mail de récupération",
+		"Display name": "Nom d'affichage",
+		"Username": "Nom d'utilisateur",
+		"Enter Password": "Saisir le mot de passe",
+		"I want to receive news about Murena products and promotions": "Je souhaite recevoir des informations sur les produits et les promotions de Murena.",
+		"I want to receive news about /e/OS": "Je souhaite recevoir des informations sur /e/OS.",
+		"Your name as shown to others": "Votre nom tel qu'il est présenté aux autres",
+		"Password": "Mot de passe",
+		"Confirm": "Confirmer",
+		"Human Verification": "Vérification humaine",
+		"Recovery Email": "Récupération de l'email",
+		"Display name is required.": "Le nom d'affichage est obligatoire.",
+		"Username is required.": "Le nom d'utilisateur est requis.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Le nom d'utilisateur doit être composé uniquement de lettres, de chiffres, de traits d'union et de traits de soulignement.",
+		"Username must be at least 3 characters long.": "Le nom d'utilisateur doit comporter au moins 3 caractères.",
+		"Username is already taken.": "Le nom d'utilisateur est déjà pris.",
+		"Password is required.": "Le mot de passe est requis.",
+		"Confirm password is required.": "La confirmation du mot de passe est requise.",
+		"The confirm password does not match the password.": "Le mot de passe de confirmation ne correspond pas au mot de passe.",
+		"Human Verification is required.": "Une vérification humaine est nécessaire.",
+		"Human Verification code is not correct.": "Le code de vérification humaine n'est pas correct.",
+		"Recovery Email is required.": "L'e-mail de récupération est requis.",
+		"You must read and accept the Terms of Service to create your account.": "Vous devez lire et accepter les conditions de service pour créer votre compte.",
+		"Use My Account Now": "Utiliser mon compte maintenant",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "J'ai lu et j'accepte les <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Termes de service</a>.",
+		"Success!": "Succès !",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Votre compte <b>__username__@__domain__</b> a été créé avec succès.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='__supportURL__'>cette page</a>."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 48a79c47..a371d46d 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -38,7 +38,42 @@
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Un abonnement est actif dans ce compte. Veuillez l'annuler ou le laisser expirer avant de supprimer votre compte.",
 		"Loading...": "Chargement...",
 		"Temporary error contacting murena.com; please try again later!": "Erreur temporaire en contactant murena.com ; veuillez réessayer plus tard !",
-		"Murena Cloud 2FA": "Authentification à 2 facteurs Murena Cloud"
+		"Murena Cloud 2FA": "Authentification à 2 facteurs Murena Cloud",
+		"Create Murena Account": "Créer un compte Murena",
+		"Captcha Verification": "Vérification Captcha",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Pour des raisons de sécurité, vous devez définir une adresse de récupération pour votre compte Murena Cloud.",
+		"As long as you don't, you'll have limited access to your account.": "Si vous ne le faites pas, vous aurez un accès limité à votre compte.",
+		"Create My Account": "Créer mon compte",
+		"Verify": "Vérifier",
+		"Later": "Plus tard",
+		"Set my recovery email address": "Définir mon adresse e-mail de récupération",
+		"Display name": "Nom d'affichage",
+		"Username": "Nom d'utilisateur",
+		"Enter Password": "Saisir le mot de passe",
+		"I want to receive news about Murena products and promotions": "Je souhaite recevoir des informations sur les produits et les promotions de Murena.",
+		"I want to receive news about /e/OS": "Je souhaite recevoir des informations sur /e/OS.",
+		"Your name as shown to others": "Votre nom tel qu'il est présenté aux autres",
+		"Password": "Mot de passe",
+		"Confirm": "Confirmer",
+		"Human Verification": "Vérification humaine",
+		"Recovery Email": "Récupération de l'email",
+		"Display name is required.": "Le nom d'affichage est obligatoire.",
+		"Username is required.": "Le nom d'utilisateur est requis.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Le nom d'utilisateur doit être composé uniquement de lettres, de chiffres, de traits d'union et de traits de soulignement.",
+		"Username must be at least 3 characters long.": "Le nom d'utilisateur doit comporter au moins 3 caractères.",
+		"Username is already taken.": "Le nom d'utilisateur est déjà pris.",
+		"Password is required.": "Le mot de passe est requis.",
+		"Confirm password is required.": "La confirmation du mot de passe est requise.",
+		"The confirm password does not match the password.": "Le mot de passe de confirmation ne correspond pas au mot de passe.",
+		"Human Verification is required.": "Une vérification humaine est nécessaire.",
+		"Human Verification code is not correct.": "Le code de vérification humaine n'est pas correct.",
+		"Recovery Email is required.": "L'e-mail de récupération est requis.",
+		"You must read and accept the Terms of Service to create your account.": "Vous devez lire et accepter les conditions de service pour créer votre compte.",
+		"Use My Account Now": "Utiliser mon compte maintenant",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "J'ai lu et j'accepte les <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Termes de service</a>.",
+		"Success!": "Succès !",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Votre compte <b>__username__@__domain__</b> a été créé avec succès.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='__supportURL__'>cette page</a>."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 7dbe4434..008a8d01 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -39,6 +39,41 @@ OC.L10N.register(
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "In questo account è attivo un abbonamento. Si prega di annullarlo o di lasciarlo scadere prima di cancellare l'account.",
 		"Loading...": "Caricamento...",
 		"Temporary error contacting murena.com; please try again later!": "Errore temporaneo nel contattare murena.com; riprova più tardi!",
-		"Murena Cloud 2FA": "Codice di Autenticazione a 2 Fattori Murena Cloud"
+		"Murena Cloud 2FA": "Codice di Autenticazione a 2 Fattori Murena Cloud",
+		"Create Murena Account": "Creare un account Murena",
+		"Captcha Verification": "Verifica Captcha",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Per motivi di sicurezza è necessario impostare un indirizzo di recupero per il proprio account Murena Cloud.",
+		"As long as you don't, you'll have limited access to your account.": "Finché non lo farete, avrete un accesso limitato al vostro conto.",
+		"Create My Account": "Crea il mio account",
+		"Verify": "Verifica",
+		"Later": "Più tardi",
+		"Set my recovery email address": "Impostare l'indirizzo e-mail di recupero",
+		"Display name": "Nome visualizzato",
+		"Username": "Nome utente",
+		"Enter Password": "Inserire la password",
+		"I want to receive news about Murena products and promotions": "Desidero ricevere notizie sui prodotti e sulle promozioni Murena.",
+		"I want to receive news about /e/OS": "Voglio ricevere notizie su /e/OS.",
+		"Your name as shown to others": "Il vostro nome come mostrato agli altri",
+		"Password": "Password",
+		"Confirm": "Confermare",
+		"Human Verification": "Verifica umana",
+		"Recovery Email": "Recupero e-mail",
+		"Display name is required.": "Il nome visualizzato è obbligatorio.",
+		"Username is required.": "Il nome utente è necessario.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Il nome utente deve essere composto esclusivamente da lettere, numeri, trattini e trattini bassi.",
+		"Username must be at least 3 characters long.": "Il nome utente deve essere lungo almeno 3 caratteri.",
+		"Username is already taken.": "Il nome utente è già stato preso.",
+		"Password is required.": "La password è necessaria.",
+		"Confirm password is required.": "È necessario confermare la password.",
+		"The confirm password does not match the password.": "La password di conferma non corrisponde alla password.",
+		"Human Verification is required.": "È necessaria la verifica umana.",
+		"Human Verification code is not correct.": "Il codice di verifica umano non è corretto.",
+		"Recovery Email is required.": "L'e-mail di recupero è necessaria.",
+		"You must read and accept the Terms of Service to create your account.": "Per creare il proprio account è necessario leggere e accettare i Termini di servizio.",
+		"Use My Account Now": "Utilizza ora il mio account",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ho letto e accetto i <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Termini di servizio</a>.",
+		"Success!": "Successo!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "L'account <b>__username__@__domain__</b> è stato creato con successo.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare <a href='__supportURL__'>questa pagina</a>."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 1c9cb7a0..2dcaf6c5 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -2,7 +2,7 @@
 	"translations": {
 		"Email Address": "Indirizzo e-mail",
 		"Options": "Opzioni",
-		"We are going to proceed with your cloud account suppression.": "Procederemo con la soppressione dell'account cloud. ",
+		"We are going to proceed with your cloud account suppression.": "Procederemo con la soppressione dell'account cloud.",
 		"Check the box below if you also want to delete the associated shop account(s).": "Selezionare la casella sottostante se si desidera eliminare anche gli account del negozio associati.",
 		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Per vostra informazione, avete %d ordini in <a class='text-color-active' href='%s' target='_blank'>il tuo account</a>.",
 		"For your information you have %d order(s) in your accounts: ": "Per vostra informazione, avete %d ordini in i vostri conti: ",
@@ -38,7 +38,37 @@
 		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "In questo account è attivo un abbonamento. Si prega di annullarlo o di lasciarlo scadere prima di cancellare l'account.",
 		"Loading...": "Caricamento...",
 		"Temporary error contacting murena.com; please try again later!": "Errore temporaneo nel contattare murena.com; riprova più tardi!",
-		"Murena Cloud 2FA": "Codice di Autenticazione a 2 Fattori Murena Cloud"
+		"Murena Cloud 2FA": "Codice di Autenticazione a 2 Fattori Murena Cloud",
+		"Create Murena Account": "Creare un account Murena",
+		"Captcha Verification": "Verifica Captcha",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Per motivi di sicurezza è necessario impostare un indirizzo di recupero per il proprio account Murena Cloud.",
+		"As long as you don't, you'll have limited access to your account.": "Finché non lo farete, avrete un accesso limitato al vostro conto.",
+		"Create My Account": "Crea il mio account",
+		"Verify": "Verifica",
+		"Later": "Più tardi",
+		"Set my recovery email address": "Impostare l'indirizzo e-mail di recupero",
+		"Display name": "Nome visualizzato",
+		"Username": "Nome utente",
+		"Enter Password": "Inserire la password",
+		"I want to receive news about Murena products and promotions": "Desidero ricevere notizie sui prodotti e sulle promozioni Murena.",
+		"I want to receive news about /e/OS": "Voglio ricevere notizie su /e/OS.",
+		"Your name as shown to others": "Il vostro nome come mostrato agli altri",
+		"Password": "Password",
+		"Confirm": "Confermare",
+		"Human Verification": "Verifica umana",
+		"Recovery Email": "Recupero e-mail",
+		"Display name is required.": "Il nome visualizzato è obbligatorio.",
+		"Username is required.": "Il nome utente è necessario.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Il nome utente deve essere composto esclusivamente da lettere, numeri, trattini e trattini bassi.",
+		"Username must be at least 3 characters long.": "Il nome utente deve essere lungo almeno 3 caratteri.",
+		"Username is already taken.": "Il nome utente è già stato preso.",
+		"Password is required.": "La password è necessaria.",
+		"Confirm password is required.": "È necessario confermare la password.",
+		"The confirm password does not match the password.": "La password di conferma non corrisponde alla password.",
+		"Human Verification is required.": "È necessaria la verifica umana.",
+		"Human Verification code is not correct.": "Il codice di verifica umano non è corretto.",
+		"Recovery Email is required.": "L'e-mail di recupero è necessaria.",
+		"You must read and accept the Terms of Service to create your account.": "Per creare il proprio account è necessario leggere e accettare i Termini di servizio."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 6683fcf3..890b5355 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,7 +26,6 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
-use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
@@ -36,7 +35,6 @@ use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\UserChangedEvent;
@@ -52,7 +50,6 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
-		// $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
new file mode 100644
index 00000000..505831be
--- /dev/null
+++ b/lib/Controller/AccountController.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+   * Copyright 2022 - Murena SAS - tous droits réservés
+   */
+
+namespace OCA\EcloudAccounts\Controller;
+
+use Exception;
+use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Service\CaptchaService;
+use OCA\EcloudAccounts\Service\UserService;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IRequest;
+use OCP\ISession;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+use OCP\L10N\IFactory;
+
+class AccountController extends Controller {
+	protected $appName;
+	protected $request;
+	private $userService;
+	private $captchaService;
+	protected $l10nFactory;
+	private $session;
+	private $userSession;
+	private $urlGenerator;
+	public function __construct(
+		$AppName,
+		IRequest $request,
+		UserService $userService,
+		CaptchaService $captchaService,
+		IFactory $l10nFactory,
+		IUserSession $userSession,
+		IURLGenerator $urlGenerator,
+		ISession $session
+	) {
+		parent::__construct($AppName, $request);
+		$this->appName = $AppName;
+		$this->userService = $userService;
+		$this->captchaService = $captchaService;
+		$this->l10nFactory = $l10nFactory;
+		$this->session = $session;
+		$this->userSession = $userSession;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $lang Language code (default: 'en')
+	 *
+	 */
+	public function index(string $lang = 'en') {
+		if ($this->userSession->isLoggedIn()) {
+			return new RedirectResponse($this->urlGenerator->linkToDefaultPageUrl());
+		}
+		return new TemplateResponse(
+			Application::APP_ID,
+			'signup',
+			['appName' => Application::APP_ID, 'lang' => $lang],
+			TemplateResponse::RENDER_AS_GUEST
+		);
+	}
+	/**
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $displayname      User's display name
+	 * @param string $recoveryEmail    User's recovery email
+	 * @param string $username         User's username
+	 * @param string $password         User's password
+	 * @param string $language         User's language preference
+	 *
+	 * @return \OCP\AppFramework\Http\DataResponse
+	 */
+	public function create(string $displayname = '', string $recoveryEmail = '', string $username = '', string $password = '', string $language = ''): DataResponse {
+		
+		$response = new DataResponse();
+		
+		if(!$this->session->get('captcha_verified')) {
+			$response->setData(['message' => 'Captcha is not verified!', 'success' => false]);
+			$response->setStatus(400);
+			return $response;
+		}
+
+		$inputData = [
+			'username' => ['value' => $username, 'maxLength' => 30],
+			'displayname' => ['value' => $displayname, 'maxLength' => 30],
+			'password' => ['value' => $password, 'maxLength' => 1024],
+		];
+		
+		foreach ($inputData as $inputName => $inputInfo) {
+			$validationError = $this->validateInput($inputName, $inputInfo['value'], $inputInfo['maxLength']);
+			if ($validationError !== null) {
+				$response->setData(['message' => $validationError, 'success' => false]);
+				$response->setStatus(400);
+				return $response;
+			}
+		}
+		
+		try {
+			$mainDomain = $this->userService->getMainDomain();
+			$userEmail = $username.'@'.$mainDomain;
+
+			$newUserEntry = $this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
+			
+			$this->userService->setAccountDataLocally($username, $userEmail, $newUserEntry['quota']);
+			$this->userService->createHMEAlias($username, $userEmail);
+			$this->userService->createNewDomainAlias($username, $userEmail);
+			$this->userService->setTOS($username, true);
+			$this->userService->setUserLanguage($username, $language);
+			
+			if($recoveryEmail !== '') {
+				$this->userService->setRecoveryEmail($username, $recoveryEmail);
+			}
+		
+			$this->userService->sendWelcomeEmail($displayname, $username, $userEmail, $language);
+			
+			$response->setStatus(200);
+			$response->setData(['success' => true]);
+
+		} catch (Exception $e) {
+			$response->setData(['message' => $e->getMessage(), 'success' => false]);
+			$response->setStatus(500);
+		}
+		return $response;
+	}
+	/**
+	 * Validate input for a given input name, value, and optional maximum length.
+	 *
+	 * @param string $inputName The name of the input.
+	 * @param string  $value     The value of the input.
+	 * @param int|null $maxLength The optional maximum length allowed.
+	 *
+	 * @return string|null If validation fails, a string describing the error; otherwise, null.
+	 */
+	public function validateInput(string $inputName, string $value, int $maxLength = null) : ?string {
+		if ($value === '') {
+			return "$inputName is required.";
+		}
+	
+		if ($maxLength !== null && strlen($value) > $maxLength) {
+			return "$inputName is too large.";
+		}
+	
+		return null; // Validation passed
+	}
+	/**
+	 * Check if a username is available.
+	 *
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $username The username to check.
+	 *
+	 * @return \OCP\AppFramework\Http\DataResponse
+	 */
+	public function checkUsernameAvailable(string $username) : DataResponse {
+		$response = new DataResponse();
+		$response->setStatus(400);
+		if (!$this->userService->userExists($username)) {
+			$response->setStatus(200);
+		}
+		return $response;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 */
+	public function captcha(): Http\DataDisplayResponse {
+		$captchaValue = $this->captchaService->generateCaptcha();
+
+		$response = new Http\DataDisplayResponse($captchaValue, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+
+		return $response;
+	}
+	/**
+	 * Verify a human verification input against captcha session values.
+	 *
+	 * @NoAdminRequired
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $captchaInput The user-provided human verification input.
+	 *
+	 * @return \OCP\AppFramework\Http\DataResponse
+	 */
+	public function verifyCaptcha(string $captchaInput = '') : DataResponse {
+		$response = new DataResponse();
+		
+		$captchaResult = (string)$this->session->get('captcha_result', '');
+		$response->setStatus(400);
+		if ($captchaResult === $captchaInput) {
+			$this->session->remove('captcha_result');
+			$this->session->set('captcha_verified', true);
+			$response->setStatus(200);
+		}
+		return $response;
+	}
+
+}
diff --git a/lib/Service/CaptchaService.php b/lib/Service/CaptchaService.php
new file mode 100644
index 00000000..4bc4245d
--- /dev/null
+++ b/lib/Service/CaptchaService.php
@@ -0,0 +1,228 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Service;
+
+use OCP\ISession;
+
+class CaptchaService {
+	private $session;
+	public const WIDTH = 80;
+	public const HEIGHT = 40;
+	public const NUMBERS = '123456789';
+	public const SYMBOLS = '+-';
+	public const NOISE_LEVEL = 13;
+
+	public function __construct(ISession $session) {
+		$this->session = $session;
+	}
+	/**
+	 * Generate a captcha image and return its binary representation.
+	 *
+	 * @return string|null Binary representation of the generated image, or null on failure.
+	 */
+	public function generateCaptcha(): ?string {
+		// Configuration parameters
+		$width = self::WIDTH;
+		$height = self::HEIGHT;
+		$numbers = self::NUMBERS;
+		$symbols = self::SYMBOLS;
+		$noiseLevel = self::NOISE_LEVEL;
+	
+		// Create the initial image resource
+		$im = imagecreatetruecolor($width, $height);
+		$ns = imagecolorallocate($im, 200, 200, 200); // Noise color
+		$image = imagecreate($width, $height);
+		if (!$image) {
+			return null;
+		}
+	
+		// Draw random lines on the image
+		$this->drawRandomLines($image, 10);
+	
+		$x = 10 + mt_rand(0, 10);
+		$num1 = $this->getRandomCharacter($numbers);
+		$this->updateImage($image, $x, $num1);
+	
+		$x += 10 + mt_rand(0, 10);
+		$sym = $this->getRandomCharacter($symbols);
+		$this->updateImage($image, $x, $sym);
+	
+		$x += 10 + mt_rand(0, 10);
+		$num2 = $this->getRandomCharacter($numbers);
+		$this->updateImage($image, $x, $num2);
+	
+		// Rotate the image by a random angle
+		$image = imagerotate($image, mt_rand(-15, 15), 0);
+	
+		// Draw a random space and the equal sign
+		$x = $this->drawCharacterWithRandomSpace($image, $x, "=");
+	
+		// Combine the generated code
+		$code = $num1 . $sym . $num2;
+	
+		// Evaluate the mathematical expression
+		eval("\$code = $code;");
+	
+		// Add random noise to the image
+		$this->addNoise($image, $noiseLevel);
+	
+		// Output the image as PNG into a variable
+		ob_start();
+		imagepng($image);
+		$imageData = ob_get_clean();
+	
+		// Destroy the image resource
+		imagedestroy($image);
+	
+		$num1 = intval($num1);
+		$num2 = intval($num2);
+		// Calculate result
+		$result = $this->calculateResult($num1, $num2, $sym);
+	
+		// Update session with the result
+		$this->updateSession($result);
+	
+		// Return the binary representation of the generated image
+		return $imageData;
+	}
+	/**
+	 * Calculate the result of a mathematical operation.
+	 *
+	 * @param int $operand1 The first operand.
+	 * @param int $operand2 The second operand.
+	 * @param string $operator The mathematical operator ('+' or '-').
+	 *
+	 * @return int The result of calcuulated
+	 */
+	private function calculateResult(int $operand1, int $operand2, string $operator): int {
+		
+		switch ($operator) {
+			case '+':
+				return $operand1 + $operand2;
+			case '-':
+				return $operand1 - $operand2;
+			default:
+				return 0;
+		}
+		
+	}
+
+	/**
+	 * Draws random lines on the given image.
+	 *
+	 * @param $image The image resource.
+	 * @param int $count The number of lines to draw.
+	 */
+	private function drawRandomLines(&$image, $count) {
+		for ($i = 0; $i < $count; $i++) {
+			imageline(
+				$image,
+				mt_rand(0, self::WIDTH),
+				mt_rand(0, self::HEIGHT),
+				mt_rand(0, self::WIDTH),
+				mt_rand(0, self::HEIGHT),
+				imagecolorallocate(
+					$image,
+					mt_rand(200, 255),
+					mt_rand(200, 255),
+					mt_rand(200, 255)
+				)
+			);
+		}
+	}
+	
+	/**
+	 * Get a random character from the given string.
+	 *
+	 * @param string $string The input string from which to extract a random character.
+	 *
+	 * @return string The randomly selected character from the input string.
+	 */
+	private function getRandomCharacter(string $string): string {
+		return substr($string, rand(0, strlen($string) - 1), 1);
+	}
+
+	
+	/**
+	 * Draw a character on the image with a random horizontal space.
+	 *
+	 * @param $image The image resource to draw on.
+	 * @param int $x The initial x-coordinate for drawing the character.
+	 * @param string $char The character to be drawn on the image.
+	 *
+	 * @return int The updated x-coordinate after drawing the character.
+	 */
+	private function drawCharacterWithRandomSpace(&$image, int $x, string $char): int {
+		$x += 10 + mt_rand(0, 10);
+		$this->updateImage($image, $x, $char);
+		return $x;
+	}
+
+	
+	/**
+	 * Add random noise to the image.
+	 *
+	 * @param $image The image resource to add noise to.
+	 * @param int $noiseLevel The number of random pixels to add as noise.
+	 *
+	 * @return void
+	 */
+	private function addNoise(&$image, int $noiseLevel): void {
+		// Define noise color
+		$ns = imagecolorallocate($image, 200, 200, 200);
+
+		// Add random pixels as noise
+		for ($i = 0; $i < $noiseLevel; $i++) {
+			for ($j = 0; $j < $noiseLevel; $j++) {
+				imagesetpixel(
+					$image,
+					rand(0, self::WIDTH - 1),  // Adjusted range to avoid exceeding image dimensions
+					rand(0, self::HEIGHT - 1), // Adjusted range to avoid exceeding image dimensions
+					$ns
+				);
+			}
+		}
+	}
+
+	
+	/**
+	 * Update session variables with provided numeric operands and operator symbols.
+	 *
+	 * @param string $captchaResult Captcha Result.
+	 *
+	 * @return void
+	 */
+	private function updateSession(float $captchaResult): void {
+		$this->session->set('captcha_result', $captchaResult);
+	}
+
+	
+	/**
+	 * Update the image with a character at the specified coordinates.
+	 *
+	 * @param $image The image resource to update.
+	 * @param int $x The x-coordinate where the character will be placed.
+	 * @param string $num The character to be added to the image.
+	 *
+	 * @return void
+	 */
+	private function updateImage(&$image, int $x, string $num): void {
+		// Generate a random color for the character
+		$color = imagecolorallocate($image, mt_rand(0, 155), mt_rand(0, 155), mt_rand(0, 155));
+
+		// Place the character on the image
+		imagechar(
+			$image,
+			mt_rand(4, 5), // Font size (randomly chosen between 4 and 5)
+			$x,
+			mt_rand(5, 20), // Vertical position (randomly chosen between 5 and 20)
+			$num,
+			$color
+		);
+	}
+
+	
+
+}
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index a45024e6..35537b56 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -5,21 +5,27 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Service;
 
 use Exception;
+use OCA\User_LDAP\Configuration;
+use OCA\User_LDAP\Helper;
+use OCP\IConfig;
 use OCP\IUserManager;
 
 class LDAPConnectionService {
 	/** @var IUserManager */
 	private $userManager;
-
 	private $configuration;
-
 	private $ldapEnabled;
-
 	private $access;
+	private $ldapConfig;
+	private IConfig $config;
 
-	public function __construct(IUserManager $userManager) {
+	public function __construct(IUserManager $userManager, Helper $ldapBackendHelper, IConfig $config) {
 		$this->userManager = $userManager;
 		$this->getConfigurationFromBackend();
+		$ldapConfigPrefixes = $ldapBackendHelper->getServerConfigurationPrefixes(true);
+		$prefix = array_shift($ldapConfigPrefixes);
+		$this->ldapConfig = new Configuration($prefix);
+		$this->config = $config;
 	}
 
 
@@ -47,22 +53,13 @@ class LDAPConnectionService {
 		return $backend->getBackendName() === 'LDAP';
 	}
 
-	public function isLDAPEnabled() : bool {
+	public function isLDAPEnabled(): bool {
 		return $this->ldapEnabled;
 	}
 
 	public function username2dn(string $username) {
 		return $this->access->username2dn($username);
 	}
-	
-
-	public function getUserBaseDn() : string {
-		if (isset($this->configuration['ldap_base_users'])) {
-			return $this->configuration['ldap_base_users'];
-		}
-		throw new Exception('User Base Dn not set!');
-	}
-
 	public function getLDAPConnection() {
 		if (!$this->ldapEnabled) {
 			throw new Exception('LDAP backend is not enabled');
@@ -83,7 +80,7 @@ class LDAPConnectionService {
 		return $conn;
 	}
 
-	public function closeLDAPConnection($conn) : void {
+	public function closeLDAPConnection($conn): void {
 		ldap_close($conn);
 	}
 
@@ -93,4 +90,18 @@ class LDAPConnectionService {
 		}
 		return $this->access;
 	}
+
+	public function getLDAPBaseUsers(): array {
+		$bases = $this->ldapConfig->ldapBaseUsers;
+		if (empty($bases)) {
+			$bases = $this->ldapConfig->ldapBase;
+		}
+		return $bases;
+	}
+	public function getDisplayNameAttribute(): string {
+		return $this->ldapConfig->ldapUserDisplayName;
+	}
+	public function getLdapQuota() {
+		return $this->config->getSystemValue('default_quota', '1024');
+	}
 }
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index e74854d0..56e156fe 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -6,12 +6,14 @@ namespace OCA\EcloudAccounts\Service;
 
 require __DIR__ . '/../../vendor/autoload.php';
 
+use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
 use OCP\Defaults;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\L10N\IFactory;
 use OCP\Util;
 use Throwable;
 
@@ -20,24 +22,41 @@ use UnexpectedValueException;
 class UserService {
 	/** @var IUserManager */
 	private $userManager;
-
 	/** @var array */
 	private $appConfig;
-
 	/** @var IConfig */
 	private $config;
-
+	/** @var CurlService */
 	private $curl;
-	private Defaults $defaults;
-	private ILogger $logger;
+	/** @var Defaults */
+	private $defaults;
+	/** @var ILogger */
+	private $logger;
+	/** @var IFactory */
+	protected $l10nFactory;
+	/** @var array */
+	private $apiConfig;
+	/** @var LDAPConnectionService */
+	private $LDAPConnectionService;
 
-	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults) {
+	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults, IFactory $l10nFactory, LDAPConnectionService $LDAPConnectionService) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->appConfig = $this->config->getSystemValue($appName);
 		$this->curl = $curlService;
 		$this->logger = $logger;
 		$this->defaults = $defaults;
+		$this->l10nFactory = $l10nFactory;
+		$this->LDAPConnectionService = $LDAPConnectionService;
+		$this->apiConfig = [
+			'mainDomain' => $this->config->getSystemValue('main_domain', ''),
+			'commonApiUrl' => rtrim($this->config->getSystemValue('common_services_url', ''), '/') . '/',
+			'commonServiceToken' => $this->config->getSystemValue('common_service_token', ''),
+			'aliasDomain' => $this->config->getSystemValue('alias_domain', ''),
+			'commonApiVersion' => $this->config->getSystemValue('common_api_version', ''),
+			'userCluserId' => $this->config->getSystemValue('user_cluser_id', ''),
+			'objectClass' => $this->config->getSystemValue('ldap_object_class', []),
+		];
 	}
 
 
@@ -48,7 +67,6 @@ class UserService {
 		return $default;
 	}
 
-
 	public function userExists(string $uid): bool {
 		$exists = $this->userManager->userExists($uid);
 		if ($exists) {
@@ -69,16 +87,16 @@ class UserService {
 	}
 
 	public function getUser(string $uid): ?IUser {
-		return $this->userManager->get($uid);
+		if($this->userExists($uid)) {
+			return $this->userManager->get($uid);
+		}
 	}
 
-	public function setRecoveryEmail(string $uid, string $recoveryEmail): bool {
-		try {
-			$this->config->setUserValue($uid, 'email-recovery', 'recovery-email', $recoveryEmail);
-			return true;
-		} catch (UnexpectedValueException $e) {
-			return false;
-		}
+	public function setRecoveryEmail(string $uid, string $recoveryEmail): void {
+		$this->config->setUserValue($uid, 'email-recovery', 'recovery-email', $recoveryEmail);
+	}
+	public function setTOS(string $uid, bool $tosAccepted): void {
+		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
 	}
 
 	public function getHMEAliasesFromConfig($uid) : array {
@@ -138,7 +156,8 @@ class UserService {
 
 		return null;
 	}
-	public function sendWelcomeEmail(string $uid, string $toEmail) : void {
+	public function sendWelcomeEmail(string $displayname, string $username, string $userEmail, string $language = 'en') : void {
+		
 		$sendgridAPIkey = $this->getSendGridAPIKey();
 		if (empty($sendgridAPIkey)) {
 			$this->logger->warning("sendgrid_api_key is missing or empty.", ['app' => Application::APP_ID]);
@@ -150,8 +169,7 @@ class UserService {
 			$this->logger->warning("welcome_sendgrid_template_ids is missing or empty.", ['app' => Application::APP_ID]);
 			return;
 		}
-			
-		$language = $this->getUserLanguage($uid);
+		
 		$templateID = $templateIDs['en'];
 		if (isset($templateIDs[$language])) {
 			$templateID = $templateIDs[$language];
@@ -160,15 +178,11 @@ class UserService {
 		$fromEmail = Util::getDefaultEmailAddress('noreply');
 		$fromName = $this->defaults->getName();
 		
-		$user = $this->userManager->get($uid);
-		$toName = $user->getDisplayName();
-			
-		$mainDomain = $this->getMainDomain();
 		try {
-			$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);
+			$email = $this->createSendGridEmail($fromEmail, $fromName, $username, $displayname, $userEmail, $templateID);
 			$this->sendEmailWithSendGrid($email, $sendgridAPIkey);
 		} catch (Throwable $e) {
-			$this->logger->error('Error sending email to: ' . $toEmail . ': ' . $e->getMessage());
+			$this->logger->error('Error sending welcome email to user: ' . $username . ': ' . $e->getMessage());
 		}
 	}
 	private function getSendGridAPIKey() : string {
@@ -177,21 +191,23 @@ class UserService {
 	private function getSendGridTemplateIDs() : array {
 		return $this->config->getSystemValue('welcome_sendgrid_template_ids', '');
 	}
-	private function getMainDomain() : string {
+	public function getMainDomain() : string {
 		return $this->config->getSystemValue('main_domain', '');
 	}
-	private function getUserLanguage(string $username) : string {
-		return $this->config->getUserValue($username, 'core', 'lang', 'en');
+	public function setUserLanguage(string $username, string $language = 'en') {
+		$this->config->setUserValue($username, 'core', 'lang', $language);
 	}
-	private function createSendGridEmail(string $fromEmail, string  $fromName, string $toEmail, string  $toName, string  $templateID, string  $username, string  $mainDomain) : \SendGrid\Mail\Mail {
+	private function createSendGridEmail(string $fromEmail, string $fromName, string $username, string $displayname, string $userEmail, string $templateID) : \SendGrid\Mail\Mail {
+		$mainDomain = $this->getMainDomain();
+
 		$email = new \SendGrid\Mail\Mail();
 		$email->setFrom($fromEmail, $fromName);
-		$email->addTo($toEmail, $toName);
+		$email->addTo($userEmail, $displayname);
 		$email->setTemplateId($templateID);
 		$email->addDynamicTemplateDatas([
 			"username" => $username,
 			"mail_domain" => $mainDomain,
-			"display_name" => $toName
+			"display_name" => $displayname
 		]);
 		return $email;
 	}
@@ -200,7 +216,177 @@ class UserService {
 		$response = $sendgrid->send($email, [ CURLOPT_TIMEOUT => 15 ]);
 
 		if ($response->statusCode() < 200 || $response->statusCode() > 299) {
-			throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());
+			$this->logger->error("SendGrid API error - Status Code: " . $response->statusCode());
+		}
+	}
+	/**
+	 * Register a new user.
+	 *
+	 * @param string $displayname The display name of the user.
+	 * @param string $recoveryemail The recovery email address for the user.
+	 * @param string $username The chosen username for the user.
+	 * @param string $userEmail The email address of the user.
+	 * @param string $password The password chosen by the user.
+	 *
+	 * @return array An array containing information about the registered user.
+	 * @throws Exception If the username or recovery email is already taken.
+	 */
+	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): array {
+
+		if ($this->userExists($username)) {
+			throw new Exception("Username is already taken.");
+		}
+		if (!empty($recoveryEmail) && $this->checkRecoveryEmailAvailable($recoveryEmail)) {
+			throw new Exception("Recovery email address is already taken.");
+		}
+		return $this->addNewUserToLDAP($displayname, $recoveryEmail, $username, $userEmail, $password);
+		
+	}
+	/**
+	 * Add a new user to the LDAP directory.
+	 *
+	 * @param string $displayname The display name of the new user.
+	 * @param string $recoveryEmail The recovery email address of the new user.
+	 * @param string $username The username of the new user.
+	 * @param string $userEmail The email address of the new user.
+	 * @param string $password The password of the new user.
+	 *
+	 * @return array Information about the added user.
+	 * @throws Exception If there is an error while creating the Murena account.
+	 */
+	private function addNewUserToLDAP(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): ?array {
+		try {
+			$connection = $this->LDAPConnectionService->getLDAPConnection();
+			$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
+		
+			$newUserDN = "username=$username," . $base;
+		
+			$newUserEntry = [
+				'mailAddress' => $userEmail,
+				'username' => $username,
+				'usernameWithoutDomain' => $username,
+				'userPassword' => $password,
+				'displayName' => $displayname,
+				'quota' => $this->LDAPConnectionService->getLdapQuota(),
+				'recoveryMailAddress' => $recoveryEmail,
+				'active' => 'TRUE',
+				'mailActive' => 'TRUE',
+				'userClusterID' => $this->apiConfig['userCluserId'],
+				'objectClass' => $this->apiConfig['objectClass']
+			];
+
+			$ret = ldap_add($connection, $newUserDN, $newUserEntry);
+		
+			if (!$ret) {
+				throw new Exception("Error while creating Murena account.");
+			}
+			return $newUserEntry;
+		} catch (Exception $e) {
+			$this->logger->error('Error adding adding new user to LDAP: ' . $username . ': ' . $e->getMessage());
+			return null;
+		}
+	}
+	/**
+	 * Check if a recovery email address is available (not already taken by another user).
+	 *
+	 * @param string $recoveryEmail The recovery email address to check.
+	 *
+	 * @return bool True if the recovery email address is available, false otherwise.
+	 */
+	public function checkRecoveryEmailAvailable(string $recoveryEmail): bool {
+		$recoveryEmail = strtolower($recoveryEmail);
+		$users = $this->config->getUsersForUserValue('email-recovery', 'recovery-email', $recoveryEmail);
+		if(count($users)) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Create a Hide My Email (HME) alias for a user.
+	 *
+	 * @param string $username The username for which to create the HME alias.
+	 * @param string $resultmail The email address associated with the HME alias.
+	 *
+	 * @return void
+	 */
+	public function createHMEAlias(string $username, string $resultmail): void {
+		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$aliasDomain = $this->apiConfig['aliasDomain'];
+		$token = $this->apiConfig['commonServiceToken'];
+		$commonApiVersion = $this->apiConfig['commonApiVersion'];
+		
+		$endpoint = $commonApiVersion . '/aliases/hide-my-email/';
+		$url = $commonApiUrl . $endpoint . $resultmail;
+		$data = array(
+			"domain" => $aliasDomain
+		);
+		$headers = [
+			"Authorization: Bearer $token"
+		];
+		$result = $this->curl->post($url, $data, $headers);
+		$result = json_decode($result, true);
+
+		$hmeAlias = isset($result['emailAlias']) ? $result['emailAlias'] : '';
+		if($hmeAlias != '') {
+			$hmeAliasAdded = $this->addHMEAliasInConfig($username, $hmeAlias);
+			if (!$hmeAliasAdded) {
+				$this->logger->error('Error adding HME Alias in config.');
+			}
 		}
 	}
+	/**
+	 * Create a new domain alias for a user.
+	 *
+	 * @param string $username The username for which to create the domain alias.
+	 * @param string $userEmail The email address associated with the domain alias.
+	 *
+	 * @return mixed The result of the domain alias creation request, decoded from JSON.
+	 */
+	public function createNewDomainAlias(string $username, string $userEmail): mixed {
+		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonApiVersion = $this->config->getSystemValue('commonApiVersion', '');
+		$domain = $this->apiConfig['mainDomain'];
+		$token = $this->apiConfig['commonServiceToken'];
+		$commonApiVersion = $this->apiConfig['commonApiVersion'];
+
+		$endpoint = $commonApiVersion . '/aliases/';
+		$url = $commonApiUrl . $endpoint . $userEmail;
+
+		$data = array(
+			"alias" => $username,
+			"domain" => $domain
+		);
+		$headers = [
+			"Authorization: Bearer $token"
+		];
+		
+		$result = $this->curl->post($url, $data, $headers);
+		$result = json_decode($result, true);
+		return $result;
+	}
+	/**
+	 * Set account data locally for a user.
+	 *
+	 * @param string $uid The unique identifier of the user.
+	 * @param string $mailAddress The email address to set for the user.
+	 * @param string $quota The quota to set for the user (in megabytes).
+	 *
+	 * @return void
+	 */
+	public function setAccountDataLocally(string $uid, string $mailAddress, string $quota): void {
+		
+		$user = $this->getUser($uid);
+		if (is_null($user)) {
+			$this->logger->error('User not found');
+			return;
+		}
+		
+		// Set the email address for the user
+		$user->setEMailAddress($mailAddress);
+		
+		// Format and set the quota for the user (in megabytes)
+		$quota = strval($quota) . ' MB';
+		$user->setQuota($quota);
+	}
 }
diff --git a/package-lock.json b/package-lock.json
index 5077e57f..6a1bd3d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,8 @@
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/router": "^2.0.0",
 				"@nextcloud/vue": "^5.4.0",
-				"vue": "^2.7.0"
+				"vue": "^2.7.0",
+				"vue-password-strength-meter": "^1.7.2"
 			},
 			"devDependencies": {
 				"@nextcloud/babel-config": "^1.0.0",
@@ -11137,6 +11138,18 @@
 			"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
 			"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
 		},
+		"node_modules/vue-password-strength-meter": {
+			"version": "1.7.2",
+			"resolved": "https://registry.npmjs.org/vue-password-strength-meter/-/vue-password-strength-meter-1.7.2.tgz",
+			"integrity": "sha512-S17DsEbXciTcI0fKq1PXia7i3COM/AJOT7os8AVyGxglc5ho1EBssE+ogDa5cFh6Rn8pPgqfVCt/KBcNpgPBiA==",
+			"engines": {
+				"node": ">= 4.0.0",
+				"npm": ">= 3.0.0"
+			},
+			"peerDependencies": {
+				"zxcvbn": "^4.4.2"
+			}
+		},
 		"node_modules/vue-resize": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
@@ -11796,6 +11809,12 @@
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
+		},
+		"node_modules/zxcvbn": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+			"integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==",
+			"peer": true
 		}
 	},
 	"dependencies": {
@@ -20246,6 +20265,12 @@
 			"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
 			"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
 		},
+		"vue-password-strength-meter": {
+			"version": "1.7.2",
+			"resolved": "https://registry.npmjs.org/vue-password-strength-meter/-/vue-password-strength-meter-1.7.2.tgz",
+			"integrity": "sha512-S17DsEbXciTcI0fKq1PXia7i3COM/AJOT7os8AVyGxglc5ho1EBssE+ogDa5cFh6Rn8pPgqfVCt/KBcNpgPBiA==",
+			"requires": {}
+		},
 		"vue-resize": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
@@ -20724,6 +20749,12 @@
 			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
 			"peer": true
+		},
+		"zxcvbn": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+			"integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==",
+			"peer": true
 		}
 	}
 }
diff --git a/package.json b/package.json
index 83b8a14f..74dc503c 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
 	"private": true,
 	"scripts": {
 		"build": "NODE_ENV=production webpack --progress",
-    	"dev": "NODE_ENV=development webpack --progress",
-    	"watch": "NODE_ENV=development webpack --progress --watch",
+		"dev": "NODE_ENV=development webpack --progress",
+		"watch": "NODE_ENV=development webpack --progress --watch",
 		"lint": "eslint --ext .js,.vue src",
 		"lint:fix": "eslint --ext .js,.vue src --fix",
 		"stylelint": "stylelint {src,css}/**/{*.scss,*.css} --allow-empty-input",
@@ -23,7 +23,8 @@
 		"@nextcloud/l10n": "^1.6.0",
 		"@nextcloud/router": "^2.0.0",
 		"@nextcloud/vue": "^5.4.0",
-		"vue": "^2.7.0"
+		"vue": "^2.7.0",
+		"vue-password-strength-meter": "^1.7.2"
 	},
 	"browserslist": [
 		"extends @nextcloud/browserslist-config"
diff --git a/src/Signup.vue b/src/Signup.vue
new file mode 100644
index 00000000..bfb682ea
--- /dev/null
+++ b/src/Signup.vue
@@ -0,0 +1,115 @@
+<template>
+	<div>
+		<section id="main" class="register-page">
+			<div id="registration">
+				<RegistrationForm v-if="showRegistrationForm" v-model="formData" @form-submitted="submitRegistrationForm" />
+				<CaptchaForm v-if="showCaptchaForm" v-model="formData" @form-submitted="submitCaptchaForm" />
+				<RecoveryEmailForm v-if="showRecoveryEmailForm" v-model="formData" @form-submitted="submitRecoveryEmailForm" />
+				<SuccessSection v-if="showSuccessSection" v-model="formData" />
+			</div>
+		</section>
+	</div>
+</template>
+
+<script>
+import Axios from '@nextcloud/axios'
+import { showSuccess, showError } from '@nextcloud/dialogs'
+import { generateUrl } from '@nextcloud/router'
+import RegistrationForm from './signup/RegistrationForm.vue'
+import CaptchaForm from './signup/CaptchaForm.vue'
+import RecoveryEmailForm from './signup/RecoveryEmailForm.vue'
+import SuccessSection from './signup/SuccessSection.vue'
+
+const APPLICATION_NAME = 'ecloud-accounts'
+
+export default {
+	name: 'Signup',
+	components: {
+		RegistrationForm,
+		CaptchaForm,
+		RecoveryEmailForm,
+		SuccessSection,
+	},
+	data() {
+		return {
+			formData: {
+				displayname: '',
+				username: '',
+				password: '',
+				repassword: '',
+				captchaInput: '',
+				email: '',
+				accepttns: false,
+				newsletter_eos: false,
+				newsletter_product: false,
+				selectedLanguage: 'en',
+			},
+			appName: APPLICATION_NAME,
+			showRegistrationForm: true,
+			showCaptchaForm: false,
+			showRecoveryEmailForm: false,
+			showSuccessSection: false,
+		}
+	},
+	methods: {
+		submitRegistrationForm(data) {
+			if (data.isFormValid) {
+				this.showRegistrationForm = false
+				this.showCaptchaForm = true
+				this.showRecoveryEmailForm = false
+			}
+		},
+		submitCaptchaForm(data) {
+			if (data.isFormValid) {
+				this.showRegistrationForm = false
+				this.showCaptchaForm = false
+				this.showRecoveryEmailForm = true
+			}
+		},
+		submitRecoveryEmailForm(data) {
+			if (data.isFormValid) {
+				const data = {
+					displayname: this.formData.displayname,
+					username: this.formData.username,
+					password: this.formData.password,
+					recoveryEmail: this.formData.email,
+					language: this.formData.selectedLanguage,
+				}
+				this.submitForm(data)
+			}
+		},
+		async submitForm(data) {
+			try {
+				const url = generateUrl(`/apps/${this.appName}/accounts/create`)
+				await Axios.post(url, data)
+
+				// If the execution reaches here, the response status is in the 2xx range
+				this.showRegistrationForm = false
+				this.showCaptchaForm = false
+				this.showRecoveryEmailForm = false
+				this.showSuccessSection = true
+			} catch (error) {
+				// Handle network errors and unexpected response structures here
+				const errorMessage = error.response ? error.response.data.message : error.message
+				this.showMessage(errorMessage, 'error')
+			}
+		},
+		showMessage(message, type) {
+			type === 'success' ? showSuccess(message) : showError(message)
+		},
+		getLocalizedText(text) {
+			return t(this.appName, text)
+		},
+	},
+}
+</script>
+<style scoped>
+section#main {
+	overflow-x: hidden;
+}
+@media screen and (max-width: 500px) {
+	#main {
+		padding: 0 1.5rem;
+	}
+}
+</style>
diff --git a/src/signup.js b/src/signup.js
new file mode 100644
index 00000000..591ad0f5
--- /dev/null
+++ b/src/signup.js
@@ -0,0 +1,8 @@
+import Vue from 'vue'
+import './common.js'
+import Signup from './Signup.vue'
+
+export default new Vue({
+	el: '#ecloud-accounts-signup',
+	render: h => h(Signup),
+})
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
new file mode 100644
index 00000000..e12a1e3c
--- /dev/null
+++ b/src/signup/CaptchaForm.vue
@@ -0,0 +1,246 @@
+<template>
+	<div id="captchaForm">
+		<form @submit.prevent="submitCaptchaForm">
+			<div id="fields">
+				<div class="display-flex">
+					<h1 id="registerHeading" class="has-text-centered subtitle is-3">
+						{{ t(appName,'Captcha Verification') }}
+					</h1>
+				</div>
+
+				<div class="field">
+					<div class="control">
+						<label>{{ t(appName,'Human Verification') }}<sup>*</sup></label>
+						<div class="captchaInput-group">
+							<input id="captchaInput"
+								v-model="formData.captchaInput"
+								name="captchaInput"
+								class="form-input"
+								:placeholder="t(appName,'Human Verification')"
+								type="text">
+						</div>
+						<p v-if="validation.isCaptchaInputEmpty" class="validation-warning">
+							{{ t(appName,'Human Verification is required.') }}
+						</p>
+						<p v-else-if="validation.isCaptchaInputNotMatched"
+							class="validation-warning">
+							{{ t(appName,'Human Verification code is not correct.') }}
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<div id="fields">
+				<div class="field np-captcha-section">
+					<div class="control np-captcha-container">
+						<img :src="captchaImageUrl" alt="Captcha Image">
+					</div>
+				</div>
+			</div>
+
+			<div id="groups" class="aliases-info">
+				<button :wide="true"
+					class="btn-primary"
+					type="primary">
+					<!-- @click="submitCaptchaForm" -->
+					{{ t(appName,'Verify') }}
+				</button>
+			</div>
+		</form>
+	</div>
+</template>
+
+<script>
+import Axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+import { showSuccess, showError } from '@nextcloud/dialogs'
+
+const APPLICATION_NAME = 'ecloud-accounts'
+export default {
+	props: {
+		value: Object,
+	},
+	data() {
+		return {
+			appName: APPLICATION_NAME,
+			validation: {
+				isCaptchaInputEmpty: false,
+				isCaptchaInputNotMatched: false,
+			},
+			captchaImageUrl: generateUrl(`/apps/${APPLICATION_NAME}/accounts/captcha`),
+		}
+	},
+	computed: {
+		formData: {
+			get() {
+				return this.value
+			},
+			set(formData) {
+				this.$emit('input', formData)
+			},
+		},
+	},
+	methods: {
+		async checkAnswer() {
+			this.validation.isCaptchaInputNotMatched = false
+
+			try {
+				const data = {
+					captchaInput: this.formData.captchaInput,
+				}
+				const url = generateUrl(`/apps/${this.appName}/accounts/verify_captcha`)
+				await Axios.post(url, data)
+				const isFormValid = true
+				this.$emit('form-submitted', { isFormValid })
+			} catch (error) {
+				this.validation.isCaptchaInputNotMatched = true
+			}
+		},
+		submitCaptchaForm() {
+			this.validation.isCaptchaInputEmpty = this.formData.captchaInput === ''
+			if (!this.validation.isCaptchaInputEmpty) {
+				this.checkAnswer()
+			}
+		},
+		showMessage(message, type) {
+			type === 'success' ? showSuccess(message) : showError(message)
+		},
+	},
+}
+</script>
+<style scoped>
+.display-flex {
+	display: flex;
+	justify-content: space-between;
+}
+
+/** mobile font sizes **/
+@media screen and (max-width: 650px) {
+	#fields .field .control input {
+		padding-left: 2%;
+		padding-right: 2%;
+	}
+}
+
+@media screen and (max-width: 768px) {
+	#registerHeading {
+		font-size: 1.5em;
+	}
+	#fields {
+		background-color: white;
+	}
+	#fields .field {
+		font-size: 1.0em;
+	}
+	#fields .field .control {
+		text-align: left;
+	}
+	#fields .field .control input {
+		font-size: 1.0em;
+		line-height: 1.0em;
+	}
+	#fields p {
+		font-size: 1.0em;
+	}
+	input {
+		font-size: 1.0em;
+		line-height: 1.0em;
+	}
+}
+#fields {
+	margin: 10px;
+	background-color: white;
+}
+#fields .control {
+	text-align: left;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+#fields input {
+	background-color: var(--color-secondary-element);
+	margin-bottom: 0;
+	color: rgba(0, 0, 0, 0.8);
+	display: block;
+	width: 100%;
+	font-size: 16px;
+	line-height: 1.3em;
+	transition: all 0.5s linear;
+	border: 1px solid #E6E8E9;
+	border-radius: 8px;
+	padding: 10px 20px;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+#fields .field {
+	font-size: 1.3em;
+}
+#fields p {
+	font-size: 15px;
+}
+#captcha_img {
+	font-size: 12px;
+	width: 100%;
+}
+#registerHeading {
+	margin-bottom: 10%;
+	font-size: 24px;
+	text-align: left !important;
+	font-weight: 500;
+}
+#currentLangImg {
+	border-radius: 50%;
+	margin: 0 auto;
+	border: 0.1em transparent black;
+	height: 24px;
+	width: 24px;
+	max-width: none;
+}
+#submitButton:hover {
+	opacity: 0.9;
+}
+#fields label {
+	color: #333333;
+	font-size: 16px;
+	font-weight: 900;
+}
+sup {
+	color: #ff0000;
+	font-weight: 500;
+	font-size: 14px;
+	padding-left: 3px;
+}
+.validation-warning{
+	color: #ff0000;
+    padding-left: 5px;
+    font-weight: 500;
+    display: flex;
+    flex-direction: row;
+}
+p.validation-warning:before {
+    content: "\00d7";
+    display: inline-block;
+    font-size: 30px;
+    margin: 0;
+    padding-right: 5px;
+}
+.btn-primary {
+	width: 95%;
+	background-color: var(--color-primary);
+	color: white;
+	border-color: var(--color-primary);
+	font-size: large;
+}
+@media screen and (max-width: 500px) {
+	#main {
+		padding: 0 1.5rem;
+	}
+	#registerHeading {
+		font-size: 18px;
+	}
+}
+.np-captcha-section {
+	display: flex;
+	width: fit-content;
+}
+
+</style>
diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue
new file mode 100644
index 00000000..c0377db4
--- /dev/null
+++ b/src/signup/RecoveryEmailForm.vue
@@ -0,0 +1,270 @@
+<template>
+	<div id="recoveryEmailForm">
+		<div>
+			<h1 class="has-text-centered subtitle is-3">
+				{{ t(appName,'For security reasons you need to set a recovery address for your Murena Cloud account.') }}
+			</h1>
+			<h1 class="has-text-centered subtitle is-3">
+				{{ t(appName,'As long as you don\'t, you\'ll have limited access to your account.') }}
+			</h1>
+		</div>
+
+		<div id="fields">
+			<div class="field">
+				<div class="control">
+					<label>{{ t(appName,'Recovery Email') }}</label>
+					<input id="email"
+						v-model="formData.email"
+						name="email"
+						type="email"
+						class="form-input"
+						:placeholder="t(appName,'Recovery Email')"
+						@input="validateForm(['email'])">
+					<p v-if="validation.isEmailEmpty" class="validation-warning">
+						{{ t(appName,'Recovery Email is required.') }}
+					</p>
+				</div>
+			</div>
+		</div>
+
+		<div id="groups" class="aliases-info display-flex">
+			<button :wide="true"
+				class="btn-default w-50"
+				type="primary"
+				@click.prevent="submitRecoveryEmailForm(false)">
+				{{ t(appName,'Later') }}
+			</button>
+			<button :wide="true"
+				class="btn-primary w-50"
+				type="primary"
+				@click.prevent="submitRecoveryEmailForm(true)">
+				{{ t(appName,'Set my recovery email address') }}
+			</button>
+		</div>
+	</div>
+</template>
+
+<script>
+const APPLICATION_NAME = 'ecloud-accounts'
+export default {
+	props: {
+		value: Object,
+	},
+	data() {
+		return {
+			appName: APPLICATION_NAME,
+			validation: {
+				isEmailEmpty: false,
+			},
+		}
+	},
+	computed: {
+		formData: {
+			get() {
+				return this.value
+			},
+			set(formData) {
+				this.$emit('input', formData)
+			},
+		},
+	},
+	methods: {
+		validateForm(fieldsToValidate) {
+			fieldsToValidate.forEach(field => {
+				this.validation[`is${field.charAt(0).toUpperCase() + field.slice(1)}Empty`] = this.formData[field] === ''
+			})
+		},
+		submitRecoveryEmailForm(setrecoveryemail) {
+			let isFormValid = true
+			if (setrecoveryemail) {
+				this.validateForm(['email'])
+				isFormValid = Object.values(this.validation).every(value => !value)
+				this.$emit('form-submitted', { isFormValid })
+			} else {
+				this.formData.email = ''
+				this.$emit('form-submitted', { isFormValid })
+			}
+		},
+	},
+}
+</script>
+<style scoped>
+.display-flex {
+	display: flex;
+	justify-content: space-between;
+}
+
+/** mobile font sizes **/
+@media screen and (max-width: 650px) {
+	#fields .field .control input {
+		padding-left: 2%;
+		padding-right: 2%;
+	}
+}
+
+@media screen and (max-width: 768px) {
+	#successMessages {
+		margin-left: 5%;
+		margin-right: 5%;
+	}
+
+	#success h1 {
+		font-size: 1.5em;
+	}
+
+	#inviteHeader,
+	#registerHeading {
+		font-size: 1.5em;
+	}
+
+	#fields {
+		background-color: white;
+	}
+
+	#fields .field {
+		font-size: 1.0em;
+	}
+
+	#fields .field .control {
+		text-align: left;
+	}
+
+	#fields .field .control input {
+		font-size: 1.0em;
+		line-height: 1.0em;
+	}
+
+	#fields p {
+		font-size: 1.0em;
+	}
+
+	input {
+		font-size: 1.0em;
+		line-height: 1.0em;
+	}
+}
+
+#fields {
+	margin: 10px;
+}
+
+#fields .control {
+	text-align: left;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#fields input#username,
+#fields input#new-password,
+#fields input#repassword {
+	width: 50%;
+}
+
+#fields input,
+#fields input[type="password"] {
+	background-color: var(--color-secondary-element);
+	margin-bottom: 0;
+	color: rgba(0, 0, 0, 0.8);
+	display: block;
+	width: 100%;
+	font-size: 16px;
+	line-height: 1.3em;
+	transition: all 0.5s linear;
+	border: 1px solid #E6E8E9;
+	border-radius: 8px;
+	padding: 10px 20px;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#fields {
+	background-color: white;
+}
+
+#fields .field {
+	font-size: 1.3em;
+}
+
+#fields p {
+	font-size: 15px;
+}
+
+#inviteHeader,
+#registerHeading {
+	margin-bottom: 10%;
+	font-size: 24px;
+	text-align: left !important;
+	font-weight: 500;
+}
+
+#currentLangImg {
+	border-radius: 50%;
+	margin: 0 auto;
+	border: 0.1em transparent black;
+	height: 24px;
+	width: 24px;
+	max-width: none;
+}
+
+#submitButton:hover {
+	opacity: 0.9;
+}
+
+#fields label {
+	color: #333333;
+	font-size: 16px;
+	font-weight: 900;
+}
+
+sup {
+	color: #ff0000;
+	font-weight: 500;
+	font-size: 14px;
+	padding-left: 3px;
+}
+
+#tos_div label {
+	line-height: 1.5rem;
+}
+
+.validation-warning{
+	color: #ff0000;
+    padding-left: 5px;
+    font-weight: 500;
+    display: flex;
+    flex-direction: row;
+}
+p.validation-warning:before {
+    content: "\00d7";
+    display: inline-block;
+    font-size: 30px;
+    margin: 0;
+    padding-right: 5px;
+}
+.btn-primary {
+	width: 95%;
+	background-color: var(--color-primary);
+	color: white;
+	border-color: var(--color-primary);
+	font-size: large;
+}
+
+.btn-default{
+	width: 95%;
+	background-color: var(--color-warning);
+	color: white;
+	border-color: var(--color-warning);
+	font-size: large;
+}
+
+@media screen and (max-width: 500px) {
+	#main {
+		padding: 0 1.5rem;
+	}
+
+	#inviteHeader,
+	#registerHeading {
+		font-size: 18px;
+	}
+}
+</style>
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
new file mode 100644
index 00000000..38faebc2
--- /dev/null
+++ b/src/signup/RegistrationForm.vue
@@ -0,0 +1,531 @@
+<template>
+	<div id="registrationForm">
+		<form @submit.prevent="submitRegistrationForm">
+			<div class="display-flex">
+				<h1 id="registerHeading" class="has-text-centered subtitle is-3">
+					{{ t(appName,'Create Murena Account') }}
+				</h1>
+				<div class="grid">
+					<select v-model="formData.selectedLanguage" class="padding-0" @change="onLanguageChange">
+						<option v-for="language in languages" :key="language.code" :value="language.code">
+							{{ t(appName,language.name) }}
+						</option>
+					</select>
+				</div>
+			</div>
+			<div id="fields-displayname" class="fields">
+				<div class="field">
+					<div class="control">
+						<label>{{ t(appName,'Display name') }}<sup>*</sup></label>
+						<input id="displayname"
+							v-model="formData.displayname"
+							name="displayname"
+							type="text"
+							class="form-input"
+							:placeholder="t(appName,'Your name as shown to others')"
+							@input="validateForm(['displayname'])">
+						<p v-if="validation.isDisplaynameEmpty" class="validation-warning">
+							{{ t(appName,'Display name is required.') }}
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<div id="fields-username" class="fields">
+				<div class="field">
+					<div class="control">
+						<label>{{ t(appName,'Username') }}<sup>*</sup></label>
+						<div class="username-group">
+							<input id="username"
+								v-model="formData.username"
+								name="username"
+								class="form-input"
+								:placeholder="t(appName,'Username')"
+								type="text"
+								@input="validateForm(['username'])">
+							<div id="username-domain-div" class="pad-left-5">
+								@{{ domain }}
+							</div>
+						</div>
+						<p v-if="validation.isUsernameEmpty" class="validation-warning">
+							{{ t(appName,'Username is required.') }}
+						</p>
+						<p v-else-if="validation.isUsernameNotValid" class="validation-warning">
+							{{ t(appName,usernameValidationMessage) }}
+						</p>
+						<p v-else-if="isUsernameAvailable" class="validation-success">
+							{{ t(appName,'Available!') }}
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<div id="fields-password" class="fields">
+				<div class="field">
+					<div class="control">
+						<label>{{ t(appName,'Enter Password') }}<sup>*</sup></label>
+						<div class="password-group">
+							<Password id="password"
+								v-model="formData.password"
+								:secure-length="7"
+								:toggle="false"
+								:badge="false"
+								type="password"
+								name="password"
+								:default-class="form - input"
+								:placeholder="t(appName,'Password')"
+								@input="validateForm(['password'])" />
+							<input id="repassword"
+								v-model="formData.repassword"
+								type="password"
+								name="repassword"
+								class="form-input"
+								:placeholder="t(appName,'Confirm')"
+								@input="validateForm(['repassword'])">
+						</div>
+						<p v-if="validation.isPasswordEmpty" class="validation-warning">
+							{{ t(appName,'Password is required.') }}
+						</p>
+						<p v-if="validation.isRepasswordEmpty" class="validation-warning">
+							{{ t(appName,'Confirm password is required.') }}
+						</p>
+						<p v-for="(error, index) in passwordErrors"
+							:key="index"
+							class="validation-warning">
+							{{ error }}
+						</p>
+						<p v-if="!validation.isPasswordEmpty && !validation.isRepasswordEmpty && validation.isRePasswordMatched"
+							class="validation-warning">
+							{{ t(appName,'The confirm password does not match the password.') }}
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<div id="fields-accepttns" class="fields">
+				<div class="field">
+					<div class="control">
+						<span class="action-checkbox">
+							<input id="action-tns"
+								v-model="formData.accepttns"
+								type="checkbox"
+								class="checkbox action-checkbox__checkbox focusable">
+							<label for="action-tns" class="action-checkbox__label" v-html="t(appName,'I have read and accept the <a href=\'http://murena.io/apps/terms_of_service/en/termsandconditions\' target=\'_blank\'>Terms of Service</a>.')" />
+						</span>
+
+						<p v-if="validation.isAccepttnsEmpty" class="validation-warning">
+							{{ t(appName,'You must read and accept the Terms of Service to create your account.') }}
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<div id="fields-newsletter_eos" class="fields">
+				<div class="field">
+					<div class="control">
+						<span class="action-checkbox">
+							<input id="action-newsletter_eos"
+								v-model="formData.newsletter_eos"
+								type="checkbox"
+								class="checkbox action-checkbox__checkbox focusable">
+							<label for="action-newsletter_eos" class="action-checkbox__label">{{ t(appName,'I want to receive news about /e/OS') }}</label>
+						</span>
+					</div>
+				</div>
+			</div>
+
+			<div id="fields-newsletter_product" class="fields">
+				<div class="field">
+					<div class="control">
+						<span class="action-checkbox">
+							<input id="action-newsletter_product"
+								v-model="formData.newsletter_product"
+								type="checkbox"
+								class="checkbox action-checkbox__checkbox focusable">
+							<label for="action-newsletter_product" class="action-checkbox__label">{{ t(appName,'I want to receive news about Murena products and promotions') }}</label>
+						</span>
+					</div>
+				</div>
+			</div>
+			<div id="groups" class="aliases-info">
+				<button :wide="true"
+					class="btn-primary"
+					type="primary">
+					{{ t(appName,'Create My Account') }}
+				</button>
+			</div>
+		</form>
+	</div>
+</template>
+
+<script>
+import Axios from '@nextcloud/axios'
+import Password from 'vue-password-strength-meter'
+import { generateUrl } from '@nextcloud/router'
+
+const APPLICATION_NAME = 'ecloud-accounts'
+
+export default {
+	components: {
+		Password,
+	},
+	props: {
+		value: Object,
+	},
+	data() {
+		return {
+			appName: APPLICATION_NAME,
+			usernameValidationMessage: '',
+			domain: window.location.host,
+			validation: {
+				isDisplaynameEmpty: false,
+				isUsernameEmpty: false,
+				isUsernameNotValid: false,
+				isPasswordEmpty: false,
+				isPasswordNotValid: false,
+				isRepasswordEmpty: false,
+				isRePasswordMatched: false,
+				isAccepttnsEmpty: false,
+			},
+			languages: [
+				{ code: 'en', name: 'English' },
+				{ code: 'de', name: 'German' },
+				{ code: 'fr', name: 'French' },
+				{ code: 'it', name: 'Italian' },
+				{ code: 'es', name: 'Spanish' },
+			],
+			passwordErrors: [],
+			passwordRules: [
+				{ message: 'At least 6 characters.', regex: /.{6,}/ },
+				{ message: 'Lowercase letters: a-z.', regex: /[a-z]+/ },
+				{ message: 'Uppercase letters: a-z.', regex: /[A-Z]+/ },
+				{ message: 'One number required.', regex: /[0-9]+/ },
+			],
+			isUsernameAvailable: false,
+		}
+	},
+	computed: {
+		formData: {
+			get() {
+				return this.value
+			},
+			set(formData) {
+				this.$emit('input', formData)
+			},
+		},
+	},
+	created() {
+		const currentURL = window.location.href
+		const urlSegments = currentURL.split('/')
+		this.formData.selectedLanguage = urlSegments[urlSegments.length - 2]
+	},
+	methods: {
+		validateForm(fieldsToValidate) {
+			fieldsToValidate.forEach(field => {
+				this.validation[`is${field.charAt(0).toUpperCase() + field.slice(1)}Empty`] = this.formData[field] === ''
+			})
+			if (fieldsToValidate.includes('password')) {
+				this.passwordValidation()
+			}
+			if (fieldsToValidate.includes('repassword')) {
+				this.validation.isRePasswordMatched = this.formData.repassword !== this.formData.password
+			}
+			if (fieldsToValidate.includes('termsandservices')) {
+				this.validation.isAccepttnsEmpty = !this.formData.accepttns
+			}
+			if (fieldsToValidate.includes('username')) {
+				this.validateUsername()
+			}
+		},
+		async passwordValidation() {
+			this.passwordErrors = []
+			this.validation.isPasswordNotValid = false
+
+			if (this.formData.password) {
+				let isValid = true
+				for (const condition of this.passwordRules) {
+					if (!condition.regex.test(this.formData.password)) {
+						this.passwordErrors.push(condition.message)
+						isValid = false // Set flag to false if the password fails any condition
+					}
+				}
+
+				this.validation.isPasswordNotValid = !isValid
+			}
+		},
+		async validateUsername() {
+			this.validation.isUsernameNotValid = false
+			this.usernameValidationMessage = ''
+			this.isUsernameAvailable = false
+			const usernamePattern = /^[a-zA-Z0-9_-]+$/
+			const minCharacterCount = 3
+			const isValidUsername = usernamePattern.test(this.formData.username)
+			const isEnoughCharacters = this.formData.username.length >= minCharacterCount
+
+			if (!isValidUsername) {
+				this.usernameValidationMessage = t(this.appName, 'Username must consist of letters, numbers, hyphens, and underscores only.')
+				this.validation.isUsernameNotValid = true
+			} else if (!isEnoughCharacters) {
+				this.usernameValidationMessage = t(this.appName, 'Username must be at least 3 characters long.')
+				this.validation.isUsernameNotValid = true
+			} else {
+				this.checkUsername()
+			}
+		},
+
+		async checkUsername() {
+			const data = {
+				username: this.formData.username,
+			}
+			const url = generateUrl(`/apps/${this.appName}/accounts/check_username_available`)
+
+			try {
+				await Axios.post(url, data)
+				this.isUsernameAvailable = true
+			} catch (error) {
+				this.validation.isUsernameNotValid = true
+				if (error.response && error.response.status === 400) {
+					this.usernameValidationMessage = t(this.appName, 'Username is already taken.')
+				} else {
+					this.usernameValidationMessage = t(this.appName, 'Something went wrong.')
+				}
+			}
+		},
+		submitRegistrationForm() {
+			this.validateForm(['displayname', 'username', 'password', 'repassword', 'termsandservices'])
+
+			const isFormValid = Object.values(this.validation).every(value => !value)
+
+			if (isFormValid) {
+				this.$emit('form-submitted', { isFormValid })
+			}
+		},
+		onLanguageChange() {
+			window.location.href = window.location.origin + '/apps/' + APPLICATION_NAME + '/accounts/' + this.formData.selectedLanguage + '/signup'
+		},
+	},
+}
+</script>
+
+<style scoped>
+#registrationForm{
+	width: 90%;
+}
+.display-flex {
+	display: flex;
+	justify-content: space-between;
+}
+.padding-0 {
+	padding: 0;
+}
+.fields input[type='checkbox'].checkbox + label:before{
+	height: 15px;
+    width: 15px;
+	margin-right: 10px;
+}
+.fields {
+	margin: 10px;
+}
+.fields .control {
+	text-align: left;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+.fields input#username,
+.fields input#new-password,
+.fields input#repassword {
+	width: 45%;
+}
+.fields input,
+.fields input[type="password"] {
+	background-color: var(--color-secondary-element);
+	margin-bottom: 0;
+	color: rgba(0, 0, 0, 0.8);
+	display: block;
+	width: 100%;
+	font-size: 16px;
+	line-height: 1.3em;
+	transition: all 0.5s linear;
+	border: 1px solid #E6E8E9;
+	border-radius: 8px;
+	padding: 10px 20px;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+.username-group {
+	display: flex;
+}
+#username-domain-div {
+	display: flex;
+	align-items: center;
+}
+.fields {
+	background-color: white;
+}
+.fields .field {
+	font-size: 1.3em;
+}
+.fields p {
+	font-size: 15px;
+}
+#captcha_img {
+	font-size: 12px;
+	width: 100%;
+}
+.password-group {
+    display: flex;
+}
+.password-group .Password{
+	flex-grow: 1;
+    flex-basis: 0;
+	max-width: unset;
+	margin-top: 10px;
+    margin-bottom: 10px;
+	margin-right: 10px;
+}
+.password-group > input
+{
+    width: 90%;
+    border: 1px solid #E6E8E9;
+	padding: 10px 20px;
+}
+#inviteHeader,
+#registerHeading {
+	margin-bottom: 10%;
+	font-size: 24px;
+	text-align: left !important;
+	font-weight: 500;
+}
+input#password {
+    height: 60px !important;
+    margin-top: 0 !important;
+}
+#currentLangImg {
+	border-radius: 50%;
+	margin: 0 auto;
+	border: 0.1em transparent black;
+	height: 24px;
+	width: 24px;
+	max-width: none;
+}
+#submitButton:hover {
+	opacity: 0.9;
+}
+.fields label {
+	color: #333333;
+	font-size: 16px;
+	font-weight: 900;
+}
+sup {
+	color: #ff0000;
+	font-weight: 500;
+	font-size: 14px;
+	padding-left: 3px;
+}
+.validation-error {
+	background: #ff0000;
+    color: white;
+    padding: 5px 10px;
+    font-weight: 500;
+    margin: 5px 0;
+    border-radius: 5px;
+    min-width: 70%;
+    width: fit-content;
+    display: flex;
+    flex-direction: row;
+}
+p.validation-error:before {
+    content: "\00d7";
+    display: inline-block;
+    font-size: 30px;
+    margin: 0;
+    padding-right: 5px;
+}
+.validation-warning{
+	color: #ff0000;
+    padding-left: 5px;
+    font-weight: 500;
+    display: flex;
+    flex-direction: row;
+}
+p.validation-warning:before {
+    content: "\00d7";
+    display: inline-block;
+    font-size: 30px;
+    margin: 0;
+    padding-right: 5px;
+}
+.validation-success{
+	color: green;
+    padding-left: 5px;
+    font-weight: 500;
+    display: flex;
+    flex-direction: row;
+}
+p.validation-success:before {
+    content: '\2713';
+    display: inline-block;
+    font-size: 20px;
+    margin: 0;
+    padding-right: 5px;
+}
+.btn-primary {
+	width: 95%;
+	background-color: var(--color-primary);
+	color: white;
+	border-color: var(--color-primary);
+	font-size: large;
+}
+/** mobile font sizes **/
+@media screen and (max-width: 650px) {
+	.fields .field .control input {
+		padding-left: 2%;
+		padding-right: 2%;
+	}
+}
+@media screen and (max-width: 768px) {
+	.password-group {
+		display: block;
+	}
+	#successMessages {
+		margin-left: 5%;
+		margin-right: 5%;
+	}
+	#success h1 {
+		font-size: 1.5em;
+	}
+	#inviteHeader,
+	#registerHeading {
+		font-size: 1.5em;
+	}
+	.fields {
+		background-color: white;
+	}
+	.fields .field {
+		font-size: 1.0em;
+	}
+	.fields .field .control {
+		text-align: left;
+	}
+	.fields .field .control input {
+		font-size: 1.0em;
+		line-height: 1.0em;
+	}
+	.fields p {
+		font-size: 1.0em;
+	}
+	input {
+		font-size: 1.0em;
+		line-height: 1.0em;
+	}
+}
+@media screen and (max-width: 500px) {
+	#main {
+		padding: 0 1.5rem;
+	}
+	#inviteHeader,
+	#registerHeading {
+		font-size: 18px;
+	}
+}
+</style>
diff --git a/src/signup/SuccessSection.vue b/src/signup/SuccessSection.vue
new file mode 100644
index 00000000..9414501d
--- /dev/null
+++ b/src/signup/SuccessSection.vue
@@ -0,0 +1,93 @@
+<template>
+	<div id="successSection">
+		<section id="success">
+			<div id="successMessages" class="notification isa_success has-text-centered">
+				<img :src="SuccessIcon">
+				<h3 class="success__title">
+					{{ t(appName,'Success!') }}
+				</h3>
+				<p id="accountCreatedMsg" class="font-16" v-html="accountCreatedMsg" />
+				<button :wide="true"
+					class="btn-primary w-50"
+					type="primary"
+					@click="useMyAccount">
+					{{ t(appName,'Use My Account Now') }}
+				</button>
+				<p id="moreDetailMsg" class="font-16" v-html="t(appName,'If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href=\'https://doc.e.foundation/support-topics/configure-email\'>this page</a>.')" />
+			</div>
+		</section>
+	</div>
+</template>
+<script>
+const APPLICATION_NAME = 'ecloud-accounts'
+export default {
+	props: {
+		value: Object,
+	},
+	data() {
+		return {
+			appName: APPLICATION_NAME,
+			accountCreatedMsg: '',
+			SuccessIcon: OC.generateUrl('/custom_apps/' + APPLICATION_NAME + '/img/success.svg'),
+		}
+	},
+	computed: {
+		formData: {
+			get() {
+				return this.value
+			},
+			set(formData) {
+				this.$emit('input', formData)
+			},
+		},
+	},
+	created() {
+		const domain = window.location.host
+		const accountCreatedMsg = t(this.appName, 'Your <b>__username__@__domain__</b> account was successfully created.')
+		this.accountCreatedMsg = accountCreatedMsg.replace('__username__', this.formData.username).replace('__domain__', domain)
+	},
+	methods: {
+		useMyAccount() {
+			window.location.href = window.location.origin
+		},
+
+	},
+}
+</script>
+
+<style scoped>
+
+@media screen and (max-width: 768px) {
+	#successMessages {
+		margin-left: 5%;
+		margin-right: 5%;
+	}
+
+	#success h1 {
+		font-size: 1.5em;
+	}
+}
+.btn-primary {
+	width: 95%;
+	background-color: var(--color-primary);
+	color: white;
+	border-color: var(--color-primary);
+	font-size: large;
+	margin: 10px 0;
+}
+
+.success__title {
+    font-family: 'Montserrat';
+    font-style: normal;
+    font-weight: 700;
+    font-size: 24px;
+    padding: 10px 0;
+    text-align: center;
+}
+.font-16{
+	font-size: 16px;
+}
+#moreDetailMsg, #accountCreatedMsg{
+	padding: 10px 0;
+}
+</style>
diff --git a/templates/signup.php b/templates/signup.php
new file mode 100644
index 00000000..95f0ce04
--- /dev/null
+++ b/templates/signup.php
@@ -0,0 +1,4 @@
+<?php
+script("ecloud-accounts", $appName . '-signup');
+?>
+<div id="ecloud-accounts-signup"></div>
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index b2b5fbb0..b6eaacba 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,5 +9,6 @@ module.exports = {
 		'delete-shop-account-setting': path.join(__dirname, 'src/delete-shop-account-setting.js'),
 		'delete-account-listeners': path.join(__dirname, 'src/delete-account-listeners.js'),
 		'beta-user-setting': path.join(__dirname, 'src/beta-user-setting.js'),
+		'signup': path.join(__dirname, 'src/signup.js')
 	},
 }
-- 
GitLab


From 193bee43b03eaec662c87f6ee527f68524014edf Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 5 Dec 2023 11:14:49 +0000
Subject: [PATCH 052/185] Lang as query param

---
 lib/Controller/AccountController.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 505831be..9bbebb5f 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -30,6 +30,9 @@ class AccountController extends Controller {
 	private $session;
 	private $userSession;
 	private $urlGenerator;
+
+	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
+
 	public function __construct(
 		$AppName,
 		IRequest $request,
@@ -62,6 +65,9 @@ class AccountController extends Controller {
 		if ($this->userSession->isLoggedIn()) {
 			return new RedirectResponse($this->urlGenerator->linkToDefaultPageUrl());
 		}
+
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $lang;
+
 		return new TemplateResponse(
 			Application::APP_ID,
 			'signup',
@@ -86,7 +92,7 @@ class AccountController extends Controller {
 		
 		$response = new DataResponse();
 		
-		if(!$this->session->get('captcha_verified')) {
+		if(!$this->session->get(self::CAPTCHA_VERIFIED_CHECK)) {
 			$response->setData(['message' => 'Captcha is not verified!', 'success' => false]);
 			$response->setStatus(400);
 			return $response;
@@ -132,6 +138,7 @@ class AccountController extends Controller {
 			$response->setData(['message' => $e->getMessage(), 'success' => false]);
 			$response->setStatus(500);
 		}
+		$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
 		return $response;
 	}
 	/**
@@ -204,7 +211,7 @@ class AccountController extends Controller {
 		$response->setStatus(400);
 		if ($captchaResult === $captchaInput) {
 			$this->session->remove('captcha_result');
-			$this->session->set('captcha_verified', true);
+			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
 			$response->setStatus(200);
 		}
 		return $response;
-- 
GitLab


From 862e3bceaba5e6e0fd613e124ca2cd2807b7f084 Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Fri, 15 Dec 2023 12:34:15 +0000
Subject: [PATCH 053/185] Signup Page: Feedback and bugs impacting user
 registration

---
 .gitlab-ci.yml                                |  2 +-
 appinfo/routes.php                            |  3 +-
 css/ecloud-accounts-userregistration.css      | 46 +++++++++++++++++++
 img/expand_more.svg                           |  3 ++
 l10n/de.js                                    |  3 +-
 l10n/de.json                                  |  3 +-
 l10n/en.js                                    |  6 +--
 l10n/en.json                                  |  3 +-
 l10n/es.js                                    |  3 +-
 l10n/es.json                                  |  3 +-
 l10n/fr.js                                    |  3 +-
 l10n/fr.json                                  |  3 +-
 l10n/it.js                                    |  3 +-
 l10n/it.json                                  |  4 +-
 lib/AppInfo/Application.php                   |  3 ++
 lib/Controller/AccountController.php          |  3 +-
 lib/Controller/UserController.php             |  5 +-
 .../BeforeTemplateRenderedListener.php        | 19 ++++++--
 lib/Service/UserService.php                   |  4 ++
 src/signup/RegistrationForm.vue               | 43 ++++++++++-------
 20 files changed, 124 insertions(+), 41 deletions(-)
 create mode 100644 css/ecloud-accounts-userregistration.css
 create mode 100644 img/expand_more.svg

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68fe5ad2..c268fb41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-    TO_PACKAGE: 'appinfo l10n lib templates js img'
+    TO_PACKAGE: 'appinfo l10n lib templates js img css'
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 5eab965e..e89d7d76 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -25,7 +25,8 @@ return ['routes' => [
 		'url' => '/issue/submit', 'verb' => 'POST'
 	],
 	
-	['name' => 'account#index', 'url' => '/accounts/{lang}/signup', 'verb' => 'GET'],
+	['name' => 'account#index', 'url' => '/accounts/{lang}/signup', 'verb' => 'GET', 'postfix' => 'signwithlang'],
+	['name' => 'account#index', 'url' => '/accounts/signup', 'verb' => 'GET', 'postfix' => 'signwithoutlang'],
 	['name' => 'account#create', 'url' => '/accounts/create', 'verb' => 'POST'],
 	['name' => 'account#captcha', 'url' => '/accounts/captcha', 'verb' => 'GET'],
 	['name' => 'account#verify_captcha', 'url' => '/accounts/verify_captcha', 'verb' => 'POST'],
diff --git a/css/ecloud-accounts-userregistration.css b/css/ecloud-accounts-userregistration.css
new file mode 100644
index 00000000..895b680c
--- /dev/null
+++ b/css/ecloud-accounts-userregistration.css
@@ -0,0 +1,46 @@
+html {
+	background: var(--color-main-background);
+}
+
+#body-login .warning-messsage {
+	width: 100% !important;
+}
+
+#body-login .v-align {
+	align-items: flex-start !important;
+	justify-content: flex-start !important;
+}
+
+.v-align header {
+	width: 100% !important;
+	display: flex !important;
+	align-items: flex-start !important;
+	justify-content: flex-start !important;
+}
+
+#header {
+	padding-left: 5% !important;
+}
+
+.v-align main {
+	width: 50% !important;
+	margin: 0 auto;
+}
+
+.password-group #password {
+	height: 58px !important;
+}
+
+@media only screen and (max-width: 768px) {
+	.v-align main {
+		width: 100% !important;
+	}
+
+	#body-login .v-align {
+		padding: 5vh 0vh !important;
+	}
+}
+
+#fields-password .Password__strength-meter {
+	margin-bottom: 0;
+}
\ No newline at end of file
diff --git a/img/expand_more.svg b/img/expand_more.svg
new file mode 100644
index 00000000..5227f5d1
--- /dev/null
+++ b/img/expand_more.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.59 8.29501L12 12.875L7.41 8.29501L6 9.70501L12 15.705L18 9.70501L16.59 8.29501Z" fill="black"/>
+</svg>
diff --git a/l10n/de.js b/l10n/de.js
index a205f974..2c564a74 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -73,6 +73,7 @@ OC.L10N.register(
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ich habe die <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Nutzungsbedingungen</a> gelesen und akzeptiere diese.",
 		"Success!": "Erfolgreich!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='__supportURL__'>diese Seite</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='https://doc.e.foundation/support-topics/configure-email'>diese Seite</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 54c2e888..fdc003d3 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -71,7 +71,8 @@
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ich habe die <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Nutzungsbedingungen</a> gelesen und akzeptiere diese.",
 		"Success!": "Erfolgreich!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='__supportURL__'>diese Seite</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='https://doc.e.foundation/support-topics/configure-email'>diese Seite</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 3a55d272..9cb3afc8 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -76,8 +76,8 @@ OC.L10N.register(
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.",
 		"Success!": "Success!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.",
-		
-		"Recovery email address is already taken.": "Recovery email address is already taken."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.",
+		"Recovery email address is already taken.": "Recovery email address is already taken.",
+		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 5d15841a..eb5fac3a 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -73,7 +73,8 @@
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.",
 		"Success!": "Success!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index ea832b36..f4f64e8e 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -75,6 +75,7 @@ OC.L10N.register(
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "He leído y acepto las <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Condiciones del servicio</a>.",
 		"Success!": "¡Éxito!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Su cuenta <b>__username__@__domain__</b> se ha creado correctamente.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='__supportURL__'>esta página</a>.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='https://doc.e.foundation/support-topics/configure-email'>esta página</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index e5c3daa6..eee55840 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -74,7 +74,8 @@
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "He leído y acepto las <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Condiciones del servicio</a>.",
 		"Success!": "¡Éxito!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Su cuenta <b>__username__@__domain__</b> se ha creado correctamente.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='__supportURL__'>esta página</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='https://doc.e.foundation/support-topics/configure-email'>esta página</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 81fb0b81..dea43d8d 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -74,6 +74,7 @@ OC.L10N.register(
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "J'ai lu et j'accepte les <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Termes de service</a>.",
 		"Success!": "Succès !",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Votre compte <b>__username__@__domain__</b> a été créé avec succès.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='__supportURL__'>cette page</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='https://doc.e.foundation/support-topics/configure-email'>cette page</a>.",
+		"Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index a371d46d..e733fab1 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -73,7 +73,8 @@
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "J'ai lu et j'accepte les <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Termes de service</a>.",
 		"Success!": "Succès !",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Votre compte <b>__username__@__domain__</b> a été créé avec succès.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='__supportURL__'>cette page</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='https://doc.e.foundation/support-topics/configure-email'>cette page</a>.",
+		"Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 008a8d01..c0a1df64 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -74,6 +74,7 @@ OC.L10N.register(
 		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ho letto e accetto i <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Termini di servizio</a>.",
 		"Success!": "Successo!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "L'account <b>__username__@__domain__</b> è stato creato con successo.",
-		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='__supportURL__'>this page</a>.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare <a href='__supportURL__'>questa pagina</a>."
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare <a href='https://doc.e.foundation/support-topics/configure-email'>questa pagina</a>.",
+		"Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 2dcaf6c5..82634b23 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -68,7 +68,9 @@
 		"Human Verification is required.": "È necessaria la verifica umana.",
 		"Human Verification code is not correct.": "Il codice di verifica umano non è corretto.",
 		"Recovery Email is required.": "L'e-mail di recupero è necessaria.",
-		"You must read and accept the Terms of Service to create your account.": "Per creare il proprio account è necessario leggere e accettare i Termini di servizio."
+		"You must read and accept the Terms of Service to create your account.": "Per creare il proprio account è necessario leggere e accettare i Termini di servizio.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare <a href='https://doc.e.foundation/support-topics/configure-email'>questa pagina</a>.",
+		"Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 890b5355..b8070465 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
+use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
@@ -35,6 +36,7 @@ use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\UserChangedEvent;
@@ -47,6 +49,7 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
+		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 9bbebb5f..663bde76 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -75,6 +75,7 @@ class AccountController extends Controller {
 			TemplateResponse::RENDER_AS_GUEST
 		);
 	}
+	
 	/**
 	 * @NoAdminRequired
 	 * @PublicPage
@@ -126,7 +127,7 @@ class AccountController extends Controller {
 			$this->userService->setUserLanguage($username, $language);
 			
 			if($recoveryEmail !== '') {
-				$this->userService->setRecoveryEmail($username, $recoveryEmail);
+				$this->userService->setUnverifiedRecoveryEmail($username, $recoveryEmail);
 			}
 		
 			$this->userService->sendWelcomeEmail($displayname, $username, $userEmail, $language);
diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 1d0745d6..9871ba50 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -94,10 +94,7 @@ class UserController extends ApiController {
 		}
 		// $this->userService->sendWelcomeEmail($uid, $email);
 		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
-		$recoveryEmailUpdated = $this->userService->setRecoveryEmail($uid, $recoveryEmail);
-		if (!$recoveryEmailUpdated) {
-			return $this->getErrorResponse($response, 'error_setting_recovery', 400);
-		}
+		$this->userService->setRecoveryEmail($uid, $recoveryEmail);
 		$hmeAliasAdded = $this->userService->addHMEAliasInConfig($uid, $hmeAlias);
 		if (!$hmeAliasAdded) {
 			return $this->getErrorResponse($response, 'error_adding_hme_alias', 400);
diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
index 86b5f99b..adece9c3 100644
--- a/lib/Listeners/BeforeTemplateRenderedListener.php
+++ b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -4,14 +4,15 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Listeners;
 
-use \OCP\EventDispatcher\IEventListener;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUserSession;
+use OCP\Util;
 
 class BeforeTemplateRenderedListener implements IEventListener {
 	private $userSession;
@@ -20,18 +21,20 @@ class BeforeTemplateRenderedListener implements IEventListener {
 	private $session;
 	private $config;
 	private $appManager;
+	private Util $util;
 
 	private const SNAPPYMAIL_APP_ID = 'snappymail';
 	private const SNAPPYMAIL_URL = '/apps/snappymail/';
 	private const SNAPPYMAIL_AUTOLOGIN_PWD = '1';
 
-	public function __construct($appName, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, IAppManager $appManager) {
+	public function __construct($appName, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, IAppManager $appManager, Util $util) {
 		$this->appName = $appName;
 		$this->userSession = $userSession;
 		$this->request = $request;
 		$this->session = $session;
 		$this->config = $config;
 		$this->appManager = $appManager;
+		$this->util = $util;
 	}
 
 	public function handle(Event $event): void {
@@ -41,6 +44,12 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		if ($this->userSession->isLoggedIn() && $this->appManager->isEnabledForUser(self::SNAPPYMAIL_APP_ID) && strpos($this->request->getPathInfo(), self::SNAPPYMAIL_URL) !== false) {
 			$this->autoLoginWebmail();
 		}
+		$pathInfo = $this->request->getPathInfo();
+
+		if (strpos($pathInfo, '/apps/ecloud-accounts/accounts') !== false) {
+			$this->util->addStyle($this->appName, $this->appName . '-userregistration');
+		}
+
 	}
 
 
@@ -51,11 +60,11 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		}
 		$accountId = $this->getAccountId();
 		$actions = \RainLoop\Api::Actions();
-		
+
 		if (empty($accountId) || $actions->getMainAccountFromToken(false)) {
 			return;
 		}
-		
+
 		// Just send over '1' as password to trigger login as the plugin will set the correct access token
 		$password = self::SNAPPYMAIL_AUTOLOGIN_PWD; // As we cannot pass by reference to LoginProcess
 		$account = $actions->LoginProcess($accountId, $password, false);
@@ -65,7 +74,7 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		}
 	}
 
-	private function getAccountId() : string {
+	private function getAccountId(): string {
 		$username = $this->userSession->getUser()->getUID();
 		if ($this->config->getAppValue('snappymail', 'snappymail-autologin', false)) {
 			return $username;
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 56e156fe..f35b6e6e 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -95,6 +95,9 @@ class UserService {
 	public function setRecoveryEmail(string $uid, string $recoveryEmail): void {
 		$this->config->setUserValue($uid, 'email-recovery', 'recovery-email', $recoveryEmail);
 	}
+	public function setUnverifiedRecoveryEmail(string $uid, string $recoveryEmail): void {
+		$this->config->setUserValue($uid, 'email-recovery', 'unverified-recovery-email', $recoveryEmail);
+	}
 	public function setTOS(string $uid, bool $tosAccepted): void {
 		$this->config->setUserValue($uid, 'terms_of_service', 'tosAccepted', intval($tosAccepted));
 	}
@@ -197,6 +200,7 @@ class UserService {
 	public function setUserLanguage(string $username, string $language = 'en') {
 		$this->config->setUserValue($username, 'core', 'lang', $language);
 	}
+	
 	private function createSendGridEmail(string $fromEmail, string $fromName, string $username, string $displayname, string $userEmail, string $templateID) : \SendGrid\Mail\Mail {
 		$mainDomain = $this->getMainDomain();
 
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 38faebc2..3a5f091b 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -1,17 +1,17 @@
 <template>
 	<div id="registrationForm">
+		<div class="grid">
+			<select v-model="formData.selectedLanguage" class="padding-0 lang-select" @change="onLanguageChange">
+				<option v-for="language in languages" :key="language.code" :value="language.code">
+					{{ t(appName,language.name) }}
+				</option>
+			</select>
+		</div>
 		<form @submit.prevent="submitRegistrationForm">
 			<div class="display-flex">
 				<h1 id="registerHeading" class="has-text-centered subtitle is-3">
 					{{ t(appName,'Create Murena Account') }}
 				</h1>
-				<div class="grid">
-					<select v-model="formData.selectedLanguage" class="padding-0" @change="onLanguageChange">
-						<option v-for="language in languages" :key="language.code" :value="language.code">
-							{{ t(appName,language.name) }}
-						</option>
-					</select>
-				</div>
 			</div>
 			<div id="fields-displayname" class="fields">
 				<div class="field">
@@ -196,10 +196,7 @@ export default {
 			],
 			passwordErrors: [],
 			passwordRules: [
-				{ message: 'At least 6 characters.', regex: /.{6,}/ },
-				{ message: 'Lowercase letters: a-z.', regex: /[a-z]+/ },
-				{ message: 'Uppercase letters: a-z.', regex: /[A-Z]+/ },
-				{ message: 'One number required.', regex: /[0-9]+/ },
+				{ message: t(this.appName, 'Incorrect password length: Required length is 8 to 32'), regex: /.{8,32}/ },
 			],
 			isUsernameAvailable: false,
 		}
@@ -217,7 +214,10 @@ export default {
 	created() {
 		const currentURL = window.location.href
 		const urlSegments = currentURL.split('/')
-		this.formData.selectedLanguage = urlSegments[urlSegments.length - 2]
+		this.formData.selectedLanguage = 'en'
+		if (urlSegments.length === 8) {
+			this.formData.selectedLanguage = urlSegments[urlSegments.length - 2]
+		}
 	},
 	methods: {
 		validateForm(fieldsToValidate) {
@@ -268,8 +268,6 @@ export default {
 			} else if (!isEnoughCharacters) {
 				this.usernameValidationMessage = t(this.appName, 'Username must be at least 3 characters long.')
 				this.validation.isUsernameNotValid = true
-			} else {
-				this.checkUsername()
 			}
 		},
 
@@ -293,7 +291,7 @@ export default {
 		},
 		submitRegistrationForm() {
 			this.validateForm(['displayname', 'username', 'password', 'repassword', 'termsandservices'])
-
+			this.checkUsername()
 			const isFormValid = Object.values(this.validation).every(value => !value)
 
 			if (isFormValid) {
@@ -318,6 +316,17 @@ export default {
 .padding-0 {
 	padding: 0;
 }
+.lang-select {
+	font-size: 14px;
+	line-height:24px;
+	color: rgba(0, 0, 0, 0.6);
+	font-weight:400;
+	background: url("../../img/expand_more.svg") no-repeat right 8px center;
+	float: right;
+	position: absolute;
+	top: 67px;
+	right: 5%;
+}
 .fields input[type='checkbox'].checkbox + label:before{
 	height: 15px;
     width: 15px;
@@ -379,7 +388,7 @@ export default {
 	flex-grow: 1;
     flex-basis: 0;
 	max-width: unset;
-	margin-top: 10px;
+	margin-top: 5px;
     margin-bottom: 10px;
 	margin-right: 10px;
 }
@@ -391,7 +400,7 @@ export default {
 }
 #inviteHeader,
 #registerHeading {
-	margin-bottom: 10%;
+	margin-bottom: 12px;
 	font-size: 24px;
 	text-align: left !important;
 	font-weight: 500;
-- 
GitLab


From a3a3590d2570040811b77ffc9378eedd638ad283 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 18 Dec 2023 18:11:45 +0000
Subject: [PATCH 054/185] Dev/user api calls

---
 lib/Controller/AccountController.php | 36 +++++++++++++++---
 lib/Service/CaptchaService.php       | 13 ++++---
 lib/Service/CurlService.php          | 13 +++++++
 lib/Service/UserService.php          | 55 ++++++++++++++++++++++++++++
 src/signup/RegistrationForm.vue      |  4 +-
 5 files changed, 108 insertions(+), 13 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 663bde76..8f9c849b 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -30,7 +30,7 @@ class AccountController extends Controller {
 	private $session;
 	private $userSession;
 	private $urlGenerator;
-
+	private const SESSION_USERNAME_CHECK = 'username_check_passed';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
 
 	public function __construct(
@@ -99,6 +99,12 @@ class AccountController extends Controller {
 			return $response;
 		}
 
+		if (!$this->session->get(self::SESSION_USERNAME_CHECK)) {
+			$response->setData(['message' => 'Username is already taken.', 'success' => false]);
+			$response->setStatus(400);
+			return $response;
+		}
+
 		$inputData = [
 			'username' => ['value' => $username, 'maxLength' => 30],
 			'displayname' => ['value' => $displayname, 'maxLength' => 30],
@@ -139,7 +145,15 @@ class AccountController extends Controller {
 			$response->setData(['message' => $e->getMessage(), 'success' => false]);
 			$response->setStatus(500);
 		}
+
+		$this->session->remove(self::SESSION_USERNAME_CHECK);
 		$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
+
+		try {
+			$this->userService->addUsernameToCommonDataStore($username);
+		} catch (Exception $e) {
+			$this->logger->logException($e, ['app' => Application::APP_ID]);
+		}
 		return $response;
 	}
 	/**
@@ -176,9 +190,21 @@ class AccountController extends Controller {
 	public function checkUsernameAvailable(string $username) : DataResponse {
 		$response = new DataResponse();
 		$response->setStatus(400);
-		if (!$this->userService->userExists($username)) {
-			$response->setStatus(200);
+
+		if (empty($username)) {
+			return $response;
+		}
+
+		try {
+			if (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) {
+				$response->setStatus(200);
+				$this->session->set(self::SESSION_USERNAME_CHECK, true);
+			}
+		} catch (Exception $e) {
+			$this->logger->logException($e, ['app' => Application::APP_ID ]);
+			$response->setStatus(500);
 		}
+
 		return $response;
 	}
 
@@ -208,10 +234,10 @@ class AccountController extends Controller {
 	public function verifyCaptcha(string $captchaInput = '') : DataResponse {
 		$response = new DataResponse();
 		
-		$captchaResult = (string)$this->session->get('captcha_result', '');
+		$captchaResult = (string) $this->session->get(CaptchaService::CAPTCHA_RESULT_KEY, '');
 		$response->setStatus(400);
 		if ($captchaResult === $captchaInput) {
-			$this->session->remove('captcha_result');
+			$this->session->remove(CaptchaService::CAPTCHA_RESULT_KEY);
 			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
 			$response->setStatus(200);
 		}
diff --git a/lib/Service/CaptchaService.php b/lib/Service/CaptchaService.php
index 4bc4245d..1a0ea4b6 100644
--- a/lib/Service/CaptchaService.php
+++ b/lib/Service/CaptchaService.php
@@ -8,11 +8,12 @@ use OCP\ISession;
 
 class CaptchaService {
 	private $session;
-	public const WIDTH = 80;
-	public const HEIGHT = 40;
-	public const NUMBERS = '123456789';
-	public const SYMBOLS = '+-';
-	public const NOISE_LEVEL = 13;
+	private const WIDTH = 80;
+	private const HEIGHT = 40;
+	private const NUMBERS = '123456789';
+	private const SYMBOLS = '+-';
+	private const NOISE_LEVEL = 13;
+	public const CAPTCHA_RESULT_KEY = 'captcha_result';
 
 	public function __construct(ISession $session) {
 		$this->session = $session;
@@ -195,7 +196,7 @@ class CaptchaService {
 	 * @return void
 	 */
 	private function updateSession(float $captchaResult): void {
-		$this->session->set('captcha_result', $captchaResult);
+		$this->session->set(self::CAPTCHA_RESULT_KEY, $captchaResult);
 	}
 
 	
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index d7a477fc..d3b132d5 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -14,6 +14,8 @@ namespace OCA\EcloudAccounts\Service;
 use Exception;
 
 class CurlService {
+
+	private int $lastStatusCode = 0;
 	/**
 	 * GET alias for request method
 	 *
@@ -44,6 +46,14 @@ class CurlService {
 		return $this->request('DELETE', $url, $params, $headers, $userOptions);
 	}
 
+	/**
+	 * @return int
+	 */
+
+	public function getLastStatusCode() : int {
+		return $this->lastStatusCode;
+	}
+
 
 	/**
 	 * Curl run request
@@ -90,6 +100,9 @@ class CurlService {
 
 		$response = curl_exec($ch);
 
+		$this->lastStatusCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		
+
 		if ($errno = curl_errno($ch)) {
 			var_dump($errno);
 			$errorMessage = curl_strerror($errno);
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index f35b6e6e..dbda65c4 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -393,4 +393,59 @@ class UserService {
 		$quota = strval($quota) . ' MB';
 		$user->setQuota($quota);
 	}
+
+	public function isUsernameTaken(string $username) : bool {
+		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonApiVersion = $this->apiConfig['commonApiVersion'];
+
+		if (!isset($commonApiUrl) || empty($commonApiUrl)) {
+			return false;
+		}
+		$endpoint = $commonApiVersion . '/users/';
+		$url = $commonApiUrl . $endpoint . $username;
+
+		$token = $this->apiConfig['commonServiceToken'];
+		$headers = [
+			"Authorization: Bearer $token"
+		];
+
+		$this->curl->get($url, [], $headers);
+
+		$statusCode = $this->curl->getLastStatusCode();
+		if ($statusCode === 404) {
+			return false;
+		}
+
+		if ($statusCode === 200) {
+			return true;
+		}
+
+		throw new Exception("Error checking if username is taken at common source, status code: " . (string) $statusCode);
+	}
+
+	public function addUsernameToCommonDataStore(string $username) : void {
+		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonApiVersion = $this->apiConfig['commonApiVersion'];
+
+		if (!isset($commonApiUrl) || empty($commonApiUrl)) {
+			return;
+		}
+		$endpoint = $commonApiVersion . '/users/';
+		$url = $commonApiUrl . $endpoint ;
+		
+		$params = [
+			'username' => $username
+		];
+
+		$token = $this->apiConfig['commonServiceToken'];
+		$headers = [
+			"Authorization: Bearer $token"
+		];
+		
+		$this->curl->post($url, $params, $headers);
+
+		if ($this->curl->getLastStatusCode() !== 200) {
+			throw new Exception('Error adding username ' . $username . ' to common data store');
+		}
+	}
 }
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 3a5f091b..ff81f3d7 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -289,9 +289,9 @@ export default {
 				}
 			}
 		},
-		submitRegistrationForm() {
+		async submitRegistrationForm() {
 			this.validateForm(['displayname', 'username', 'password', 'repassword', 'termsandservices'])
-			this.checkUsername()
+			await this.checkUsername()
 			const isFormValid = Object.values(this.validation).every(value => !value)
 
 			if (isFormValid) {
-- 
GitLab


From e6abb638f2ec7c8b50339836fa3a152a4b3ca84a Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Tue, 26 Dec 2023 10:40:01 +0000
Subject: [PATCH 055/185] newsletter subscription

---
 lib/Controller/AccountController.php | 17 ++++--
 lib/Service/CurlService.php          |  8 ++-
 lib/Service/NewsLetterService.php    | 81 ++++++++++++++++++++++++++++
 src/Signup.vue                       |  6 ++-
 src/signup/RegistrationForm.vue      |  4 +-
 5 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 lib/Service/NewsLetterService.php

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 8f9c849b..88cb74b6 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -9,12 +9,14 @@ namespace OCA\EcloudAccounts\Controller;
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Service\CaptchaService;
+use OCA\EcloudAccounts\Service\NewsLetterService;
 use OCA\EcloudAccounts\Service\UserService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IURLGenerator;
@@ -25,11 +27,14 @@ class AccountController extends Controller {
 	protected $appName;
 	protected $request;
 	private $userService;
+	private $newsletterService;
 	private $captchaService;
 	protected $l10nFactory;
 	private $session;
 	private $userSession;
 	private $urlGenerator;
+	/** @var IConfig */
+	private IConfig $config;
 	private const SESSION_USERNAME_CHECK = 'username_check_passed';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
 
@@ -37,19 +42,23 @@ class AccountController extends Controller {
 		$AppName,
 		IRequest $request,
 		UserService $userService,
+		NewsLetterService $newsletterService,
 		CaptchaService $captchaService,
 		IFactory $l10nFactory,
 		IUserSession $userSession,
 		IURLGenerator $urlGenerator,
-		ISession $session
+		ISession $session,
+		IConfig $config
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
 		$this->userService = $userService;
+		$this->newsletterService = $newsletterService;
 		$this->captchaService = $captchaService;
 		$this->l10nFactory = $l10nFactory;
 		$this->session = $session;
 		$this->userSession = $userSession;
+		$this->config = $config;
 		$this->urlGenerator = $urlGenerator;
 	}
 
@@ -86,10 +95,12 @@ class AccountController extends Controller {
 	 * @param string $username         User's username
 	 * @param string $password         User's password
 	 * @param string $language         User's language preference
+	 * @param bool $newsletterEos     Users's subscribe to eos newsletter
+	 * @param bool $newsletterProduct Users's subscribe to murena product newsletter
 	 *
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
-	public function create(string $displayname = '', string $recoveryEmail = '', string $username = '', string $password = '', string $language = ''): DataResponse {
+	public function create(string $displayname = '', string $recoveryEmail = '', string $username = '', string $password = '', string $language = '', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse {
 		
 		$response = new DataResponse();
 		
@@ -125,12 +136,12 @@ class AccountController extends Controller {
 			$userEmail = $username.'@'.$mainDomain;
 
 			$newUserEntry = $this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
-			
 			$this->userService->setAccountDataLocally($username, $userEmail, $newUserEntry['quota']);
 			$this->userService->createHMEAlias($username, $userEmail);
 			$this->userService->createNewDomainAlias($username, $userEmail);
 			$this->userService->setTOS($username, true);
 			$this->userService->setUserLanguage($username, $language);
+			$this->newsletterService->setNewsletterSignup($newsletterEos, $newsletterProduct, $userEmail, $language);
 			
 			if($recoveryEmail !== '') {
 				$this->userService->setUnverifiedRecoveryEmail($username, $recoveryEmail);
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index d3b132d5..9cf95068 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -82,6 +82,13 @@ class CurlService {
 				break;
 			case 'POST':
 				$options[CURLOPT_POST] = true;
+				$jsonContent = in_array('Content-Type: application/json', $headers);
+				if ($jsonContent) {
+					$params = json_encode($params);
+					if (json_last_error() !== JSON_ERROR_NONE) {
+						throw new Exception('JSON encoding failed: ' . json_last_error_msg());
+					}
+				}
 				$options[CURLOPT_POSTFIELDS] = $params;
 				break;
 			case 'DELETE':
@@ -104,7 +111,6 @@ class CurlService {
 		
 
 		if ($errno = curl_errno($ch)) {
-			var_dump($errno);
 			$errorMessage = curl_strerror($errno);
 			throw new Exception("Curl error $errno - $errorMessage");
 		}
diff --git a/lib/Service/NewsLetterService.php b/lib/Service/NewsLetterService.php
new file mode 100644
index 00000000..110861c6
--- /dev/null
+++ b/lib/Service/NewsLetterService.php
@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Service;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+use Exception;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\IUserManager;
+
+class NewsLetterService {
+	/** @var IUserManager */
+	private $userManager;
+	/** @var IConfig */
+	private $config;
+	/** @var CurlService */
+	private $curl;
+	/** @var ILogger */
+	private $logger;
+
+	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger) {
+		$this->userManager = $userManager;
+		$this->config = $config;
+		$this->curl = $curlService;
+		$this->logger = $logger;
+	}
+
+	public function setNewsletterSignup(bool $newsletterEos, bool $newsletterProduct, string $userEmail, string $language): void {
+		try {
+			if ($newsletterEos || $newsletterProduct) {
+				$listIds = [];
+				$newsletterListIds = $this->config->getSystemValue('newsletter_list_ids');
+				if ($newsletterEos) {
+					$listIds[] = $newsletterListIds['eos'];
+				}
+
+				if ($newsletterProduct) {
+					$listIds[] = $newsletterListIds['product'];
+				}
+				
+				if (!empty($listIds)) {
+					
+					$this->signupForNewsletter($userEmail, $listIds, $language);
+					
+				}
+			}
+		} catch (Exception $e) {
+			$this->logger->error('Signup for newsletter failed: ' . $e->getMessage());
+		}
+	}
+
+	private function signupForNewsletter(string $userEmail, array $listIds, string $userLanguage): void {
+		$newsletterApiUrl = $this->config->getSystemValue('newsletter_base_url', '');
+
+		if (empty($newsletterApiUrl)) {
+			return;
+		}
+
+		$endpoint = '/api/signup';
+		$url = $newsletterApiUrl . $endpoint;
+
+		$params = [
+			'email' => $userEmail,
+			'list_ids' => $listIds,
+			'contact_language' => $userLanguage
+		];
+		$params_string = json_encode($params);
+		$headers = [
+			'Content-Type: application/json',
+			'Content-Length: ' . strlen($params_string)
+		];
+		$this->curl->post($url, $params, $headers);
+
+		if ($this->curl->getLastStatusCode() !== 200) {
+			throw new Exception('Error adding email ' . $userEmail . ' to newsletter app');
+		}
+	}
+}
diff --git a/src/Signup.vue b/src/Signup.vue
index bfb682ea..8be5e5cf 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -40,8 +40,8 @@ export default {
 				captchaInput: '',
 				email: '',
 				accepttns: false,
-				newsletter_eos: false,
-				newsletter_product: false,
+				newsletterEos: false,
+				newsletterProduct: false,
 				selectedLanguage: 'en',
 			},
 			appName: APPLICATION_NAME,
@@ -74,6 +74,8 @@ export default {
 					password: this.formData.password,
 					recoveryEmail: this.formData.email,
 					language: this.formData.selectedLanguage,
+					newsletterEos: this.formData.newsletterEos,
+					newsletterProduct: this.formData.newsletterProduct,
 				}
 				this.submitForm(data)
 			}
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index ff81f3d7..5ce865c9 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -125,7 +125,7 @@
 					<div class="control">
 						<span class="action-checkbox">
 							<input id="action-newsletter_eos"
-								v-model="formData.newsletter_eos"
+								v-model="formData.newsletterEos"
 								type="checkbox"
 								class="checkbox action-checkbox__checkbox focusable">
 							<label for="action-newsletter_eos" class="action-checkbox__label">{{ t(appName,'I want to receive news about /e/OS') }}</label>
@@ -139,7 +139,7 @@
 					<div class="control">
 						<span class="action-checkbox">
 							<input id="action-newsletter_product"
-								v-model="formData.newsletter_product"
+								v-model="formData.newsletterProduct"
 								type="checkbox"
 								class="checkbox action-checkbox__checkbox focusable">
 							<label for="action-newsletter_product" class="action-checkbox__label">{{ t(appName,'I want to receive news about Murena products and promotions') }}</label>
-- 
GitLab


From 20b89d6707ee8c1f859887c63cdbf52bba52c804 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 27 Dec 2023 11:59:33 +0000
Subject: [PATCH 056/185] Recovery Email screen

---
 l10n/de.js                                    |   8 +-
 l10n/de.json                                  |   8 +-
 l10n/en.js                                    |   8 +-
 l10n/en.json                                  |   8 +-
 l10n/es.js                                    |   8 +-
 l10n/es.json                                  |   8 +-
 l10n/fr.js                                    |   8 +-
 l10n/fr.json                                  |   8 +-
 l10n/it.js                                    |   8 +-
 l10n/it.json                                  |   8 +-
 lib/Controller/AccountController.php          |   2 +-
 package.json                                  |   3 +-
 .../ecloud-accounts-userregistration.scss     |   4 +-
 src/signup/CaptchaForm.vue                    |  13 +-
 src/signup/RecoveryEmailForm.vue              | 159 ++++++------------
 src/signup/RegistrationForm.vue               |  30 +++-
 src/signup/SuccessSection.vue                 |   6 +-
 17 files changed, 157 insertions(+), 140 deletions(-)
 rename css/ecloud-accounts-userregistration.css => scss/ecloud-accounts-userregistration.scss (89%)

diff --git a/l10n/de.js b/l10n/de.js
index 2c564a74..d12d723b 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -46,7 +46,7 @@ OC.L10N.register(
 		"Create My Account": "Mein Konto erstellen",
 		"Verify": "Überprüfen Sie",
 		"Later": "Später",
-		"Set my recovery email address": "Meine Wiederherstellungs-E-Mail-Adresse festlegen",
+		"Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen",
 		"Display name": "Name anzeigen",
 		"Username": "Benutzername",
 		"Enter Password": "Passwort eingeben",
@@ -74,6 +74,10 @@ OC.L10N.register(
 		"Success!": "Erfolgreich!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='https://doc.e.foundation/support-topics/configure-email'>diese Seite</a>.",
-		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32"
+		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32",
+		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
+		"Important:": "Das ist wichtig:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
+		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index fdc003d3..1acdb33c 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -45,7 +45,7 @@
 		"Create My Account": "Mein Konto erstellen",
 		"Verify": "Überprüfen Sie",
 		"Later": "Später",
-		"Set my recovery email address": "Meine Wiederherstellungs-E-Mail-Adresse festlegen",
+		"Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen",
 		"Display name": "Name anzeigen",
 		"Username": "Benutzername",
 		"Enter Password": "Passwort eingeben",
@@ -72,7 +72,11 @@
 		"Success!": "Erfolgreich!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='https://doc.e.foundation/support-topics/configure-email'>diese Seite</a>.",
-		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32"
+		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32",
+		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
+		"Important:": "Das ist wichtig:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
+		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 9cb3afc8..cf71a745 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -49,7 +49,7 @@ OC.L10N.register(
 		"Create My Account": "Create My Account",
 		"Verify": "Verify",
 		"Later": "Later",
-		"Set my recovery email address": "Set my recovery email address",
+		"Set My Recovery Email Now": "Set My Recovery Email Now",
 		"Display name": "Display name",
 		"Username": "Username",
 		"Enter Password": "Enter Password",
@@ -78,6 +78,10 @@ OC.L10N.register(
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.",
 		"Recovery email address is already taken.": "Recovery email address is already taken.",
-		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32"
+		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32",
+		"Use an alternative email": "Use an alternative email",
+		"Important:": "Important:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
+		"Set a recovery email address": "Set a recovery email address"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index eb5fac3a..51a28a35 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -46,7 +46,7 @@
 		"Create My Account": "Create My Account",
 		"Verify": "Verify",
 		"Later": "Later",
-		"Set my recovery email address": "Set my recovery email address",
+		"Set My Recovery Email Now": "Set My Recovery Email Now",
 		"Display name": "Display name",
 		"Username": "Username",
 		"Enter Password": "Enter Password",
@@ -74,7 +74,11 @@
 		"Success!": "Success!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.",
-		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32"
+		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32",
+		"Use an alternative email": "Use an alternative email",
+		"Important:": "Important:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
+		"Set a recovery email address": "Set a recovery email address"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index f4f64e8e..a6cf885b 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -48,7 +48,7 @@ OC.L10N.register(
 		"Create My Account": "Crear mi cuenta",
 		"Verify": "Verifique",
 		"Later": "Más tarde",
-		"Set my recovery email address": "Establecer mi dirección de correo electrónico de recuperación",
+		"Set My Recovery Email Now": "Establecer mi correo electrónico de recuperación ahora",
 		"Display name": "Mostrar nombre",
 		"Username": "Nombre de usuario",
 		"Enter Password": "Introducir contraseña",
@@ -76,6 +76,10 @@ OC.L10N.register(
 		"Success!": "¡Éxito!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Su cuenta <b>__username__@__domain__</b> se ha creado correctamente.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='https://doc.e.foundation/support-topics/configure-email'>esta página</a>.",
-		"Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32"
+		"Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32",
+		"Use an alternative email": "Utilizar un correo electrónico alternativo",
+		"Important:": "Importante:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.",
+		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index eee55840..45441c31 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -47,7 +47,7 @@
 		"Create My Account": "Crear mi cuenta",
 		"Verify": "Verifique",
 		"Later": "Más tarde",
-		"Set my recovery email address": "Establecer mi dirección de correo electrónico de recuperación",
+		"Set My Recovery Email Now": "Establecer mi correo electrónico de recuperación ahora",
 		"Display name": "Mostrar nombre",
 		"Username": "Nombre de usuario",
 		"Enter Password": "Introducir contraseña",
@@ -75,7 +75,11 @@
 		"Success!": "¡Éxito!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Su cuenta <b>__username__@__domain__</b> se ha creado correctamente.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite <a href='https://doc.e.foundation/support-topics/configure-email'>esta página</a>.",
-		"Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32"
+		"Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32",
+		"Use an alternative email": "Utilizar un correo electrónico alternativo",
+		"Important:": "Importante:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.",
+		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index dea43d8d..02a080b2 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -47,7 +47,7 @@ OC.L10N.register(
 		"Create My Account": "Créer mon compte",
 		"Verify": "Vérifier",
 		"Later": "Plus tard",
-		"Set my recovery email address": "Définir mon adresse e-mail de récupération",
+		"Set My Recovery Email Now": "Définir mon e-mail de récupération maintenant",
 		"Display name": "Nom d'affichage",
 		"Username": "Nom d'utilisateur",
 		"Enter Password": "Saisir le mot de passe",
@@ -75,6 +75,10 @@ OC.L10N.register(
 		"Success!": "Succès !",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Votre compte <b>__username__@__domain__</b> a été créé avec succès.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='https://doc.e.foundation/support-topics/configure-email'>cette page</a>.",
-		"Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32"
+		"Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32",
+		"Use an alternative email": "Utiliser un autre courriel",
+		"Important:": "Important :",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.",
+		"Set a recovery email address": "Définir une adresse électronique de récupération"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index e733fab1..83a3ff78 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -46,7 +46,7 @@
 		"Create My Account": "Créer mon compte",
 		"Verify": "Vérifier",
 		"Later": "Plus tard",
-		"Set my recovery email address": "Définir mon adresse e-mail de récupération",
+		"Set My Recovery Email Now": "Définir mon e-mail de récupération maintenant",
 		"Display name": "Nom d'affichage",
 		"Username": "Nom d'utilisateur",
 		"Enter Password": "Saisir le mot de passe",
@@ -74,7 +74,11 @@
 		"Success!": "Succès !",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Votre compte <b>__username__@__domain__</b> a été créé avec succès.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter <a href='https://doc.e.foundation/support-topics/configure-email'>cette page</a>.",
-		"Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32"
+		"Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32",
+		"Use an alternative email": "Utiliser un autre courriel",
+		"Important:": "Important :",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.",
+		"Set a recovery email address": "Définir une adresse électronique de récupération"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index c0a1df64..356b1284 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -47,7 +47,7 @@ OC.L10N.register(
 		"Create My Account": "Crea il mio account",
 		"Verify": "Verifica",
 		"Later": "Più tardi",
-		"Set my recovery email address": "Impostare l'indirizzo e-mail di recupero",
+		"Set My Recovery Email Now": "Imposta ora la mia e-mail di recupero",
 		"Display name": "Nome visualizzato",
 		"Username": "Nome utente",
 		"Enter Password": "Inserire la password",
@@ -75,6 +75,10 @@ OC.L10N.register(
 		"Success!": "Successo!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "L'account <b>__username__@__domain__</b> è stato creato con successo.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare <a href='https://doc.e.foundation/support-topics/configure-email'>questa pagina</a>.",
-		"Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32"
+		"Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32",
+		"Use an alternative email": "Utilizzare un'e-mail alternativa",
+		"Important:": "Importante:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.",
+		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 82634b23..7c62999b 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -46,7 +46,7 @@
 		"Create My Account": "Crea il mio account",
 		"Verify": "Verifica",
 		"Later": "Più tardi",
-		"Set my recovery email address": "Impostare l'indirizzo e-mail di recupero",
+		"Set My Recovery Email Now": "Imposta ora la mia e-mail di recupero",
 		"Display name": "Nome visualizzato",
 		"Username": "Nome utente",
 		"Enter Password": "Inserire la password",
@@ -70,7 +70,11 @@
 		"Recovery Email is required.": "L'e-mail di recupero è necessaria.",
 		"You must read and accept the Terms of Service to create your account.": "Per creare il proprio account è necessario leggere e accettare i Termini di servizio.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare <a href='https://doc.e.foundation/support-topics/configure-email'>questa pagina</a>.",
-		"Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32"
+		"Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32",
+		"Use an alternative email": "Utilizzare un'e-mail alternativa",
+		"Important:": "Importante:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.",
+		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 88cb74b6..e33cd981 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -142,7 +142,7 @@ class AccountController extends Controller {
 			$this->userService->setTOS($username, true);
 			$this->userService->setUserLanguage($username, $language);
 			$this->newsletterService->setNewsletterSignup($newsletterEos, $newsletterProduct, $userEmail, $language);
-			
+			$this->userService->setRecoveryEmail($username, '');
 			if($recoveryEmail !== '') {
 				$this->userService->setUnverifiedRecoveryEmail($username, $recoveryEmail);
 			}
diff --git a/package.json b/package.json
index 74dc503c..30435c15 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
 	},
 	"private": true,
 	"scripts": {
-		"build": "NODE_ENV=production webpack --progress",
+		"build-scss": "sass scss:css --style compressed --no-source-map",
+		"build": "npm run build-scss && NODE_ENV=production webpack --progress",
 		"dev": "NODE_ENV=development webpack --progress",
 		"watch": "NODE_ENV=development webpack --progress --watch",
 		"lint": "eslint --ext .js,.vue src",
diff --git a/css/ecloud-accounts-userregistration.css b/scss/ecloud-accounts-userregistration.scss
similarity index 89%
rename from css/ecloud-accounts-userregistration.css
rename to scss/ecloud-accounts-userregistration.scss
index 895b680c..991c2c11 100644
--- a/css/ecloud-accounts-userregistration.css
+++ b/scss/ecloud-accounts-userregistration.scss
@@ -29,6 +29,7 @@ html {
 
 .password-group #password {
 	height: 58px !important;
+	margin-left: 0;
 }
 
 @media only screen and (max-width: 768px) {
@@ -37,7 +38,8 @@ html {
 	}
 
 	#body-login .v-align {
-		padding: 5vh 0vh !important;
+		padding: 2vh 0vh !important;
+		max-height: fit-content !important;
 	}
 }
 
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index e12a1e3c..342aeeaa 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -109,6 +109,11 @@ export default {
 }
 </script>
 <style scoped>
+#captchaForm {
+	max-width: 500px;
+	margin: 0 auto;
+	padding: 0 10px;
+}
 .display-flex {
 	display: flex;
 	justify-content: space-between;
@@ -148,7 +153,7 @@ export default {
 	}
 }
 #fields {
-	margin: 10px;
+	margin: 10px 0;
 	background-color: white;
 }
 #fields .control {
@@ -167,9 +172,9 @@ export default {
 	transition: all 0.5s linear;
 	border: 1px solid #E6E8E9;
 	border-radius: 8px;
-	padding: 10px 20px;
-	margin-top: 10px;
-	margin-bottom: 10px;
+	padding: 30px 20px;
+	margin: 10px 0;
+	box-sizing: border-box;
 }
 #fields .field {
 	font-size: 1.3em;
diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue
index c0377db4..639bd36a 100644
--- a/src/signup/RecoveryEmailForm.vue
+++ b/src/signup/RecoveryEmailForm.vue
@@ -1,16 +1,13 @@
 <template>
 	<div id="recoveryEmailForm">
-		<div>
-			<h1 class="has-text-centered subtitle is-3">
-				{{ t(appName,'For security reasons you need to set a recovery address for your Murena Cloud account.') }}
-			</h1>
-			<h1 class="has-text-centered subtitle is-3">
-				{{ t(appName,'As long as you don\'t, you\'ll have limited access to your account.') }}
-			</h1>
-		</div>
-
 		<div id="fields">
-			<div class="field">
+			<div class="mx-10">
+				<h1 class="text-justified title">
+					{{ t(appName,'Set a recovery email address') }}
+				</h1>
+			</div>
+
+			<div class="field mx-10">
 				<div class="control">
 					<label>{{ t(appName,'Recovery Email') }}</label>
 					<input id="email"
@@ -18,7 +15,7 @@
 						name="email"
 						type="email"
 						class="form-input"
-						:placeholder="t(appName,'Recovery Email')"
+						:placeholder="t(appName,'Use an alternative email')"
 						@input="validateForm(['email'])">
 					<p v-if="validation.isEmailEmpty" class="validation-warning">
 						{{ t(appName,'Recovery Email is required.') }}
@@ -27,18 +24,25 @@
 			</div>
 		</div>
 
+		<div class="mx-10">
+			<h1 class="text-justified subtitle is-3">
+				<span class="important">{{ t(appName,'Important:') }}</span>
+				<span>{{ t(appName,'For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.') }}</span>
+			</h1>
+		</div>
+
 		<div id="groups" class="aliases-info display-flex">
 			<button :wide="true"
-				class="btn-default w-50"
+				class="btn-primary w-50 mx-10"
 				type="primary"
-				@click.prevent="submitRecoveryEmailForm(false)">
-				{{ t(appName,'Later') }}
+				@click.prevent="submitRecoveryEmailForm(true)">
+				{{ t(appName,'Set My Recovery Email Now') }}
 			</button>
 			<button :wide="true"
-				class="btn-primary w-50"
+				class="btn-default w-50 mx-10"
 				type="primary"
-				@click.prevent="submitRecoveryEmailForm(true)">
-				{{ t(appName,'Set my recovery email address') }}
+				@click.prevent="submitRecoveryEmailForm(false)">
+				{{ t(appName,'Later') }}
 			</button>
 		</div>
 	</div>
@@ -89,37 +93,42 @@ export default {
 }
 </script>
 <style scoped>
+.important{
+	font-weight: bold;
+	color: black;
+}
+.text-justified{
+	text-align: justify;
+}
+#recoveryEmailForm {
+	max-width: 500px;
+	margin: 0 auto;
+	padding: 0 10px;
+}
+.mx-10{
+	margin: 10px 0;
+}
+.title{
+	font-size: 20px;
+	color: black;
+	margin-bottom: 10%;
+	font-weight: bold;
+}
 .display-flex {
 	display: flex;
 	justify-content: space-between;
+	flex-direction: column;
 }
 
 /** mobile font sizes **/
 @media screen and (max-width: 650px) {
-	#fields .field .control input {
+	#fields input {
 		padding-left: 2%;
 		padding-right: 2%;
 	}
 }
 
 @media screen and (max-width: 768px) {
-	#successMessages {
-		margin-left: 5%;
-		margin-right: 5%;
-	}
-
-	#success h1 {
-		font-size: 1.5em;
-	}
-
-	#inviteHeader,
-	#registerHeading {
-		font-size: 1.5em;
-	}
-
-	#fields {
-		background-color: white;
-	}
 
 	#fields .field {
 		font-size: 1.0em;
@@ -144,24 +153,13 @@ export default {
 	}
 }
 
-#fields {
-	margin: 10px;
-}
-
 #fields .control {
 	text-align: left;
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
 
-#fields input#username,
-#fields input#new-password,
-#fields input#repassword {
-	width: 50%;
-}
-
-#fields input,
-#fields input[type="password"] {
+#fields input{
 	background-color: var(--color-secondary-element);
 	margin-bottom: 0;
 	color: rgba(0, 0, 0, 0.8);
@@ -172,13 +170,9 @@ export default {
 	transition: all 0.5s linear;
 	border: 1px solid #E6E8E9;
 	border-radius: 8px;
-	padding: 10px 20px;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#fields {
-	background-color: white;
+	padding: 30px 20px;
+	margin: 10px 0;
+	box-sizing: border-box;
 }
 
 #fields .field {
@@ -189,44 +183,11 @@ export default {
 	font-size: 15px;
 }
 
-#inviteHeader,
-#registerHeading {
-	margin-bottom: 10%;
-	font-size: 24px;
-	text-align: left !important;
-	font-weight: 500;
-}
-
-#currentLangImg {
-	border-radius: 50%;
-	margin: 0 auto;
-	border: 0.1em transparent black;
-	height: 24px;
-	width: 24px;
-	max-width: none;
-}
-
-#submitButton:hover {
-	opacity: 0.9;
-}
-
 #fields label {
-	color: #333333;
+	color: black;
 	font-size: 16px;
 	font-weight: 900;
 }
-
-sup {
-	color: #ff0000;
-	font-weight: 500;
-	font-size: 14px;
-	padding-left: 3px;
-}
-
-#tos_div label {
-	line-height: 1.5rem;
-}
-
 .validation-warning{
 	color: #ff0000;
     padding-left: 5px;
@@ -242,29 +203,19 @@ p.validation-warning:before {
     padding-right: 5px;
 }
 .btn-primary {
-	width: 95%;
+	width: 100%;
 	background-color: var(--color-primary);
-	color: white;
+	color: var(--color-primary-text);
 	border-color: var(--color-primary);
 	font-size: large;
 }
 
 .btn-default{
-	width: 95%;
-	background-color: var(--color-warning);
-	color: white;
-	border-color: var(--color-warning);
+	width: 100%;
+	background-color: var(--color-primary-text);
+	color: var(--color-primary);
+	border-color: var(--color-primary);
 	font-size: large;
 }
 
-@media screen and (max-width: 500px) {
-	#main {
-		padding: 0 1.5rem;
-	}
-
-	#inviteHeader,
-	#registerHeading {
-		font-size: 18px;
-	}
-}
 </style>
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 5ce865c9..e9178c1a 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -307,7 +307,10 @@ export default {
 
 <style scoped>
 #registrationForm{
-	width: 90%;
+	display: flex;
+	max-width: 700px;
+	width: 100%;
+	margin: 0 auto;
 }
 .display-flex {
 	display: flex;
@@ -333,18 +336,19 @@ export default {
 	margin-right: 10px;
 }
 .fields {
-	margin: 10px;
+	margin: 10px 0;
 }
 .fields .control {
 	text-align: left;
-	margin-top: 10px;
-	margin-bottom: 10px;
+	margin: 10px 0;
 }
-.fields input#username,
 .fields input#new-password,
 .fields input#repassword {
 	width: 45%;
 }
+.fields input#username {
+	width: 50%;
+}
 .fields input,
 .fields input[type="password"] {
 	background-color: var(--color-secondary-element);
@@ -357,9 +361,9 @@ export default {
 	transition: all 0.5s linear;
 	border: 1px solid #E6E8E9;
 	border-radius: 8px;
-	padding: 10px 20px;
-	margin-top: 10px;
-	margin-bottom: 10px;
+	padding: 30px 20px;
+	margin: 10px 0;
+	box-sizing: border-box;
 }
 .username-group {
 	display: flex;
@@ -485,6 +489,9 @@ p.validation-success:before {
 	border-color: var(--color-primary);
 	font-size: large;
 }
+.pad-left-5{
+	padding-left: 5px;
+}
 /** mobile font sizes **/
 @media screen and (max-width: 650px) {
 	.fields .field .control input {
@@ -527,6 +534,13 @@ p.validation-success:before {
 		font-size: 1.0em;
 		line-height: 1.0em;
 	}
+	.fields input#new-password,
+	.fields input#repassword {
+		width: 100%;
+	}
+	.password-group .Password{
+		margin: 0;
+	}
 }
 @media screen and (max-width: 500px) {
 	#main {
diff --git a/src/signup/SuccessSection.vue b/src/signup/SuccessSection.vue
index 9414501d..a7d79c9b 100644
--- a/src/signup/SuccessSection.vue
+++ b/src/signup/SuccessSection.vue
@@ -56,7 +56,11 @@ export default {
 </script>
 
 <style scoped>
-
+#successSection{
+	max-width: 500px;
+	width: 100%;
+	margin: 0 auto;
+}
 @media screen and (max-width: 768px) {
 	#successMessages {
 		margin-left: 5%;
-- 
GitLab


From c15b5108d44dc494f2c416fc54ea21755afcfeef Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 28 Dec 2023 14:27:58 +0000
Subject: [PATCH 057/185] Refresh captcha url on fail

---
 lib/Controller/AccountController.php | 2 +-
 src/signup/CaptchaForm.vue           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index e33cd981..059dcc4c 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -248,10 +248,10 @@ class AccountController extends Controller {
 		$captchaResult = (string) $this->session->get(CaptchaService::CAPTCHA_RESULT_KEY, '');
 		$response->setStatus(400);
 		if ($captchaResult === $captchaInput) {
-			$this->session->remove(CaptchaService::CAPTCHA_RESULT_KEY);
 			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
 			$response->setStatus(200);
 		}
+		$this->session->remove(CaptchaService::CAPTCHA_RESULT_KEY);
 		return $response;
 	}
 
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index 342aeeaa..b0720bd5 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -94,6 +94,7 @@ export default {
 				this.$emit('form-submitted', { isFormValid })
 			} catch (error) {
 				this.validation.isCaptchaInputNotMatched = true
+				this.refreshCaptchaImage()
 			}
 		},
 		submitCaptchaForm() {
@@ -105,6 +106,9 @@ export default {
 		showMessage(message, type) {
 			type === 'success' ? showSuccess(message) : showError(message)
 		},
+		refreshCaptchaImage() {
+			this.captchaImageUrl = generateUrl(`/apps/${this.appName}/accounts/captcha?v=${Date.now()}`)
+		},
 	},
 }
 </script>
-- 
GitLab


From 4b58bc3ce88c8d4e9e1979b78708bc9d12bb0837 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 1 Jan 2024 12:45:09 -0800
Subject: [PATCH 058/185] Added logger object

---
 lib/Controller/AccountController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 059dcc4c..be3e8ada 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -17,6 +17,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IURLGenerator;
@@ -37,7 +38,7 @@ class AccountController extends Controller {
 	private IConfig $config;
 	private const SESSION_USERNAME_CHECK = 'username_check_passed';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
-
+	private ILogger $logger;
 	public function __construct(
 		$AppName,
 		IRequest $request,
@@ -48,7 +49,8 @@ class AccountController extends Controller {
 		IUserSession $userSession,
 		IURLGenerator $urlGenerator,
 		ISession $session,
-		IConfig $config
+		IConfig $config,
+		ILogger $logger
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
@@ -60,6 +62,7 @@ class AccountController extends Controller {
 		$this->userSession = $userSession;
 		$this->config = $config;
 		$this->urlGenerator = $urlGenerator;
+		$this->logger = $logger;
 	}
 
 	/**
-- 
GitLab


From 4682878a04e3beca35bf212757612bb4bdaa0e9b Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 2 Jan 2024 16:58:28 +0000
Subject: [PATCH 059/185] Fixes for common services and (dark mode) input
 fields

---
 lib/Service/UserService.php                | 38 +++++++++++++---------
 scss/ecloud-accounts-userregistration.scss |  7 ++--
 src/signup/CaptchaForm.vue                 |  6 ++--
 src/signup/RecoveryEmailForm.vue           |  6 ++--
 src/signup/RegistrationForm.vue            | 12 ++++---
 5 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index dbda65c4..221cae5c 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -48,10 +48,16 @@ class UserService {
 		$this->defaults = $defaults;
 		$this->l10nFactory = $l10nFactory;
 		$this->LDAPConnectionService = $LDAPConnectionService;
+		$commonServiceURL = $this->config->getSystemValue('common_services_url', '');
+
+		if (!empty($commonServiceURL)) {
+			$commonServiceURL = rtrim($commonServiceURL, '/') . '/';
+		}
+
 		$this->apiConfig = [
 			'mainDomain' => $this->config->getSystemValue('main_domain', ''),
-			'commonApiUrl' => rtrim($this->config->getSystemValue('common_services_url', ''), '/') . '/',
-			'commonServiceToken' => $this->config->getSystemValue('common_service_token', ''),
+			'commonServicesURL' => $commonServiceURL,
+			'commonServicesToken' => $this->config->getSystemValue('common_services_token', ''),
 			'aliasDomain' => $this->config->getSystemValue('alias_domain', ''),
 			'commonApiVersion' => $this->config->getSystemValue('common_api_version', ''),
 			'userCluserId' => $this->config->getSystemValue('user_cluser_id', ''),
@@ -315,13 +321,13 @@ class UserService {
 	 * @return void
 	 */
 	public function createHMEAlias(string $username, string $resultmail): void {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$aliasDomain = $this->apiConfig['aliasDomain'];
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 		
 		$endpoint = $commonApiVersion . '/aliases/hide-my-email/';
-		$url = $commonApiUrl . $endpoint . $resultmail;
+		$url = $commonServicesURL . $endpoint . $resultmail;
 		$data = array(
 			"domain" => $aliasDomain
 		);
@@ -348,14 +354,14 @@ class UserService {
 	 * @return mixed The result of the domain alias creation request, decoded from JSON.
 	 */
 	public function createNewDomainAlias(string $username, string $userEmail): mixed {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->config->getSystemValue('commonApiVersion', '');
 		$domain = $this->apiConfig['mainDomain'];
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
 		$endpoint = $commonApiVersion . '/aliases/';
-		$url = $commonApiUrl . $endpoint . $userEmail;
+		$url = $commonServicesURL . $endpoint . $userEmail;
 
 		$data = array(
 			"alias" => $username,
@@ -395,16 +401,16 @@ class UserService {
 	}
 
 	public function isUsernameTaken(string $username) : bool {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
-		if (!isset($commonApiUrl) || empty($commonApiUrl)) {
+		if (!isset($commonServicesURL) || empty($commonServicesURL)) {
 			return false;
 		}
 		$endpoint = $commonApiVersion . '/users/';
-		$url = $commonApiUrl . $endpoint . $username;
+		$url = $commonServicesURL . $endpoint . $username;
 
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$headers = [
 			"Authorization: Bearer $token"
 		];
@@ -424,20 +430,20 @@ class UserService {
 	}
 
 	public function addUsernameToCommonDataStore(string $username) : void {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
-		if (!isset($commonApiUrl) || empty($commonApiUrl)) {
+		if (!isset($commonServicesURL) || empty($commonServicesURL)) {
 			return;
 		}
 		$endpoint = $commonApiVersion . '/users/';
-		$url = $commonApiUrl . $endpoint ;
+		$url = $commonServicesURL . $endpoint ;
 		
 		$params = [
 			'username' => $username
 		];
 
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$headers = [
 			"Authorization: Bearer $token"
 		];
diff --git a/scss/ecloud-accounts-userregistration.scss b/scss/ecloud-accounts-userregistration.scss
index 991c2c11..f7f9c14b 100644
--- a/scss/ecloud-accounts-userregistration.scss
+++ b/scss/ecloud-accounts-userregistration.scss
@@ -27,9 +27,12 @@ html {
 	margin: 0 auto;
 }
 
-.password-group #password {
-	height: 58px !important;
+#registrationForm .password-group #password {
+	height: 62px;
 	margin-left: 0;
+	background-color: var(--input-background-color);
+	color: var(--color-main-text);
+	border: 1px solid #E6E8E9;
 }
 
 @media only screen and (max-width: 768px) {
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index b0720bd5..aa2eba48 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -165,10 +165,10 @@ export default {
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
-#fields input {
-	background-color: var(--color-secondary-element);
+#captchaForm #fields input {
+	background-color: var(--input-background-color);
 	margin-bottom: 0;
-	color: rgba(0, 0, 0, 0.8);
+	color: var(--color-main-text);
 	display: block;
 	width: 100%;
 	font-size: 16px;
diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue
index 639bd36a..e1b832b4 100644
--- a/src/signup/RecoveryEmailForm.vue
+++ b/src/signup/RecoveryEmailForm.vue
@@ -159,10 +159,10 @@ export default {
 	margin-bottom: 10px;
 }
 
-#fields input{
-	background-color: var(--color-secondary-element);
+#recoveryEmailForm #fields input{
+	background-color: var(--input-background-color);
 	margin-bottom: 0;
-	color: rgba(0, 0, 0, 0.8);
+	color: var(--color-main-text);
 	display: block;
 	width: 100%;
 	font-size: 16px;
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index e9178c1a..2e475142 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -349,13 +349,15 @@ export default {
 .fields input#username {
 	width: 50%;
 }
-.fields input,
-.fields input[type="password"] {
-	background-color: var(--color-secondary-element);
+.fields input{
+	width: 100%;
+}
+#registrationForm .fields input,
+#registrationForm .fields input[type="password"] {
+	background-color: var(--input-background-color);
 	margin-bottom: 0;
-	color: rgba(0, 0, 0, 0.8);
+	color: var(--color-main-text);
 	display: block;
-	width: 100%;
 	font-size: 16px;
 	line-height: 1.3em;
 	transition: all 0.5s linear;
-- 
GitLab


From 7c87e54a601c8f58af899523e5fba82cb6dd408a Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 18 Jan 2024 14:04:36 +0000
Subject: [PATCH 060/185] Delete Mailfolder at delete listener

---
 lib/Listeners/BeforeUserDeletedListener.php | 15 +++-----
 lib/Service/UserService.php                 | 41 ++++++++++-----------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/lib/Listeners/BeforeUserDeletedListener.php b/lib/Listeners/BeforeUserDeletedListener.php
index 66d483d6..aa4a21eb 100644
--- a/lib/Listeners/BeforeUserDeletedListener.php
+++ b/lib/Listeners/BeforeUserDeletedListener.php
@@ -45,15 +45,12 @@ class BeforeUserDeletedListener implements IEventListener {
 
 		$isUserOnLDAP = $this->LDAPConnectionService->isUserOnLDAPBackend($user);
 
-		$this->logger->info("PostDelete user {user}", array('user' => $uid));
-		$this->userService->ecloudDelete(
-			$uid,
-			$this->config->getSystemValue('e_welcome_domain'),
-			$this->config->getSystemValue('e_welcome_secret'),
-			$email,
-			$isUserOnLDAP
-		);
-
+		try {
+			$this->logger->info("PostDelete user {user}", array('user' => $uid));
+			$this->userService->deleteEmailAccount($email);
+		} catch (Exception $e) {
+			$this->logger->error('Error deleting mail folder for user '. $uid . ' :' . $e->getMessage());
+		}
 		try {
 			if ($this->LDAPConnectionService->isLDAPEnabled() && $isUserOnLDAP) {
 				$conn = $this->LDAPConnectionService->getLDAPConnection();
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 221cae5c..d8995194 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -138,32 +138,29 @@ class UserService {
 	 * @param $welcomeSecret string generated at ecloud selfhosting install and added as a custom var in NC's config
 	 * @return mixed response of the external endpoint
 	 */
-	public function ecloudDelete(string $userID, string $welcomeDomain, string $welcomeSecret, string $email, bool $isUserOnLDAP = false) {
-		$endpoint = '/postDelete.php';
-		if ($isUserOnLDAP) {
-			$endpoint = '/postDeleteLDAP.php';
+	public function deleteEmailAccount(string $email) {
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
+		$commonApiVersion = $this->apiConfig['commonApiVersion'];
+
+		if (!isset($commonServicesURL) || empty($commonServicesURL)) {
+			return;
 		}
-		$postDeleteUrl = "https://" . $welcomeDomain . $endpoint;
-		/**
-		 * send action to docker_welcome
-		 * Handling the non NC part of deletion process
-		 */
-		try {
-			$params = [
-				'sec' => $welcomeSecret,
-				'uid' => $userID,
-				'email' => $email
-			];
 
-			$answer = $this->curl->post($postDeleteUrl, $params);
+		$endpoint = $commonApiVersion . '/emails/' . $email;
+		$url = $commonServicesURL . $endpoint; // DELETE /v2/emails/@email
+		
+		$params = [];
+
+		$token = $this->apiConfig['commonServicesToken'];
+		$headers = [
+			"Authorization: Bearer $token"
+		];
+		
+		$this->curl->delete($url, $params, $headers);
 
-			return json_decode($answer, true);
-		} catch (\Exception $e) {
-			$this->logger->error('There has been an issue while contacting the external deletion script');
-			$this->logger->logException($e, ['app' => Application::APP_ID]);
+		if ($this->curl->getLastStatusCode() !== 200) {
+			throw new Exception('Error deleting mail folder of' . $email . '. Status Code: '.$this->curl->getLastStatusCode());
 		}
-
-		return null;
 	}
 	public function sendWelcomeEmail(string $displayname, string $username, string $userEmail, string $language = 'en') : void {
 		
-- 
GitLab


From 40b13b0962aea337e3b2b794cac78723dc97b4d0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 14 Feb 2024 08:42:13 +0000
Subject: [PATCH 061/185] added recovery email as param

---
 lib/Controller/AccountController.php | 17 +++++++++--------
 lib/Service/UserService.php          |  4 ++++
 src/Signup.vue                       |  8 ++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index be3e8ada..00aa714a 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -152,6 +152,15 @@ class AccountController extends Controller {
 		
 			$this->userService->sendWelcomeEmail($displayname, $username, $userEmail, $language);
 			
+			$this->session->remove(self::SESSION_USERNAME_CHECK);
+			$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
+
+			try {
+				$this->userService->addUsernameToCommonDataStore($username);
+			} catch (Exception $e) {
+				$this->logger->logException($e, ['app' => Application::APP_ID]);
+			}
+			
 			$response->setStatus(200);
 			$response->setData(['success' => true]);
 
@@ -160,14 +169,6 @@ class AccountController extends Controller {
 			$response->setStatus(500);
 		}
 
-		$this->session->remove(self::SESSION_USERNAME_CHECK);
-		$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
-
-		try {
-			$this->userService->addUsernameToCommonDataStore($username);
-		} catch (Exception $e) {
-			$this->logger->logException($e, ['app' => Application::APP_ID]);
-		}
 		return $response;
 	}
 	/**
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index d8995194..c4c187ac 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -306,6 +306,10 @@ class UserService {
 		if(count($users)) {
 			return true;
 		}
+		$users = $this->config->getUsersForUserValue('email-recovery', 'unverified-recovery-email', $recoveryEmail);
+		if(count($users)) {
+			return true;
+		}
 		return false;
 	}
 
diff --git a/src/Signup.vue b/src/Signup.vue
index 8be5e5cf..4fa39636 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -51,6 +51,14 @@ export default {
 			showSuccessSection: false,
 		}
 	},
+	mounted() {
+		// Extracting the recovery email from the URL when the component is mounted
+		const urlParams = new URLSearchParams(window.location.search)
+		const recoveryEmail = urlParams.get('recoveryEmail')
+
+		// Set formData.email directly to recoveryEmail
+		this.formData.email = recoveryEmail || ''
+	},
 	methods: {
 		submitRegistrationForm(data) {
 			if (data.isFormValid) {
-- 
GitLab


From f1b93e5e11115ed345ff4044c6d66738035813b6 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 27 Feb 2024 10:01:48 +0000
Subject: [PATCH 062/185] [KC 23] Change SSO mapper to add secretEncoding field

---
 lib/Db/SSOMapper.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
index 3c04b982..89f4af88 100644
--- a/lib/Db/SSOMapper.php
+++ b/lib/Db/SSOMapper.php
@@ -58,7 +58,7 @@ class SSOMapper {
 		$qb->delete(self::CREDENTIAL_TABLE)
 			->where('USER_ID = :username')
 			->andWhere('TYPE = "otp"')
-			->andWhere('CREDENTIAL_DATA LIKE "%\"subType\":\"nextcloud_totp\"%" OR CREDENTIAL_DATA LIKE "%\"subType\":\"totp\"%"')
+			->andWhere('CREDENTIAL_DATA LIKE "%\"subType\":\"totp\"%"')
 			->setParameter('username', $userId)
 			->execute();
 	}
@@ -112,10 +112,11 @@ class SSOMapper {
 				'value' => $secret
 			]),
 			'CREDENTIAL_DATA' => json_encode([
-				'subType' => 'nextcloud_totp',
+				'subType' => 'totp',
 				'period' => 30,
 				'digits' => 6,
 				'algorithm' => 'HmacSHA1',
+				'secretEncoding' => 'BASE32',
 			]),
 		];
 
-- 
GitLab


From e0887a1b285c10f8c497ce628088ade658674d0a Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 6 Mar 2024 08:31:26 +0000
Subject: [PATCH 063/185] user cannot use legacy domain or main domain as
 recovery email

---
 appinfo/info.xml                     |  2 +-
 l10n/de.js                           |  6 ++-
 l10n/de.json                         |  6 ++-
 l10n/en.js                           |  6 ++-
 l10n/en.json                         |  6 ++-
 l10n/es.js                           |  6 ++-
 l10n/es.json                         |  6 ++-
 l10n/fr.js                           |  6 ++-
 l10n/fr.json                         |  6 ++-
 l10n/it.js                           |  6 ++-
 l10n/it.json                         |  6 ++-
 lib/Controller/AccountController.php |  2 +-
 lib/Service/UserService.php          | 60 ++++++++++++++++++++++++++--
 src/Signup.vue                       |  2 +-
 14 files changed, 110 insertions(+), 16 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a4d9725f..0d326733 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>4.0.0</version>
+    <version>4.0.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/l10n/de.js b/l10n/de.js
index d12d723b..9785af83 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -78,6 +78,10 @@ OC.L10N.register(
 		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
 		"Important:": "Das ist wichtig:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
-		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse"
+		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
+		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
+		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
+		"Captcha is not verified!": "Captcha wird nicht überprüft!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 1acdb33c..09a7588c 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -76,7 +76,11 @@
 		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
 		"Important:": "Das ist wichtig:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
-		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse"
+		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
+		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
+		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
+		"Captcha is not verified!": "Captcha wird nicht überprüft!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index cf71a745..3d9794a3 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -82,6 +82,10 @@ OC.L10N.register(
 		"Use an alternative email": "Use an alternative email",
 		"Important:": "Important:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
-		"Set a recovery email address": "Set a recovery email address"
+		"Set a recovery email address": "Set a recovery email address",
+		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
+		"Recovery email address is already taken.": "Recovery email address is already taken.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
+		"Captcha is not verified!": "Captcha is not verified!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 51a28a35..d61942f9 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -78,7 +78,11 @@
 		"Use an alternative email": "Use an alternative email",
 		"Important:": "Important:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
-		"Set a recovery email address": "Set a recovery email address"
+		"Set a recovery email address": "Set a recovery email address",
+		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
+		"Recovery email address is already taken.": "Recovery email address is already taken.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
+		"Captcha is not verified!": "Captcha is not verified!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index a6cf885b..72f2b282 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -80,6 +80,10 @@ OC.L10N.register(
 		"Use an alternative email": "Utilizar un correo electrónico alternativo",
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.",
-		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación"
+		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación",
+		"Recovery email address has an incorrect format.": "La dirección de correo electrónico de recuperación tiene un formato incorrecto.",
+		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
+		"Captcha is not verified!": "¡Captcha no está verificado!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 45441c31..409ea77b 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -79,7 +79,11 @@
 		"Use an alternative email": "Utilizar un correo electrónico alternativo",
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.",
-		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación"
+		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación",
+		"Recovery email address has an incorrect format.": "La dirección de correo electrónico de recuperación tiene un formato incorrecto.",
+		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
+		"Captcha is not verified!": "¡Captcha no está verificado!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 02a080b2..2b327ea3 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -79,6 +79,10 @@ OC.L10N.register(
 		"Use an alternative email": "Utiliser un autre courriel",
 		"Important:": "Important :",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.",
-		"Set a recovery email address": "Définir une adresse électronique de récupération"
+		"Set a recovery email address": "Définir une adresse électronique de récupération",
+		"Recovery email address has an incorrect format.": "Le format de l'adresse électronique de récupération est incorrect.",
+		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
+		"Captcha is not verified!": "Captcha n'est pas vérifié !"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 83a3ff78..26fcbfef 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -78,7 +78,11 @@
 		"Use an alternative email": "Utiliser un autre courriel",
 		"Important:": "Important :",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.",
-		"Set a recovery email address": "Définir une adresse électronique de récupération"
+		"Set a recovery email address": "Définir une adresse électronique de récupération",
+		"Recovery email address has an incorrect format.": "Le format de l'adresse électronique de récupération est incorrect.",
+		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
+		"Captcha is not verified!": "Captcha n'est pas vérifié !"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 356b1284..f3cf4249 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -79,6 +79,10 @@ OC.L10N.register(
 		"Use an alternative email": "Utilizzare un'e-mail alternativa",
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.",
-		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero"
+		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero",
+		"Recovery email address has an incorrect format.": "L'indirizzo e-mail di recupero ha un formato errato.",
+		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
+		"Captcha is not verified!": "Il Captcha non è verificato!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 7c62999b..e4ad86d6 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -74,7 +74,11 @@
 		"Use an alternative email": "Utilizzare un'e-mail alternativa",
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.",
-		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero"
+		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero",
+		"Recovery email address has an incorrect format.": "L'indirizzo e-mail di recupero ha un formato errato.",
+		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
+		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
+		"Captcha is not verified!": "Il Captcha non è verificato!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 00aa714a..6aa58aef 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -103,7 +103,7 @@ class AccountController extends Controller {
 	 *
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
-	public function create(string $displayname = '', string $recoveryEmail = '', string $username = '', string $password = '', string $language = '', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse {
+	public function create(string $displayname = '', string $recoveryEmail = '', string $username = '', string $password = '', string $language = 'en', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse {
 		
 		$response = new DataResponse();
 		
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index c4c187ac..b6097b37 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -200,6 +200,9 @@ class UserService {
 	public function getMainDomain() : string {
 		return $this->config->getSystemValue('main_domain', '');
 	}
+	public function getLegacyDomain() : string {
+		return $this->config->getSystemValue('legacy_domain', '');
+	}
 	public function setUserLanguage(string $username, string $language = 'en') {
 		$this->config->setUserValue($username, 'core', 'lang', $language);
 	}
@@ -239,16 +242,34 @@ class UserService {
 	 * @throws Exception If the username or recovery email is already taken.
 	 */
 	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): array {
-
+		
 		if ($this->userExists($username)) {
 			throw new Exception("Username is already taken.");
 		}
-		if (!empty($recoveryEmail) && $this->checkRecoveryEmailAvailable($recoveryEmail)) {
-			throw new Exception("Recovery email address is already taken.");
+		if (!empty($recoveryEmail)) {
+			$this->validateRecoveryEmail($recoveryEmail);
 		}
 		return $this->addNewUserToLDAP($displayname, $recoveryEmail, $username, $userEmail, $password);
 		
 	}
+	/**
+	 * Validates the recovery email address.
+	 *
+	 * @param string $recoveryEmail The recovery email address to be validated.
+	 * @throws Exception If the recovery email address has an incorrect format, is already taken, or if the domain is disallowed.
+	 * @return void
+	 */
+	public function validateRecoveryEmail(string $recoveryEmail): void {
+		if (!$this->isValidEmailFormat($recoveryEmail)) {
+			throw new Exception('Recovery email address has an incorrect format.');
+		}
+		if ($this->checkRecoveryEmailAvailable($recoveryEmail)) {
+			throw new Exception('Recovery email address is already taken.');
+		}
+		if ($this->isRecoveryEmailDomainDisallowed($recoveryEmail)) {
+			throw new Exception('You cannot set an email address with a Murena domain as recovery email address.');
+		}
+	}
 	/**
 	 * Add a new user to the LDAP directory.
 	 *
@@ -313,6 +334,39 @@ class UserService {
 		return false;
 	}
 
+	/**
+	 * Check if a recovery email address domain is restricted for some domains
+	 *
+	 * @param string $recoveryEmail The recovery email address to check.
+	 *
+	 * @return bool True if the recovery email address is disallowed, false otherwise.
+	 */
+	public function isRecoveryEmailDomainDisallowed(string $recoveryEmail): bool {
+		
+		$recoveryEmail = strtolower($recoveryEmail);
+		
+		$emailParts = explode('@', $recoveryEmail);
+		$domain = $emailParts[1] ?? '';
+		
+		$legacyDomain = $this->getLegacyDomain();
+		$mainDomain = $this->getMainDomain();
+		
+		$restrictedDomains = [ $legacyDomain, $mainDomain ];
+
+		return in_array($domain, $restrictedDomains);
+	}
+
+	/**
+	 * Check if a recovery email address is in valid format
+	 *
+	 * @param string $recoveryEmail The recovery email address to check.
+	 *
+	 * @return bool True if the recovery email address is valid, false otherwise.
+	 */
+	public function isValidEmailFormat(string $recoveryEmail): bool {
+		return filter_var($recoveryEmail, FILTER_VALIDATE_EMAIL) !== false;
+	}
+
 	/**
 	 * Create a Hide My Email (HME) alias for a user.
 	 *
diff --git a/src/Signup.vue b/src/Signup.vue
index 4fa39636..d6b2fc40 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -100,7 +100,7 @@ export default {
 				this.showSuccessSection = true
 			} catch (error) {
 				// Handle network errors and unexpected response structures here
-				const errorMessage = error.response ? error.response.data.message : error.message
+				const errorMessage = error.response ? t(this.appName, error.response.data.message) : t(this.appName, error.message)
 				this.showMessage(errorMessage, 'error')
 			}
 		},
-- 
GitLab


From 6c0a77a006f966a958144e1003a9ee42b445d57d Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 11 Mar 2024 09:43:38 +0000
Subject: [PATCH 064/185] added null as return parameter

---
 lib/Service/UserService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index b6097b37..55b74cd0 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -96,6 +96,7 @@ class UserService {
 		if($this->userExists($uid)) {
 			return $this->userManager->get($uid);
 		}
+		return null;
 	}
 
 	public function setRecoveryEmail(string $uid, string $recoveryEmail): void {
-- 
GitLab


From 261e8b66f6b48e5821f264deb0fd289121717b7e Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Wed, 20 Mar 2024 08:10:05 +0000
Subject: [PATCH 065/185] Better error logging and message when there is an
 ldap error while creating

---
 l10n/de.js                                  |  3 +-
 l10n/de.json                                |  3 +-
 l10n/en.js                                  |  3 +-
 l10n/en.json                                |  3 +-
 l10n/es.js                                  |  3 +-
 l10n/es.json                                |  3 +-
 l10n/fr.js                                  |  3 +-
 l10n/fr.json                                |  3 +-
 l10n/it.js                                  |  3 +-
 l10n/it.json                                |  3 +-
 lib/Controller/AccountController.php        |  8 ++-
 lib/Exception/LDAPUserCreationException.php |  9 ++++
 lib/Service/UserService.php                 | 54 ++++++++++-----------
 13 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 lib/Exception/LDAPUserCreationException.php

diff --git a/l10n/de.js b/l10n/de.js
index 9785af83..85981868 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -82,6 +82,7 @@ OC.L10N.register(
 		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
 		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
-		"Captcha is not verified!": "Captcha wird nicht überprüft!"
+		"Captcha is not verified!": "Captcha wird nicht überprüft!",
+		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 09a7588c..93a91342 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -80,7 +80,8 @@
 		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
 		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
-		"Captcha is not verified!": "Captcha wird nicht überprüft!"
+		"Captcha is not verified!": "Captcha wird nicht überprüft!",
+		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 3d9794a3..70409d73 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -86,6 +86,7 @@ OC.L10N.register(
 		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
 		"Recovery email address is already taken.": "Recovery email address is already taken.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
-		"Captcha is not verified!": "Captcha is not verified!"
+		"Captcha is not verified!": "Captcha is not verified!",
+		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index d61942f9..cb446611 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -82,7 +82,8 @@
 		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
 		"Recovery email address is already taken.": "Recovery email address is already taken.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
-		"Captcha is not verified!": "Captcha is not verified!"
+		"Captcha is not verified!": "Captcha is not verified!",
+		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index 72f2b282..619717cb 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"Recovery email address has an incorrect format.": "La dirección de correo electrónico de recuperación tiene un formato incorrecto.",
 		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
-		"Captcha is not verified!": "¡Captcha no está verificado!"
+		"Captcha is not verified!": "¡Captcha no está verificado!",
+		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 409ea77b..13871c86 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -83,7 +83,8 @@
 		"Recovery email address has an incorrect format.": "La dirección de correo electrónico de recuperación tiene un formato incorrecto.",
 		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
-		"Captcha is not verified!": "¡Captcha no está verificado!"
+		"Captcha is not verified!": "¡Captcha no está verificado!",
+		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 2b327ea3..2c4914e0 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -83,6 +83,7 @@ OC.L10N.register(
 		"Recovery email address has an incorrect format.": "Le format de l'adresse électronique de récupération est incorrect.",
 		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
-		"Captcha is not verified!": "Captcha n'est pas vérifié !"
+		"Captcha is not verified!": "Captcha n'est pas vérifié !",
+		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 26fcbfef..60e11c06 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -82,7 +82,8 @@
 		"Recovery email address has an incorrect format.": "Le format de l'adresse électronique de récupération est incorrect.",
 		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
-		"Captcha is not verified!": "Captcha n'est pas vérifié !"
+		"Captcha is not verified!": "Captcha n'est pas vérifié !",
+		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index f3cf4249..7a246e1e 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -83,6 +83,7 @@ OC.L10N.register(
 		"Recovery email address has an incorrect format.": "L'indirizzo e-mail di recupero ha un formato errato.",
 		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
-		"Captcha is not verified!": "Il Captcha non è verificato!"
+		"Captcha is not verified!": "Il Captcha non è verificato!",
+		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index e4ad86d6..a62613bd 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -78,7 +78,8 @@
 		"Recovery email address has an incorrect format.": "L'indirizzo e-mail di recupero ha un formato errato.",
 		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
-		"Captcha is not verified!": "Il Captcha non è verificato!"
+		"Captcha is not verified!": "Il Captcha non è verificato!",
+		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 6aa58aef..18a1613a 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -137,8 +137,9 @@ class AccountController extends Controller {
 		try {
 			$mainDomain = $this->userService->getMainDomain();
 			$userEmail = $username.'@'.$mainDomain;
-
 			$newUserEntry = $this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
+			sleep(2);
+
 			$this->userService->setAccountDataLocally($username, $userEmail, $newUserEntry['quota']);
 			$this->userService->createHMEAlias($username, $userEmail);
 			$this->userService->createNewDomainAlias($username, $userEmail);
@@ -160,10 +161,13 @@ class AccountController extends Controller {
 			} catch (Exception $e) {
 				$this->logger->logException($e, ['app' => Application::APP_ID]);
 			}
-			
 			$response->setStatus(200);
 			$response->setData(['success' => true]);
 
+		} catch (LDAPUserCreationException | Error $e) {
+			$this->logger->logException($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 (Exception $e) {
 			$response->setData(['message' => $e->getMessage(), 'success' => false]);
 			$response->setStatus(500);
diff --git a/lib/Exception/LDAPUserCreationException.php b/lib/Exception/LDAPUserCreationException.php
new file mode 100644
index 00000000..bfdd7cb8
--- /dev/null
+++ b/lib/Exception/LDAPUserCreationException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class LDAPUserCreationException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 55b74cd0..1cf1ffdc 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -8,6 +8,7 @@ require __DIR__ . '/../../vendor/autoload.php';
 
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCP\Defaults;
 use OCP\IConfig;
 use OCP\ILogger;
@@ -15,8 +16,8 @@ use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Util;
-use Throwable;
 
+use Throwable;
 use UnexpectedValueException;
 
 class UserService {
@@ -241,6 +242,7 @@ class UserService {
 	 *
 	 * @return array An array containing information about the registered user.
 	 * @throws Exception If the username or recovery email is already taken.
+	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
 	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): array {
 		
@@ -281,39 +283,34 @@ class UserService {
 	 * @param string $password The password of the new user.
 	 *
 	 * @return array Information about the added user.
-	 * @throws Exception If there is an error while creating the Murena account.
+	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
 	private function addNewUserToLDAP(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): ?array {
-		try {
-			$connection = $this->LDAPConnectionService->getLDAPConnection();
-			$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
+		$connection = $this->LDAPConnectionService->getLDAPConnection();
+		$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
 		
-			$newUserDN = "username=$username," . $base;
+		$newUserDN = "username=$username," . $base;
 		
-			$newUserEntry = [
-				'mailAddress' => $userEmail,
-				'username' => $username,
-				'usernameWithoutDomain' => $username,
-				'userPassword' => $password,
-				'displayName' => $displayname,
-				'quota' => $this->LDAPConnectionService->getLdapQuota(),
-				'recoveryMailAddress' => $recoveryEmail,
-				'active' => 'TRUE',
-				'mailActive' => 'TRUE',
-				'userClusterID' => $this->apiConfig['userCluserId'],
-				'objectClass' => $this->apiConfig['objectClass']
-			];
-
-			$ret = ldap_add($connection, $newUserDN, $newUserEntry);
+		$newUserEntry = [
+			'mailAddress' => $userEmail,
+			'username' => $username,
+			'usernameWithoutDomain' => $username,
+			'userPassword' => $password,
+			'displayName' => $displayname,
+			'quota' => $this->LDAPConnectionService->getLdapQuota(),
+			'recoveryMailAddress' => $recoveryEmail,
+			'active' => 'TRUE',
+			'mailActive' => 'TRUE',
+			'userClusterID' => $this->apiConfig['userCluserId'],
+			'objectClass' => $this->apiConfig['objectClass']
+		];
+
+		$ret = ldap_add($connection, $newUserDN, $newUserEntry);
 		
-			if (!$ret) {
-				throw new Exception("Error while creating Murena account.");
-			}
-			return $newUserEntry;
-		} catch (Exception $e) {
-			$this->logger->error('Error adding adding new user to LDAP: ' . $username . ': ' . $e->getMessage());
-			return null;
+		if (!$ret) {
+			throw new LDAPUserCreationException("Error while adding entry to LDAP for username: " .  $username . ' Error: ' . ldap_error($connection), ldap_errno($connection));
 		}
+		return $newUserEntry;
 	}
 	/**
 	 * Check if a recovery email address is available (not already taken by another user).
@@ -441,7 +438,6 @@ class UserService {
 	 * @return void
 	 */
 	public function setAccountDataLocally(string $uid, string $mailAddress, string $quota): void {
-		
 		$user = $this->getUser($uid);
 		if (is_null($user)) {
 			$this->logger->error('User not found');
-- 
GitLab


From 50fb05ac155a30aff2ee489dbae42d790df6f242 Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Tue, 26 Mar 2024 05:05:32 +0000
Subject: [PATCH 066/185] Ecloud-Accounts version  bump -NC27

---
 appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0d326733..0d83ecbb 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>4.0.1</version>
+    <version>5.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="26" max-version="26"/>
+        <nextcloud min-version="27" max-version="27"/>
     </dependencies>
 	<settings>
 		<personal>OCA\EcloudAccounts\Settings\DeleteShopAccountSetting</personal>
-- 
GitLab


From 8096a7759a3812f433ba874e1ec0aa731929cade Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 1 Apr 2024 07:23:42 +0000
Subject: [PATCH 067/185] Adding into Bytes

---
 lib/Service/UserService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 1cf1ffdc..5b3d2055 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -290,14 +290,14 @@ class UserService {
 		$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
 		
 		$newUserDN = "username=$username," . $base;
-		
+		$quota = $this->LDAPConnectionService->getLdapQuota() * 1024 * 1024;
 		$newUserEntry = [
 			'mailAddress' => $userEmail,
 			'username' => $username,
 			'usernameWithoutDomain' => $username,
 			'userPassword' => $password,
 			'displayName' => $displayname,
-			'quota' => $this->LDAPConnectionService->getLdapQuota(),
+			'quota' => $quota,
 			'recoveryMailAddress' => $recoveryEmail,
 			'active' => 'TRUE',
 			'mailActive' => 'TRUE',
-- 
GitLab


From feceb5d127e159f235ef27c2c15490d900bbe795 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 4 Apr 2024 19:14:18 +0000
Subject: [PATCH 068/185] better error handling

---
 l10n/de.js                           |  3 ++-
 l10n/de.json                         |  3 ++-
 l10n/en.js                           |  3 ++-
 l10n/en.json                         |  3 ++-
 l10n/es.js                           |  3 ++-
 l10n/es.json                         |  3 ++-
 l10n/fr.js                           |  3 ++-
 l10n/fr.json                         |  3 ++-
 l10n/it.js                           |  3 ++-
 l10n/it.json                         |  3 ++-
 lib/Controller/AccountController.php |  3 ++-
 lib/Service/UserService.php          | 24 +++++++++++++-----------
 12 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/l10n/de.js b/l10n/de.js
index 85981868..1bfab173 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -83,6 +83,7 @@ OC.L10N.register(
 		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
-		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal."
+		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 93a91342..2c366a49 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -81,7 +81,8 @@
 		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
-		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal."
+		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 70409d73..6f8b1160 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -87,6 +87,7 @@ OC.L10N.register(
 		"Recovery email address is already taken.": "Recovery email address is already taken.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
 		"Captcha is not verified!": "Captcha is not verified!",
-		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later."
+		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
+		"An error occurred while creating your account!": "An error occurred while creating your account!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index cb446611..218c5274 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -83,7 +83,8 @@
 		"Recovery email address is already taken.": "Recovery email address is already taken.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
 		"Captcha is not verified!": "Captcha is not verified!",
-		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later."
+		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
+		"An error occurred while creating your account!": "An error occurred while creating your account!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index 619717cb..95703173 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -85,6 +85,7 @@ OC.L10N.register(
 		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
-		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde."
+		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 13871c86..399c0553 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -84,7 +84,8 @@
 		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
-		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde."
+		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 2c4914e0..2f4e72f9 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
-		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement."
+		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 60e11c06..6f7697ec 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -83,7 +83,8 @@
 		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
-		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement."
+		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 7a246e1e..b65ec705 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
-		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi."
+		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index a62613bd..0f03e188 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -79,7 +79,8 @@
 		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
 		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
-		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi."
+		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 18a1613a..17d6e4c9 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -169,7 +169,8 @@ class AccountController extends Controller {
 			$response->setData(['message' => 'A server-side error occurred while processing your request! Please try again later.', 'success' => false]);
 			$response->setStatus(500);
 		} catch (Exception $e) {
-			$response->setData(['message' => $e->getMessage(), 'success' => false]);
+			$this->logger->logException($e, ['app' => Application::APP_ID]);
+			$response->setData(['message' => 'An error occurred while creating your account!', 'success' => false]);
 			$response->setStatus(500);
 		}
 
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 5b3d2055..3cb2b910 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -126,6 +126,7 @@ class UserService {
 			$this->config->setUserValue($uid, 'hide-my-email', 'email-aliases', $aliases);
 			return true;
 		} catch (UnexpectedValueException $e) {
+			$this->logger->error("Error adding HME alias '$alias' to config for user with UID: $uid. Error: " . $e->getMessage());
 			return false;
 		}
 	}
@@ -247,13 +248,12 @@ class UserService {
 	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): array {
 		
 		if ($this->userExists($username)) {
-			throw new Exception("Username is already taken.");
+			throw new Exception("Username '$username' is already taken.");
 		}
 		if (!empty($recoveryEmail)) {
 			$this->validateRecoveryEmail($recoveryEmail);
 		}
 		return $this->addNewUserToLDAP($displayname, $recoveryEmail, $username, $userEmail, $password);
-		
 	}
 	/**
 	 * Validates the recovery email address.
@@ -285,7 +285,7 @@ class UserService {
 	 * @return array Information about the added user.
 	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
-	private function addNewUserToLDAP(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): ?array {
+	private function addNewUserToLDAP(string $displayName, string $recoveryEmail, string $username, string $userEmail, string $password): ?array {
 		$connection = $this->LDAPConnectionService->getLDAPConnection();
 		$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
 		
@@ -296,7 +296,7 @@ class UserService {
 			'username' => $username,
 			'usernameWithoutDomain' => $username,
 			'userPassword' => $password,
-			'displayName' => $displayname,
+			'displayName' => $displayName,
 			'quota' => $quota,
 			'recoveryMailAddress' => $recoveryEmail,
 			'active' => 'TRUE',
@@ -394,8 +394,10 @@ class UserService {
 		if($hmeAlias != '') {
 			$hmeAliasAdded = $this->addHMEAliasInConfig($username, $hmeAlias);
 			if (!$hmeAliasAdded) {
-				$this->logger->error('Error adding HME Alias in config.');
+				$this->logger->error("Failed to add HME Alias '$hmeAlias' for username '$username' in config.");
 			}
+		} else {
+			$this->logger->error("Failed to create HME Alias for username '$username'. Response: " . json_encode($result));
 		}
 	}
 	/**
@@ -426,6 +428,9 @@ class UserService {
 		
 		$result = $this->curl->post($url, $data, $headers);
 		$result = json_decode($result, true);
+		if ($this->curl->getLastStatusCode() !== 200) {
+			$this->logger->error("Failed to create new domain alias '$username' for email '$userEmail'.");
+		}
 		return $result;
 	}
 	/**
@@ -440,10 +445,8 @@ class UserService {
 	public function setAccountDataLocally(string $uid, string $mailAddress, string $quota): void {
 		$user = $this->getUser($uid);
 		if (is_null($user)) {
-			$this->logger->error('User not found');
-			return;
+			throw new Exception("User with username '$uid' not found.");
 		}
-		
 		// Set the email address for the user
 		$user->setEMailAddress($mailAddress);
 		
@@ -477,8 +480,7 @@ class UserService {
 		if ($statusCode === 200) {
 			return true;
 		}
-
-		throw new Exception("Error checking if username is taken at common source, status code: " . (string) $statusCode);
+		throw new Exception("Error checking if username '$username' is taken at common source, status code: " . (string) $statusCode);
 	}
 
 	public function addUsernameToCommonDataStore(string $username) : void {
@@ -503,7 +505,7 @@ class UserService {
 		$this->curl->post($url, $params, $headers);
 
 		if ($this->curl->getLastStatusCode() !== 200) {
-			throw new Exception('Error adding username ' . $username . ' to common data store');
+			throw new Exception("Error adding username '$username' to common data store.");
 		}
 	}
 }
-- 
GitLab


From 70382c22783f1128d89e6bc7f56e320da8fb18e3 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 8 Apr 2024 12:11:29 +0000
Subject: [PATCH 069/185] Removed nested try-catch

---
 lib/Controller/AccountController.php              | 12 +++++++-----
 .../AddUsernameToCommonStoreException.php         |  9 +++++++++
 lib/Service/UserService.php                       | 15 +++++++++++++--
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 lib/Exception/AddUsernameToCommonStoreException.php

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 17d6e4c9..3dae3d79 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -8,6 +8,8 @@ namespace OCA\EcloudAccounts\Controller;
 
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
+use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCA\EcloudAccounts\Service\CaptchaService;
 use OCA\EcloudAccounts\Service\NewsLetterService;
 use OCA\EcloudAccounts\Service\UserService;
@@ -156,11 +158,7 @@ class AccountController extends Controller {
 			$this->session->remove(self::SESSION_USERNAME_CHECK);
 			$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
 
-			try {
-				$this->userService->addUsernameToCommonDataStore($username);
-			} catch (Exception $e) {
-				$this->logger->logException($e, ['app' => Application::APP_ID]);
-			}
+			$this->userService->addUsernameToCommonDataStore($username);
 			$response->setStatus(200);
 			$response->setData(['success' => true]);
 
@@ -168,6 +166,10 @@ class AccountController extends Controller {
 			$this->logger->logException($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 (AddUsernameToCommonStoreException $e) {
+			$this->logger->logException($e, ['app' => Application::APP_ID]);
+			$response->setStatus(200);
+			$response->setData(['success' => true]);
 		} catch (Exception $e) {
 			$this->logger->logException($e, ['app' => Application::APP_ID]);
 			$response->setData(['message' => 'An error occurred while creating your account!', 'success' => false]);
diff --git a/lib/Exception/AddUsernameToCommonStoreException.php b/lib/Exception/AddUsernameToCommonStoreException.php
new file mode 100644
index 00000000..c7fa6da0
--- /dev/null
+++ b/lib/Exception/AddUsernameToCommonStoreException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class AddUsernameToCommonStoreException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 3cb2b910..c39f4c04 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -8,6 +8,7 @@ require __DIR__ . '/../../vendor/autoload.php';
 
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCP\Defaults;
 use OCP\IConfig;
@@ -482,7 +483,17 @@ class UserService {
 		}
 		throw new Exception("Error checking if username '$username' is taken at common source, status code: " . (string) $statusCode);
 	}
-
+	/**
+	 * Adds a username to the common data store.
+	 *
+	 * This method sends a POST request to the common data store API endpoint to add a username.
+	 * If the operation is successful, the username will be added to the data store.
+	 * If the operation fails, an exception will be thrown.
+	 *
+	 * @param string $username The username to add to the common data store.
+	 *
+	 * @throws AddUsernameToCommonStoreException If an error occurs while adding the username to the common data store.
+	 */
 	public function addUsernameToCommonDataStore(string $username) : void {
 		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
@@ -505,7 +516,7 @@ class UserService {
 		$this->curl->post($url, $params, $headers);
 
 		if ($this->curl->getLastStatusCode() !== 200) {
-			throw new Exception("Error adding username '$username' to common data store.");
+			throw new AddUsernameToCommonStoreException("Error adding username '$username' to common data store.");
 		}
 	}
 }
-- 
GitLab


From a4213b7760b28ef38fa2dfc214447b8c6b11bceb Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 15 Apr 2024 08:15:47 +0000
Subject: [PATCH 070/185] Convertion of Quota in MB for nextcloud

---
 lib/Controller/AccountController.php |  4 ++--
 lib/Service/UserService.php          | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 3dae3d79..35a14372 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -139,10 +139,10 @@ class AccountController extends Controller {
 		try {
 			$mainDomain = $this->userService->getMainDomain();
 			$userEmail = $username.'@'.$mainDomain;
-			$newUserEntry = $this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
+			$this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
 			sleep(2);
 
-			$this->userService->setAccountDataLocally($username, $userEmail, $newUserEntry['quota']);
+			$this->userService->setAccountDataLocally($username, $userEmail);
 			$this->userService->createHMEAlias($username, $userEmail);
 			$this->userService->createNewDomainAlias($username, $userEmail);
 			$this->userService->setTOS($username, true);
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index c39f4c04..a347655c 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -242,11 +242,11 @@ class UserService {
 	 * @param string $userEmail The email address of the user.
 	 * @param string $password The password chosen by the user.
 	 *
-	 * @return array An array containing information about the registered user.
+	 * @return void
 	 * @throws Exception If the username or recovery email is already taken.
 	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
-	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): array {
+	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): void {
 		
 		if ($this->userExists($username)) {
 			throw new Exception("Username '$username' is already taken.");
@@ -254,7 +254,7 @@ class UserService {
 		if (!empty($recoveryEmail)) {
 			$this->validateRecoveryEmail($recoveryEmail);
 		}
-		return $this->addNewUserToLDAP($displayname, $recoveryEmail, $username, $userEmail, $password);
+		$this->addNewUserToLDAP($displayname, $recoveryEmail, $username, $userEmail, $password);
 	}
 	/**
 	 * Validates the recovery email address.
@@ -283,15 +283,17 @@ class UserService {
 	 * @param string $userEmail The email address of the new user.
 	 * @param string $password The password of the new user.
 	 *
-	 * @return array Information about the added user.
+	 * @return void
 	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
-	private function addNewUserToLDAP(string $displayName, string $recoveryEmail, string $username, string $userEmail, string $password): ?array {
+	private function addNewUserToLDAP(string $displayName, string $recoveryEmail, string $username, string $userEmail, string $password): void {
 		$connection = $this->LDAPConnectionService->getLDAPConnection();
 		$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
 		
 		$newUserDN = "username=$username," . $base;
-		$quota = $this->LDAPConnectionService->getLdapQuota() * 1024 * 1024;
+		
+		$quota = $this->getDefaultQuota() * 1024 * 1024;
+		
 		$newUserEntry = [
 			'mailAddress' => $userEmail,
 			'username' => $username,
@@ -305,13 +307,12 @@ class UserService {
 			'userClusterID' => $this->apiConfig['userCluserId'],
 			'objectClass' => $this->apiConfig['objectClass']
 		];
-
+		
 		$ret = ldap_add($connection, $newUserDN, $newUserEntry);
 		
 		if (!$ret) {
 			throw new LDAPUserCreationException("Error while adding entry to LDAP for username: " .  $username . ' Error: ' . ldap_error($connection), ldap_errno($connection));
 		}
-		return $newUserEntry;
 	}
 	/**
 	 * Check if a recovery email address is available (not already taken by another user).
@@ -443,14 +444,14 @@ class UserService {
 	 *
 	 * @return void
 	 */
-	public function setAccountDataLocally(string $uid, string $mailAddress, string $quota): void {
+	public function setAccountDataLocally(string $uid, string $mailAddress): void {
 		$user = $this->getUser($uid);
 		if (is_null($user)) {
 			throw new Exception("User with username '$uid' not found.");
 		}
 		// Set the email address for the user
 		$user->setEMailAddress($mailAddress);
-		
+		$quota = $this->getDefaultQuota();
 		// Format and set the quota for the user (in megabytes)
 		$quota = strval($quota) . ' MB';
 		$user->setQuota($quota);
@@ -519,4 +520,7 @@ class UserService {
 			throw new AddUsernameToCommonStoreException("Error adding username '$username' to common data store.");
 		}
 	}
+	private function getDefaultQuota() {
+		return $this->config->getSystemValueInt('default_quota_in_megabytes', 1024);
+	}
 }
-- 
GitLab


From c1608db2c7a79d1955f406e88d682c98967c5a05 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 23 Apr 2024 18:54:07 +0000
Subject: [PATCH 071/185] Migrate to API calls for 2FA sync with SSO

---
 README.md                                     |  11 +
 appinfo/info.xml                              |   2 +-
 lib/Command/Migrate2FASecrets.php             |  10 +-
 lib/Db/SSOMapper.php                          | 193 ----------------
 lib/Exception/SSOAdminAPIException.php        |   9 +
 .../SSOAdminAccessTokenException.php          |   9 +
 .../TwoFactorStateChangedListener.php         |  19 +-
 lib/Service/CurlService.php                   |  39 +++-
 lib/Service/SSOService.php                    | 216 ++++++++++++++++++
 9 files changed, 289 insertions(+), 219 deletions(-)
 delete mode 100644 lib/Db/SSOMapper.php
 create mode 100644 lib/Exception/SSOAdminAPIException.php
 create mode 100644 lib/Exception/SSOAdminAccessTokenException.php
 create mode 100644 lib/Service/SSOService.php

diff --git a/README.md b/README.md
index d5a0529d..42c9c93d 100644
--- a/README.md
+++ b/README.md
@@ -57,3 +57,14 @@ The values should be set as follows:
 'welcome_sendgrid_template_ids' => [ 'en' => 'EN_TEMPLATE_ID', 'es' => 'ES_TEMPLATE_ID', ... ]
 ...
 ```
+
+## Sync 2FA secrets with Keycloak based SSO service
+
+- Enable admin service client in Keycloak
+- Configure the following parameters in `config.php`:
+  - `oidc_admin_client_id` (client ID of the admin service client)
+  - `oidc_admin_client_secret` (client secret of the admin service client)
+  - `oidc_admin_username` (username of admin account)
+  - `oidc_admin_password` (password of admin account)
+  - `oidc_login_provider_url` (provider URL: see also https://github.com/pulsejet/nextcloud-oidc-login)
+  - `oidc_admin_sync_2fa` -> (set to boolean value true to enable sync; defaults to false)
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0d83ecbb..351006aa 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>5.0.0</version>
+    <version>5.1.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/Command/Migrate2FASecrets.php b/lib/Command/Migrate2FASecrets.php
index 79228be2..69683768 100644
--- a/lib/Command/Migrate2FASecrets.php
+++ b/lib/Command/Migrate2FASecrets.php
@@ -4,20 +4,20 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
-use OCA\EcloudAccounts\Db\SSOMapper;
 use OCA\EcloudAccounts\Db\TwoFactorMapper;
+use OCA\EcloudAccounts\Service\SSOService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Migrate2FASecrets extends Command {
-	private SSOMapper $ssoMapper;
+	private SSOService $ssoService;
 	private TwoFactorMapper $twoFactorMapper;
 	private OutputInterface $commandOutput;
 
-	public function __construct(SSOMapper $ssoMapper, TwoFactorMapper $twoFactorMapper) {
-		$this->ssoMapper = $ssoMapper;
+	public function __construct(SSOService $ssoService, TwoFactorMapper $twoFactorMapper) {
+		$this->ssoService = $ssoService;
 		$this->twoFactorMapper = $twoFactorMapper;
 		parent::__construct();
 	}
@@ -60,7 +60,7 @@ class Migrate2FASecrets extends Command {
 		$entries = $this->twoFactorMapper->getEntries($usernames);
 		foreach ($entries as $entry) {
 			try {
-				$this->ssoMapper->migrateCredential($entry['username'], $entry['secret']);
+				$this->ssoService->migrateCredential($entry['username'], $entry['secret']);
 			} catch (\Exception $e) {
 				$this->commandOutput->writeln('Error inserting entry for user ' . $entry['username'] . ' message: ' . $e->getMessage());
 				continue;
diff --git a/lib/Db/SSOMapper.php b/lib/Db/SSOMapper.php
deleted file mode 100644
index 89f4af88..00000000
--- a/lib/Db/SSOMapper.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace OCA\EcloudAccounts\Db;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DriverManager;
-use OCA\EcloudAccounts\AppInfo\Application;
-use OCA\EcloudAccounts\Exception\DbConnectionParamsException;
-use OCP\IConfig;
-use OCP\ILogger;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\L10N\IFactory;
-use OCP\Security\ICrypto;
-
-class SSOMapper {
-	private IConfig $config;
-	private ILogger $logger;
-	private Connection $conn;
-	private IUserManager $userManager;
-	private ICrypto $crypto;
-	private IFactory $l10nFactory;
-
-	private const USER_ATTRIBUTE_TABLE = 'USER_ATTRIBUTE';
-	private const CREDENTIAL_TABLE = 'CREDENTIAL';
-	private const SSO_CONFIG_KEY = 'keycloak';
-
-	public function __construct(IConfig $config, IUserManager $userManager, ILogger $logger, ICrypto $crypto, IFactory $l10nFactory) {
-		$this->l10nFactory = $l10nFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->crypto = $crypto;
-		if (!empty($this->config->getSystemValue(self::SSO_CONFIG_KEY))) {
-			$this->initConnection();
-		}
-	}
-
-	public function isSSOEnabled() : bool {
-		return isset($this->conn);
-	}
-
-	public function getUserId(string $username) : string {
-		$qb = $this->conn->createQueryBuilder();
-		$qb->select('USER_ID')
-			->from(self::USER_ATTRIBUTE_TABLE)
-			->where('NAME = "LDAP_ID"')
-			->andWhere('VALUE = :username');
-			
-		$qb->setParameter('username', $username);
-		$result = $qb->execute();
-		return (string) $result->fetchOne();
-	}
-
-	public function deleteCredentials(string $username) {
-		$userId = $this->getUserId($username);
-		$qb = $this->conn->createQueryBuilder();
-		$qb->delete(self::CREDENTIAL_TABLE)
-			->where('USER_ID = :username')
-			->andWhere('TYPE = "otp"')
-			->andWhere('CREDENTIAL_DATA LIKE "%\"subType\":\"totp\"%"')
-			->setParameter('username', $userId)
-			->execute();
-	}
-
-	public function migrateCredential(string $username, string $secret) {
-		if (!$this->userManager->get($username) instanceof IUser) {
-			throw new \Exception('No user found in nextcloud with given username');
-		}
-
-		$decryptedSecret = $this->crypto->decrypt($secret);
-		$ssoUserId = $this->getUserId($username);
-		if (empty($ssoUserId)) {
-			throw new \Exception('Does not exist in SSO database');
-		}
-
-		$language = $this->config->getUserValue($username, 'core', 'lang', 'en');
-
-		// Only one 2FA device at  a time
-		$this->deleteCredentials($username);
-
-		$entry = $this->getCredentialEntry($decryptedSecret, $ssoUserId, $language);
-		$this->insertCredential($entry);
-	}
-
-	public function insertCredential(array $entry) : void {
-		$qb = $this->conn->createQueryBuilder();
-		$qb->insert(self::CREDENTIAL_TABLE)
-			->values($entry)
-			->execute();
-	}
-
-	/**
-	 * Create secret entry compatible with Keycloak schema
-	 *
-	 * @return array
-	 */
-
-	private function getCredentialEntry(string $secret, string $ssoUserId, string $language) : array {
-		// Create the random UUID from the sso user ID so multiple entries of same credential do not happen
-		$id = $this->randomUUID(substr($ssoUserId, 0, 16));
-
-		$l10n = $this->l10nFactory->get(Application::APP_ID, $language);
-		$userLabel = $l10n->t('Murena Cloud 2FA');
-
-		$credentialEntry = [
-			'ID' => $id,
-			'USER_ID' => $ssoUserId,
-			'USER_LABEL' => $userLabel,
-			'TYPE' => 'otp',
-			'SECRET_DATA' => json_encode([
-				'value' => $secret
-			]),
-			'CREDENTIAL_DATA' => json_encode([
-				'subType' => 'totp',
-				'period' => 30,
-				'digits' => 6,
-				'algorithm' => 'HmacSHA1',
-				'secretEncoding' => 'BASE32',
-			]),
-		];
-
-		foreach ($credentialEntry as $key => &$value) {
-			$value = "'" . $value . "'";
-		}
-		$credentialEntry['CREATED_DATE'] = round(microtime(true) * 1000);
-		$credentialEntry['PRIORITY'] = 10;
-
-		return $credentialEntry;
-	}
-
-	private function initConnection() : void {
-		try {
-			$params = $this->getConnectionParams();
-			$this->conn = DriverManager::getConnection($params);
-		} catch (Throwable $e) {
-			$this->logger->error('Error connecting to Keycloak database: ' . $e->getMessage());
-		}
-	}
-
-	private function isDbConfigValid($config) : bool {
-		if (!$config || !is_array($config)) {
-			return false;
-		}
-		if (!isset($config['db_port'])) {
-			$config['db_port'] = 3306;
-		}
-
-		return isset($config['db_name'])
-			&& isset($config['db_user'])
-			&& isset($config['db_password'])
-			&& isset($config['db_host'])
-			&& isset($config['db_port']) ;
-	}
-
-	private function getConnectionParams() : array {
-		$config = $this->config->getSystemValue(self::SSO_CONFIG_KEY);
-		
-		if (!$this->isDbConfigValid($config)) {
-			throw new DbConnectionParamsException('Invalid SSO database configuration!');
-		}
-
-		$params = [
-			'dbname' => $config['db_name'],
-			'user' => $config['db_user'],
-			'password' => $config['db_password'],
-			'host' => $config['db_host'],
-			'port' => $config['db_port'],
-			'driver' => 'pdo_mysql'
-		];
-		return $params;
-	}
-
-	/**
-	 *	From https://www.uuidgenerator.net/dev-corner/php
-	 *	As keycloak generates random UUIDs using the java.util.UUID class which is RFC 4122 compliant
-	 *
-	 *   @return string
-	 */
-	private function randomUUID($data = null) : string {
-		// Generate 16 bytes (128 bits) of random data or use the data passed into the function.
-		$data = $data ?? random_bytes(16);
-		assert(strlen($data) == 16);
-	
-		// Set version to 0100
-		$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
-		// Set bits 6-7 to 10
-		$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
-	
-		// Output the 36 character UUID.
-		return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
-	}
-}
diff --git a/lib/Exception/SSOAdminAPIException.php b/lib/Exception/SSOAdminAPIException.php
new file mode 100644
index 00000000..675dd687
--- /dev/null
+++ b/lib/Exception/SSOAdminAPIException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class SSOAdminAPIException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Exception/SSOAdminAccessTokenException.php b/lib/Exception/SSOAdminAccessTokenException.php
new file mode 100644
index 00000000..aa00ebcc
--- /dev/null
+++ b/lib/Exception/SSOAdminAccessTokenException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class SSOAdminAccessTokenException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Listeners/TwoFactorStateChangedListener.php b/lib/Listeners/TwoFactorStateChangedListener.php
index 1c93df33..32308841 100644
--- a/lib/Listeners/TwoFactorStateChangedListener.php
+++ b/lib/Listeners/TwoFactorStateChangedListener.php
@@ -4,9 +4,9 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Listeners;
 
-use Exception;
-use OCA\EcloudAccounts\Db\SSOMapper;
+use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Db\TwoFactorMapper;
+use OCA\EcloudAccounts\Service\SSOService;
 use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\App\IAppManager;
 use OCP\EventDispatcher\Event;
@@ -16,22 +16,22 @@ use OCP\ILogger;
 class TwoFactorStateChangedListener implements IEventListener {
 	private IAppManager $appManager;
 	private TwoFactorMapper $twoFactorMapper;
-	private SSOMapper $ssoMapper;
+	private SSOService $ssoService;
 	private ILogger $logger;
 
 	private const TWOFACTOR_APP_ID = 'twofactor_totp';
 
 
-	public function __construct(IAppManager $appManager, SSOMapper $ssoMapper, TwoFactorMapper $twoFactorMapper, ILogger $logger) {
+	public function __construct(IAppManager $appManager, SSOService $ssoService, TwoFactorMapper $twoFactorMapper, ILogger $logger) {
 		$this->appManager = $appManager;
-		$this->ssoMapper = $ssoMapper;
+		$this->ssoService = $ssoService;
 		$this->twoFactorMapper = $twoFactorMapper;
 		$this->logger = $logger;
 	}
 
 
 	public function handle(Event $event): void {
-		if (!($event instanceof StateChanged) || !$this->appManager->isEnabledForUser(self::TWOFACTOR_APP_ID) || !$this->ssoMapper->isSSOEnabled()) {
+		if (!($event instanceof StateChanged) || !$this->appManager->isEnabledForUser(self::TWOFACTOR_APP_ID) || !$this->ssoService->shouldSync2FA()) {
 			return;
 		}
 
@@ -41,15 +41,14 @@ class TwoFactorStateChangedListener implements IEventListener {
 			// When state change event is fired by user disabling 2FA, delete existing 2FA credentials and return
 			// i.e. disable 2FA for user at SSO
 			if (!$event->isEnabled()) {
-				$this->ssoMapper->deleteCredentials($username);
+				$this->ssoService->deleteCredentials($username);
 				return;
 			}
 
 			$secret = $this->twoFactorMapper->getSecret($username);
-			$this->ssoMapper->migrateCredential($username, $secret);
+			$this->ssoService->migrateCredential($username, $secret);
 		} catch (Exception $e) {
-			$stateText = $event->isEnabled() ? 'new secret enabled' : 'disabled';
-			$this->logger->error('Error updating secret state(' . $stateText  .') for user: ' . $username . ': ' . $e->getMessage());
+			$this->logger->logException($e, ['app' => Application::APP_ID]);
 		}
 	}
 }
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index 9cf95068..a201e51b 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -46,6 +46,10 @@ class CurlService {
 		return $this->request('DELETE', $url, $params, $headers, $userOptions);
 	}
 
+	public function put($url, $params = [], $headers = [], $userOptions = []) {
+		return $this->request('PUT', $url, $params, $headers, $userOptions);
+	}
+
 	/**
 	 * @return int
 	 */
@@ -54,6 +58,24 @@ class CurlService {
 		return $this->lastStatusCode;
 	}
 
+	private function buildPostData($params = [], $headers = []) {
+		$jsonContent = in_array('Content-Type: application/json', $headers);
+		if ($jsonContent) {
+			$params = json_encode($params);
+			if (json_last_error() !== JSON_ERROR_NONE) {
+				throw new Exception('JSON encoding failed: ' . json_last_error_msg());
+			}
+			return $params;
+		}
+		
+		$formContent = in_array('Content-Type: application/x-www-form-urlencoded', $headers);
+		if ($formContent) {
+			$params = http_build_query($params);
+			return $params;
+		}
+
+		return $params;
+	}
 
 	/**
 	 * Curl run request
@@ -73,7 +95,7 @@ class CurlService {
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_HTTPHEADER => $headers
 		);
-		array_merge($options, $userOptions);
+		$options = array_merge($options, $userOptions);
 		switch ($method) {
 			case 'GET':
 				if ($params) {
@@ -82,14 +104,7 @@ class CurlService {
 				break;
 			case 'POST':
 				$options[CURLOPT_POST] = true;
-				$jsonContent = in_array('Content-Type: application/json', $headers);
-				if ($jsonContent) {
-					$params = json_encode($params);
-					if (json_last_error() !== JSON_ERROR_NONE) {
-						throw new Exception('JSON encoding failed: ' . json_last_error_msg());
-					}
-				}
-				$options[CURLOPT_POSTFIELDS] = $params;
+				$options[CURLOPT_POSTFIELDS] = $this->buildPostData($params, $headers);
 				break;
 			case 'DELETE':
 				$options[CURLOPT_CUSTOMREQUEST] = "DELETE";
@@ -97,8 +112,12 @@ class CurlService {
 					$url = $url . '?' . http_build_query($params);
 				}
 				break;
+			case 'PUT':
+				$options[CURLOPT_CUSTOMREQUEST] = "PUT";
+				$options[CURLOPT_POSTFIELDS] = $this->buildPostData($params, $headers);
+				break;
 			default:
-				throw new Exception('Unsuported method.');
+				throw new Exception('Unsupported method.');
 				break;
 		}
 		$options[CURLOPT_URL] = $url;
diff --git a/lib/Service/SSOService.php b/lib/Service/SSOService.php
new file mode 100644
index 00000000..b176b59d
--- /dev/null
+++ b/lib/Service/SSOService.php
@@ -0,0 +1,216 @@
+<?php
+
+
+namespace OCA\EcloudAccounts\Service;
+
+use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Exception\SSOAdminAccessTokenException;
+use OCA\EcloudAccounts\Exception\SSOAdminAPIException;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\L10N\IFactory;
+use OCP\Security\ICrypto;
+
+class SSOService {
+	private IConfig $config;
+	private string $appName;
+	private CurlService $curl;
+	private ILogger $logger;
+	private array $ssoConfig = [];
+	private string $adminAccessToken;
+	private string $currentUserId;
+	private ICrypto $crypto;
+	private IFactory $l10nFactory;
+
+	private const ADMIN_TOKEN_ENDPOINT = '/auth/realms/master/protocol/openid-connect/token';
+	private const USERS_ENDPOINT = '/users';
+	private const CREDENTIALS_ENDPOINT = '/users/{USER_ID}/credentials';
+
+	public function __construct($appName, IConfig $config, CurlService $curlService, ICrypto $crypto, IFactory $l10nFactory, ILogger $logger) {
+		$this->appName = $appName;
+		$this->config = $config;
+
+		$ssoProviderUrl = $this->config->getSystemValue('oidc_login_provider_url', '');
+		$ssoProviderUrlParts = explode('/auth', $ssoProviderUrl);
+		$rootUrl = $ssoProviderUrlParts[0];
+		$realmsPart = $ssoProviderUrlParts[1];
+
+		$this->ssoConfig['admin_client_id'] = $this->config->getSystemValue('oidc_admin_client_id', '');
+		$this->ssoConfig['admin_client_secret'] = $this->config->getSystemValue('oidc_admin_client_secret', '');
+		$this->ssoConfig['admin_username'] = $this->config->getSystemValue('oidc_admin_username', '');
+		$this->ssoConfig['admin_password'] = $this->config->getSystemValue('oidc_admin_password', '');
+		$this->ssoConfig['admin_rest_api_url'] = $rootUrl . '/auth/admin' . $realmsPart;
+		$this->ssoConfig['root_url'] = $rootUrl;
+		$this->crypto = $crypto;
+		$this->curl = $curlService;
+		$this->logger = $logger;
+		$this->l10nFactory = $l10nFactory;
+	}
+
+	public function shouldSync2FA() : bool {
+		return $this->config->getSystemValue('oidc_admin_sync_2fa', false);
+	}
+
+	public function migrateCredential(string $username, string $secret) : void {
+		if(empty($this->currentUserId)) {
+			$this->getUserId($username);
+		}
+		$this->deleteCredentials($username);
+
+		$decryptedSecret = $this->crypto->decrypt($secret);
+		$language = $this->config->getUserValue($username, 'core', 'lang', 'en');
+		$credentialEntry = $this->getCredentialEntry($decryptedSecret, $language);
+		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '/' . $this->currentUserId;
+
+		$data = [
+			'credentials' => [$credentialEntry]
+		];
+
+		$this->logger->debug('migrateCredential calling SSO API with url: '. $url . ' and data: ' . print_r($data, true));
+		$this->callSSOAPI($url, 'PUT', $data, 204);
+	}
+
+	public function deleteCredentials(string $username) : void {
+		if(empty($this->currentUserId)) {
+			$this->getUserId($username);
+		}
+		$credentialIds = $this->getCredentialIds();
+
+		foreach ($credentialIds as $credentialId) {
+			$url = $this->ssoConfig['admin_rest_api_url'] . self::CREDENTIALS_ENDPOINT;
+			$url = str_replace('{USER_ID}', $this->currentUserId, $url);
+			$url .= '/' . $credentialId;
+			$this->logger->debug('deleteCredentials calling SSO API with url: '. $url);
+			$this->callSSOAPI($url, 'DELETE', [], 204);
+		}
+	}
+
+	private function getCredentialIds() : array {
+		$url = $this->ssoConfig['admin_rest_api_url'] . self::CREDENTIALS_ENDPOINT;
+		$url = str_replace('{USER_ID}', $this->currentUserId, $url);
+		$this->logger->debug('getCredentialIds calling SSO API with url: '. $url);
+
+		$credentials = $this->callSSOAPI($url, 'GET');
+
+		if (empty($credentials) || !is_array($credentials)) {
+			return [];
+		}
+
+		$credentials = array_filter($credentials, function ($credential) {
+			if ($credential['type'] !== 'otp' || !isset($credential['credentialData'])) {
+				return false;
+			}
+			$credentialData = json_decode($credential['credentialData'], true);
+			if (!isset($credentialData['subType']) || !isset($credentialData['subType'])
+				|| $credentialData['subType'] !== 'totp' || $credentialData['secretEncoding'] !== 'BASE32') {
+				return false;
+			}
+			return true;
+		});
+
+		return array_map(function ($credential) {
+			return $credential['id'];
+		}, $credentials);
+	}
+
+	/**
+	 * Create secret entry compatible with Keycloak schema
+	 *
+	 * @return array
+	 */
+
+	private function getCredentialEntry(string $secret, string $language) : array {
+		$l10n = $this->l10nFactory->get(Application::APP_ID, $language);
+		$userLabel = $l10n->t('Murena Cloud 2FA');
+
+		// We build manually instead of json_encode to avoid any tricky escaping issues as this is a nested json object
+		$secretData = '{"value":"' . $secret . '"}';
+		$credentialData = '{"subType":"totp","period":30,"digits":6,"algorithm":"HmacSHA1","secretEncoding":"BASE32"}';
+		$credentialEntry = [
+			'userLabel' => $userLabel,
+			'type' => 'otp',
+			'secretData' => $secretData,
+			'credentialData' => $credentialData
+		];
+		return $credentialEntry;
+	}
+
+	private function getUserId(string $username) : void {
+		$usernameWithoutDomain = explode('@', $username)[0];
+		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '?exact=true&username=' . $usernameWithoutDomain;
+		$this->logger->debug('getUserId calling SSO API with url: '. $url);
+		$users = $this->callSSOAPI($url, 'GET');
+		if (empty($users) || !is_array($users) || !isset($users[0])) {
+			throw new SSOAdminAPIException('Error: no user found for search with url: ' . $url);
+		}
+		$this->currentUserId = $users[0]['id'];
+	}
+
+	private function getAdminAccessToken() : void {
+		if (!empty($this->adminAccessToken)) {
+			return;
+		}
+		$adminAccessTokenRoute = $this->ssoConfig['root_url'] . self::ADMIN_TOKEN_ENDPOINT;
+		$requestBody = [
+			'username' => $this->ssoConfig['admin_username'],
+			'password' => $this->ssoConfig['admin_password'],
+			'client_id' => $this->ssoConfig['admin_client_id'],
+			'client_secret' => $this->ssoConfig['admin_client_secret'],
+			'grant_type' => 'password'
+		];
+
+		$headers = [
+			'Content-Type: application/x-www-form-urlencoded'
+		];
+		$this->logger->debug('getAdminAccessToken calling SSO API with url: '. $adminAccessTokenRoute . ' and headers: ' . print_r($headers, true) . ' and body: ' . print_r($requestBody, true));
+		$response = $this->curl->post($adminAccessTokenRoute, $requestBody, $headers);
+
+		if ($this->curl->getLastStatusCode() !== 200) {
+			$statusCode = strval($this->curl->getLastStatusCode());
+			throw new SSOAdminAccessTokenException('Error getting Admin Access token. Status Code: ' . $statusCode);
+		}
+		$response = json_decode($response, true);
+
+		if (!isset($response['access_token'])) {
+			throw new SSOAdminAccessTokenException('Error: admin access token not set in response!');
+		}
+		$this->adminAccessToken = $response['access_token'];
+	}
+
+	private function callSSOAPI(string $url, string $method, array $data = [], int $expectedStatusCode = 200) :?array {
+		if (empty($url)) {
+			return null;
+		}
+		$this->getAdminAccessToken();
+		$headers = [
+			"cache-control: no-cache",
+			"Content-Type: application/json",
+			"Authorization: Bearer " . $this->adminAccessToken
+		];
+
+		if ($method === 'GET') {
+			$answer = $this->curl->get($url, $data, $headers);
+		}
+
+		if ($method === 'DELETE') {
+			$answer = $this->curl->delete($url, $data, $headers);
+		}
+
+		if ($method === 'POST') {
+			$answer = $this->curl->post($url, $data, $headers);
+		}
+
+		if ($method === 'PUT') {
+			$answer = $this->curl->put($url, $data, $headers);
+		}
+
+		$statusCode = $this->curl->getLastStatusCode();
+
+		if ($statusCode !== $expectedStatusCode) {
+			throw new SSOAdminAPIException('Error calling SSO API with url ' . $url . ' status code: ' . $statusCode);
+		}
+
+		$answer = json_decode($answer, true);
+		return $answer;
+	}
+}
-- 
GitLab


From 61206817091008f4551af1a8a50767e6344a26a0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 30 Apr 2024 10:19:09 +0000
Subject: [PATCH 072/185] UI fixes for newsignup

---
 l10n/de.js                                 |  4 ++--
 l10n/de.json                               |  4 ++--
 l10n/en.js                                 |  4 ++--
 l10n/en.json                               |  4 ++--
 l10n/es.js                                 |  4 ++--
 l10n/es.json                               |  4 ++--
 l10n/fr.js                                 |  4 ++--
 l10n/fr.json                               |  4 ++--
 l10n/it.js                                 |  4 ++--
 l10n/it.json                               |  4 ++--
 scss/ecloud-accounts-userregistration.scss |  4 ++--
 src/signup/RegistrationForm.vue            | 15 ++++++++++-----
 12 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/l10n/de.js b/l10n/de.js
index 1bfab173..373b849a 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -50,8 +50,8 @@ OC.L10N.register(
 		"Display name": "Name anzeigen",
 		"Username": "Benutzername",
 		"Enter Password": "Passwort eingeben",
-		"I want to receive news about Murena products and promotions": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten",
-		"I want to receive news about /e/OS": "Ich möchte Nachrichten über /e/OS erhalten.",
+		"I want to receive news about Murena products and promotions.": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten.",
+		"I want to receive news about /e/OS.": "Ich möchte Nachrichten über /e/OS erhalten.",
 		"Your name as shown to others": "Ihr Name, wie er für andere sichtbar ist",
 		"Password": "Passwort",
 		"Confirm": "Bestätigen Sie",
diff --git a/l10n/de.json b/l10n/de.json
index 2c366a49..ea9ce7da 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -49,8 +49,8 @@
 		"Display name": "Name anzeigen",
 		"Username": "Benutzername",
 		"Enter Password": "Passwort eingeben",
-		"I want to receive news about Murena products and promotions": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten",
-		"I want to receive news about /e/OS": "Ich möchte Nachrichten über /e/OS erhalten.",
+		"I want to receive news about Murena products and promotions.": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten.",
+		"I want to receive news about /e/OS.": "Ich möchte Nachrichten über /e/OS erhalten.",
 		"Your name as shown to others": "Ihr Name, wie er für andere sichtbar ist",
 		"Password": "Passwort",
 		"Confirm": "Bestätigen Sie",
diff --git a/l10n/en.js b/l10n/en.js
index 6f8b1160..667cbc32 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -53,8 +53,8 @@ OC.L10N.register(
 		"Display name": "Display name",
 		"Username": "Username",
 		"Enter Password": "Enter Password",
-		"I want to receive news about Murena products and promotions": "I want to receive news about Murena products and promotions",
-		"I want to receive news about /e/OS": "I want to receive news about /e/OS",
+		"I want to receive news about Murena products and promotions.": "I want to receive news about Murena products and promotions.",
+		"I want to receive news about /e/OS.": "I want to receive news about /e/OS.",
 		"Your name as shown to others": "Your name as shown to others",
 		"Password": "Password",
 		"Confirm": "Confirm",
diff --git a/l10n/en.json b/l10n/en.json
index 218c5274..cfef1665 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -50,8 +50,8 @@
 		"Display name": "Display name",
 		"Username": "Username",
 		"Enter Password": "Enter Password",
-		"I want to receive news about Murena products and promotions": "I want to receive news about Murena products and promotions",
-		"I want to receive news about /e/OS": "I want to receive news about /e/OS",
+		"I want to receive news about Murena products and promotions.": "I want to receive news about Murena products and promotions.",
+		"I want to receive news about /e/OS.": "I want to receive news about /e/OS.",
 		"Your name as shown to others": "Your name as shown to others",
 		"Password": "Password",
 		"Confirm": "Confirm",
diff --git a/l10n/es.js b/l10n/es.js
index 95703173..e3108cf2 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -52,8 +52,8 @@ OC.L10N.register(
 		"Display name": "Mostrar nombre",
 		"Username": "Nombre de usuario",
 		"Enter Password": "Introducir contraseña",
-		"I want to receive news about Murena products and promotions": "Deseo recibir noticias sobre productos y promociones de Murena",
-		"I want to receive news about /e/OS": "Quiero recibir noticias sobre /e/OS",
+		"I want to receive news about Murena products and promotions.": "Deseo recibir noticias sobre productos y promociones de Murena.",
+		"I want to receive news about /e/OS.": "Quiero recibir noticias sobre /e/OS.",
 		"Your name as shown to others": "Su nombre ante los demás",
 		"Password": "Contraseña",
 		"Confirm": "Confirme",
diff --git a/l10n/es.json b/l10n/es.json
index 399c0553..defa25be 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -51,8 +51,8 @@
 		"Display name": "Mostrar nombre",
 		"Username": "Nombre de usuario",
 		"Enter Password": "Introducir contraseña",
-		"I want to receive news about Murena products and promotions": "Deseo recibir noticias sobre productos y promociones de Murena",
-		"I want to receive news about /e/OS": "Quiero recibir noticias sobre /e/OS",
+		"I want to receive news about Murena products and promotions.": "Deseo recibir noticias sobre productos y promociones de Murena.",
+		"I want to receive news about /e/OS.": "Quiero recibir noticias sobre /e/OS.",
 		"Your name as shown to others": "Su nombre ante los demás",
 		"Password": "Contraseña",
 		"Confirm": "Confirme",
diff --git a/l10n/fr.js b/l10n/fr.js
index 2f4e72f9..10f15144 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -51,8 +51,8 @@ OC.L10N.register(
 		"Display name": "Nom d'affichage",
 		"Username": "Nom d'utilisateur",
 		"Enter Password": "Saisir le mot de passe",
-		"I want to receive news about Murena products and promotions": "Je souhaite recevoir des informations sur les produits et les promotions de Murena.",
-		"I want to receive news about /e/OS": "Je souhaite recevoir des informations sur /e/OS.",
+		"I want to receive news about Murena products and promotions.": "Je souhaite recevoir des informations sur les produits et les promotions de Murena.",
+		"I want to receive news about /e/OS.": "Je souhaite recevoir des informations sur /e/OS.",
 		"Your name as shown to others": "Votre nom tel qu'il est présenté aux autres",
 		"Password": "Mot de passe",
 		"Confirm": "Confirmer",
diff --git a/l10n/fr.json b/l10n/fr.json
index 6f7697ec..e26fdac3 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -50,8 +50,8 @@
 		"Display name": "Nom d'affichage",
 		"Username": "Nom d'utilisateur",
 		"Enter Password": "Saisir le mot de passe",
-		"I want to receive news about Murena products and promotions": "Je souhaite recevoir des informations sur les produits et les promotions de Murena.",
-		"I want to receive news about /e/OS": "Je souhaite recevoir des informations sur /e/OS.",
+		"I want to receive news about Murena products and promotions.": "Je souhaite recevoir des informations sur les produits et les promotions de Murena.",
+		"I want to receive news about /e/OS.": "Je souhaite recevoir des informations sur /e/OS.",
 		"Your name as shown to others": "Votre nom tel qu'il est présenté aux autres",
 		"Password": "Mot de passe",
 		"Confirm": "Confirmer",
diff --git a/l10n/it.js b/l10n/it.js
index b65ec705..7d330622 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -51,8 +51,8 @@ OC.L10N.register(
 		"Display name": "Nome visualizzato",
 		"Username": "Nome utente",
 		"Enter Password": "Inserire la password",
-		"I want to receive news about Murena products and promotions": "Desidero ricevere notizie sui prodotti e sulle promozioni Murena.",
-		"I want to receive news about /e/OS": "Voglio ricevere notizie su /e/OS.",
+		"I want to receive news about Murena products and promotions.": "Desidero ricevere notizie sui prodotti e sulle promozioni Murena.",
+		"I want to receive news about /e/OS.": "Voglio ricevere notizie su /e/OS.",
 		"Your name as shown to others": "Il vostro nome come mostrato agli altri",
 		"Password": "Password",
 		"Confirm": "Confermare",
diff --git a/l10n/it.json b/l10n/it.json
index 0f03e188..824bd43a 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -50,8 +50,8 @@
 		"Display name": "Nome visualizzato",
 		"Username": "Nome utente",
 		"Enter Password": "Inserire la password",
-		"I want to receive news about Murena products and promotions": "Desidero ricevere notizie sui prodotti e sulle promozioni Murena.",
-		"I want to receive news about /e/OS": "Voglio ricevere notizie su /e/OS.",
+		"I want to receive news about Murena products and promotions.": "Desidero ricevere notizie sui prodotti e sulle promozioni Murena.",
+		"I want to receive news about /e/OS.": "Voglio ricevere notizie su /e/OS.",
 		"Your name as shown to others": "Il vostro nome come mostrato agli altri",
 		"Password": "Password",
 		"Confirm": "Confermare",
diff --git a/scss/ecloud-accounts-userregistration.scss b/scss/ecloud-accounts-userregistration.scss
index f7f9c14b..59c283c2 100644
--- a/scss/ecloud-accounts-userregistration.scss
+++ b/scss/ecloud-accounts-userregistration.scss
@@ -30,8 +30,8 @@ html {
 #registrationForm .password-group #password {
 	height: 62px;
 	margin-left: 0;
-	background-color: var(--input-background-color);
-	color: var(--color-main-text);
+	background-color: #ffffff;
+	color: #000000;
 	border: 1px solid #E6E8E9;
 }
 
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 2e475142..db414581 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -105,7 +105,7 @@
 			<div id="fields-accepttns" class="fields">
 				<div class="field">
 					<div class="control">
-						<span class="action-checkbox">
+						<span class="action-checkbox required">
 							<input id="action-tns"
 								v-model="formData.accepttns"
 								type="checkbox"
@@ -128,7 +128,7 @@
 								v-model="formData.newsletterEos"
 								type="checkbox"
 								class="checkbox action-checkbox__checkbox focusable">
-							<label for="action-newsletter_eos" class="action-checkbox__label">{{ t(appName,'I want to receive news about /e/OS') }}</label>
+							<label for="action-newsletter_eos" class="action-checkbox__label">{{ t(appName,'I want to receive news about /e/OS.') }}</label>
 						</span>
 					</div>
 				</div>
@@ -142,7 +142,7 @@
 								v-model="formData.newsletterProduct"
 								type="checkbox"
 								class="checkbox action-checkbox__checkbox focusable">
-							<label for="action-newsletter_product" class="action-checkbox__label">{{ t(appName,'I want to receive news about Murena products and promotions') }}</label>
+							<label for="action-newsletter_product" class="action-checkbox__label">{{ t(appName,'I want to receive news about Murena products and promotions.') }}</label>
 						</span>
 					</div>
 				</div>
@@ -354,9 +354,9 @@ export default {
 }
 #registrationForm .fields input,
 #registrationForm .fields input[type="password"] {
-	background-color: var(--input-background-color);
+	background-color: #ffffff;
 	margin-bottom: 0;
-	color: var(--color-main-text);
+	color: #000000;
 	display: block;
 	font-size: 16px;
 	line-height: 1.3em;
@@ -494,6 +494,11 @@ p.validation-success:before {
 .pad-left-5{
 	padding-left: 5px;
 }
+span.action-checkbox.required:after {
+    content: "*";
+    font-size: large;
+    color: red;
+}
 /** mobile font sizes **/
 @media screen and (max-width: 650px) {
 	.fields .field .control input {
-- 
GitLab


From 2c2f91c76b221331d0dd64b974cc90c0443e2528 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 30 Apr 2024 14:44:04 +0000
Subject: [PATCH 073/185] Option issue in curl

---
 lib/Service/CurlService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index a201e51b..2c6678da 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -95,7 +95,9 @@ class CurlService {
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_HTTPHEADER => $headers
 		);
-		$options = array_merge($options, $userOptions);
+		foreach ($userOptions as $key => $value) {
+			$options[$key] = $value;
+		}
 		switch ($method) {
 			case 'GET':
 				if ($params) {
-- 
GitLab


From 9d491d9d60929b9ba01db973c7ea628b6438203c Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 30 Apr 2024 17:23:48 +0000
Subject: [PATCH 074/185] Keep white background in new signup page

---
 src/signup/CaptchaForm.vue       | 4 ++--
 src/signup/RecoveryEmailForm.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index aa2eba48..2ad10720 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -166,9 +166,9 @@ export default {
 	margin-bottom: 10px;
 }
 #captchaForm #fields input {
-	background-color: var(--input-background-color);
+	background-color: #ffffff;
 	margin-bottom: 0;
-	color: var(--color-main-text);
+	color: #000000;
 	display: block;
 	width: 100%;
 	font-size: 16px;
diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue
index e1b832b4..00bc89e9 100644
--- a/src/signup/RecoveryEmailForm.vue
+++ b/src/signup/RecoveryEmailForm.vue
@@ -160,9 +160,9 @@ export default {
 }
 
 #recoveryEmailForm #fields input{
-	background-color: var(--input-background-color);
+	background-color: #ffffff;
 	margin-bottom: 0;
-	color: var(--color-main-text);
+	color: #000000;
 	display: block;
 	width: 100%;
 	font-size: 16px;
-- 
GitLab


From e86cd3c9859d47ae3bdf9145b971cb5876bd1a7c Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 7 May 2024 17:07:07 +0000
Subject: [PATCH 075/185] Correcting password strength lines

---
 scss/ecloud-accounts-userregistration.scss | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scss/ecloud-accounts-userregistration.scss b/scss/ecloud-accounts-userregistration.scss
index 59c283c2..02f834d4 100644
--- a/scss/ecloud-accounts-userregistration.scss
+++ b/scss/ecloud-accounts-userregistration.scss
@@ -48,4 +48,13 @@ html {
 
 #fields-password .Password__strength-meter {
 	margin-bottom: 0;
-}
\ No newline at end of file
+}
+#fields-password .Password__strength-meter:before {
+	left: 0;
+}
+#fields-password .Password__strength-meter:after {
+	right: 0;
+}
+#fields-password .Password__strength-meter:after, #fields-password .Password__strength-meter:before{
+	width: 100%;
+}
-- 
GitLab


From d614007afcc1189943dfbabd9b6b853cc07c6573 Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Thu, 16 May 2024 08:31:27 +0000
Subject: [PATCH 076/185] by pass captcha

---
 lib/Controller/AccountController.php | 11 +++++++----
 src/Signup.vue                       |  4 +++-
 src/signup/CaptchaForm.vue           |  3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 35a14372..a3281663 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -253,15 +253,18 @@ class AccountController extends Controller {
 	 *
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
-	public function verifyCaptcha(string $captchaInput = '') : DataResponse {
+	public function verifyCaptcha(string $captchaInput = '', string $bypassToken = '') : DataResponse {
 		$response = new DataResponse();
-		
-		$captchaResult = (string) $this->session->get(CaptchaService::CAPTCHA_RESULT_KEY, '');
+		$captchaToken = $this->config->getSystemValue('bypass_captcha_token', '');
+		// Initialize the default status to 400 (Bad Request)
 		$response->setStatus(400);
-		if ($captchaResult === $captchaInput) {
+		// Check if the input matches the bypass token or the stored captcha result
+		$captchaResult = (string) $this->session->get(CaptchaService::CAPTCHA_RESULT_KEY, '');
+		if ((!empty($captchaToken) && $bypassToken === $captchaToken) || (!empty($captchaResult) && $captchaInput === $captchaResult)) {
 			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
 			$response->setStatus(200);
 		}
+
 		$this->session->remove(CaptchaService::CAPTCHA_RESULT_KEY);
 		return $response;
 	}
diff --git a/src/Signup.vue b/src/Signup.vue
index d6b2fc40..82e3158c 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -3,7 +3,9 @@
 		<section id="main" class="register-page">
 			<div id="registration">
 				<RegistrationForm v-if="showRegistrationForm" v-model="formData" @form-submitted="submitRegistrationForm" />
-				<CaptchaForm v-if="showCaptchaForm" v-model="formData" @form-submitted="submitCaptchaForm" />
+				<CaptchaForm v-if="showCaptchaForm"
+					v-model="formData"
+					@form-submitted="submitCaptchaForm" />
 				<RecoveryEmailForm v-if="showRecoveryEmailForm" v-model="formData" @form-submitted="submitRecoveryEmailForm" />
 				<SuccessSection v-if="showSuccessSection" v-model="formData" />
 			</div>
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index 2ad10720..5085b8d8 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -85,8 +85,11 @@ export default {
 			this.validation.isCaptchaInputNotMatched = false
 
 			try {
+				const urlParams = new URLSearchParams(window.location.search)
+				const bypassToken = urlParams.get('bypassToken')
 				const data = {
 					captchaInput: this.formData.captchaInput,
+					bypassToken: bypassToken || null,
 				}
 				const url = generateUrl(`/apps/${this.appName}/accounts/verify_captcha`)
 				await Axios.post(url, data)
-- 
GitLab


From fdbef6768a1f1bf20a462aa1cf022931b7e1c8a0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 20 May 2024 04:44:41 +0000
Subject: [PATCH 077/185] Recovery Email blacklisted functionality

---
 appinfo/info.xml                            |  4 +++
 l10n/de.js                                  |  3 +-
 l10n/de.json                                |  3 +-
 l10n/en.js                                  |  3 +-
 l10n/en.json                                |  3 +-
 l10n/es.js                                  |  3 +-
 l10n/es.json                                |  3 +-
 l10n/fr.js                                  |  3 +-
 l10n/fr.json                                |  3 +-
 l10n/it.js                                  |  3 +-
 l10n/it.json                                |  3 +-
 lib/BackgroundJob/BlacklistedDomainsJob.php | 35 +++++++++++++++++++++
 lib/Command/UpdateBlacklistedDomains.php    | 30 ++++++++++++++++++
 lib/Controller/AccountController.php        |  5 +++
 lib/Exception/BlacklistedEmailException.php |  9 ++++++
 lib/Service/UserService.php                 | 29 +++++++++++++++++
 16 files changed, 132 insertions(+), 10 deletions(-)
 create mode 100644 lib/BackgroundJob/BlacklistedDomainsJob.php
 create mode 100644 lib/Command/UpdateBlacklistedDomains.php
 create mode 100644 lib/Exception/BlacklistedEmailException.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 351006aa..96326e75 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -25,7 +25,11 @@
 		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
 	</settings>
     <commands>
+        <command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
     </commands>
+    <background-jobs>
+		<job>OCA\EcloudAccounts\BackgroundJob\BlacklistedDomainsJob</job>
+    </background-jobs>
 </info>
diff --git a/l10n/de.js b/l10n/de.js
index 373b849a..26bd31c0 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
-		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index ea9ce7da..581f0a74 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -82,7 +82,8 @@
 		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
-		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 667cbc32..b25bf722 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -88,6 +88,7 @@ OC.L10N.register(
 		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
-		"An error occurred while creating your account!": "An error occurred while creating your account!"
+		"An error occurred while creating your account!": "An error occurred while creating your account!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index cfef1665..be378a0a 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -84,7 +84,8 @@
 		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
-		"An error occurred while creating your account!": "An error occurred while creating your account!"
+		"An error occurred while creating your account!": "An error occurred while creating your account!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index e3108cf2..19fa33c7 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -86,6 +86,7 @@ OC.L10N.register(
 		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
-		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "El dominio de esta dirección de correo electrónico está en lista negra. Por favor, proporciona otra dirección de recuperación."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index defa25be..867f150d 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -85,7 +85,8 @@
 		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
-		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "El dominio de esta dirección de correo electrónico está en lista negra. Por favor, proporciona otra dirección de recuperación."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 10f15144..6efaeeca 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -85,6 +85,7 @@ OC.L10N.register(
 		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
-		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "Le domain de cette adresse e-mail est sur liste noire. Merci de bien vouloir fournir une autre adresse de récupération."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index e26fdac3..19facc30 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -84,7 +84,8 @@
 		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
-		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "Le domain de cette adresse e-mail est sur liste noire. Merci de bien vouloir fournir une autre adresse de récupération."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 7d330622..84c211cd 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -85,6 +85,7 @@ OC.L10N.register(
 		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
-		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "Il dominio cui appartiene questo indirizzo e-mail è contenuto in una black list. Inserisci un indirizzo di recovery differente."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 824bd43a..2685c394 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -80,7 +80,8 @@
 		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
-		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
+		"The domain of this email address is blacklisted. Please provide another recovery address.": "Il dominio cui appartiene questo indirizzo e-mail è contenuto in una black list. Inserisci un indirizzo di recovery differente."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/BackgroundJob/BlacklistedDomainsJob.php b/lib/BackgroundJob/BlacklistedDomainsJob.php
new file mode 100644
index 00000000..cf776076
--- /dev/null
+++ b/lib/BackgroundJob/BlacklistedDomainsJob.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\BackgroundJob;
+
+use OCA\EcloudAccounts\Service\UserService;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
+use Psr\Log\LoggerInterface;
+
+class BlacklistedDomainsJob extends TimedJob {
+	private LoggerInterface $logger;
+	private UserService $userService;
+	private ITimeFactory $timeFactory;
+	public const INTERVAL_PERIOD = 7 * 24 * 60 * 60;// Run for 7 days
+	public function __construct(LoggerInterface $logger, ITimeFactory $timeFactory, UserService $userService) {
+		parent::__construct($timeFactory);
+
+		$this->setInterval(self::INTERVAL_PERIOD);
+		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
+		$this->timeFactory = $timeFactory;
+		$this->userService = $userService;
+		$this->logger = $logger;
+	}
+
+	protected function run($argument): void {
+		try {
+			$this->userService->updateBlacklistedDomains();
+		} catch (\Exception $e) {
+			$this->logger->logException('Error updating blacklisted domains for account creation', ['exception' => $e]);
+			return;
+		}
+	}
+}
diff --git a/lib/Command/UpdateBlacklistedDomains.php b/lib/Command/UpdateBlacklistedDomains.php
new file mode 100644
index 00000000..8b51a28a
--- /dev/null
+++ b/lib/Command/UpdateBlacklistedDomains.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Command;
+
+use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Service\UserService;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class UpdateBlacklistedDomains extends Command {
+	private UserService $userService;
+
+	public function __construct(UserService $userService) {
+		parent::__construct();
+		$this->userService = $userService;
+	}
+
+	protected function configure() {
+		$this->setName(Application::APP_ID.':update-blacklisted-domains')->setDescription('Update blacklisted domains');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$this->userService->updateBlacklistedDomains();
+		$output->writeln('Updated blacklisted domains for creation.');
+		return 1;
+	}
+}
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index a3281663..de1f8d41 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -9,6 +9,7 @@ namespace OCA\EcloudAccounts\Controller;
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
+use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCA\EcloudAccounts\Service\CaptchaService;
 use OCA\EcloudAccounts\Service\NewsLetterService;
@@ -166,6 +167,10 @@ class AccountController extends Controller {
 			$this->logger->logException($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 (BlacklistedEmailException | Error $e) {
+			$this->logger->logException($e, ['app' => Application::APP_ID]);
+			$response->setData(['message' => $e->getMessage(), 'success' => false]);
+			$response->setStatus(500);
 		} catch (AddUsernameToCommonStoreException $e) {
 			$this->logger->logException($e, ['app' => Application::APP_ID]);
 			$response->setStatus(200);
diff --git a/lib/Exception/BlacklistedEmailException.php b/lib/Exception/BlacklistedEmailException.php
new file mode 100644
index 00000000..a435268b
--- /dev/null
+++ b/lib/Exception/BlacklistedEmailException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class BlacklistedEmailException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index a347655c..c8ad16b8 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -9,6 +9,7 @@ require __DIR__ . '/../../vendor/autoload.php';
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
+use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCP\Defaults;
 use OCP\IConfig;
@@ -273,6 +274,29 @@ class UserService {
 		if ($this->isRecoveryEmailDomainDisallowed($recoveryEmail)) {
 			throw new Exception('You cannot set an email address with a Murena domain as recovery email address.');
 		}
+		if ($this->isBlacklistedEmail($recoveryEmail)) {
+			throw new BlacklistedEmailException('The domain of this email address is blacklisted. Please provide another recovery address.');
+		}
+	}
+	/**
+	 * Check if an email domain is blacklisted against a JSON list of disposable email domains.
+	 *
+	 * @param string $email The email address to check.
+	 * @return bool True if the email domain is blacklisted, false otherwise.
+	 */
+	public function isBlacklistedEmail(string $email): bool {
+		// Get the blacklisted domains from configuration
+		$blacklistedDomainsInJson = $this->config->getAppValue(Application::APP_ID, 'blacklisted_domains');
+		$blacklistedDomains = json_decode($blacklistedDomainsInJson, true);
+		
+		// Split the email address into parts using explode
+		$emailParts = explode('@', $email);
+		
+		// Extract the domain part
+		$emailDomain = strtolower(end($emailParts));
+		
+		// Check if the email domain is in the blacklisted domains array
+		return in_array($emailDomain, $blacklistedDomains);
 	}
 	/**
 	 * Add a new user to the LDAP directory.
@@ -523,4 +547,9 @@ class UserService {
 	private function getDefaultQuota() {
 		return $this->config->getSystemValueInt('default_quota_in_megabytes', 1024);
 	}
+	public function updateBlacklistedDomains() {
+		$blacklisted_domain_url = 'https://raw.githubusercontent.com/disposable/disposable-email-domains/master/domains.json';
+		$json_data = file_get_contents($blacklisted_domain_url);
+		$this->config->setAppValue(Application::APP_ID, 'blacklisted_domains', $json_data);
+	}
 }
-- 
GitLab


From ca952ccf824306a82472cadbf1e66f511dd1cebf Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 21 May 2024 09:01:45 +0000
Subject: [PATCH 078/185] Map the 'active' and 'mailActive' attributes between
 LDAP and eCloud

---
 appinfo/info.xml                         |  1 +
 lib/Command/MapActiveAttributetoLDAP.php | 63 ++++++++++++++++++++++++
 lib/Listeners/UserChangedListener.php    | 33 +++++++------
 lib/Service/UserService.php              | 32 ++++++++++++
 4 files changed, 114 insertions(+), 15 deletions(-)
 create mode 100644 lib/Command/MapActiveAttributetoLDAP.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 96326e75..7d1778f1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -28,6 +28,7 @@
         <command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
+        <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
     </commands>
     <background-jobs>
 		<job>OCA\EcloudAccounts\BackgroundJob\BlacklistedDomainsJob</job>
diff --git a/lib/Command/MapActiveAttributetoLDAP.php b/lib/Command/MapActiveAttributetoLDAP.php
new file mode 100644
index 00000000..6d918d92
--- /dev/null
+++ b/lib/Command/MapActiveAttributetoLDAP.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+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 Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MapActiveAttributetoLDAP extends Command {
+	private OutputInterface $commandOutput;
+	private IUserManager $userManager;
+	private $userService;
+	private $logger;
+
+	public function __construct(IUserManager $userManager, ILogger $logger, UserService $userService) {
+		$this->userManager = $userManager;
+		$this->userService = $userService;
+		$this->logger = $logger;
+		parent::__construct();
+	}
+
+	protected function configure(): void {
+		$this
+			->setName(Application::APP_ID.':map-active-attribute-to-ldap')
+			->setDescription('Map Active attribute to LDAP');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$this->commandOutput = $output;
+		$this->userManager->callForSeenUsers(function (IUser $user) {
+			if ($this->isUserValid($user)) {
+				$username = $user->getUID();
+				$isEnabled = $user->isEnabled() ? true : false;
+				try {
+					$this->userService->mapActiveAttributesInLDAP($username, $isEnabled);
+				} catch (Exception $e) {
+					$this->logger->logException('Failed to update LDAP attributes for user: ' . $username, ['exception' => $e]);
+				}
+			}
+		});
+		$this->commandOutput->writeln('Active attributes mapped successfully.');
+		return 0;
+	}
+	/**
+	 * validate user
+	 *
+	 * @param IUser $user
+	 */
+	private function isUserValid(?IUser $user) : bool {
+		if (!($user instanceof IUser)) {
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/lib/Listeners/UserChangedListener.php b/lib/Listeners/UserChangedListener.php
index 48d2ddb9..7204f3e0 100644
--- a/lib/Listeners/UserChangedListener.php
+++ b/lib/Listeners/UserChangedListener.php
@@ -7,6 +7,7 @@ namespace OCA\EcloudAccounts\Listeners;
 use Exception;
 use OCA\EcloudAccounts\Db\MailboxMapper;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCA\EcloudAccounts\Service\UserService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\ILogger;
@@ -18,6 +19,8 @@ class UserChangedListener implements IEventListener {
 
 	private const RECOVERY_EMAIL_FEATURE = 'recovery-email';
 
+	private const ENABLED_FEATURE = 'enabled';
+
 	private $util;
 
 	private $logger;
@@ -26,11 +29,14 @@ class UserChangedListener implements IEventListener {
 
 	private $mailboxMapper;
 
-	public function __construct(Util $util, LDAPConnectionService $LDAPConnectionService, ILogger $logger, MailboxMapper $mailboxMapper) {
+	private $userService;
+
+	public function __construct(Util $util, LDAPConnectionService $LDAPConnectionService, ILogger $logger, MailboxMapper $mailboxMapper, UserService $userService) {
 		$this->util = $util;
 		$this->ldapConnectionService = $LDAPConnectionService;
 		$this->mailboxMapper = $mailboxMapper;
 		$this->logger = $logger;
+		$this->userService = $userService;
 	}
 
 	public function handle(Event $event): void {
@@ -41,6 +47,7 @@ class UserChangedListener implements IEventListener {
 		$feature = $event->getFeature();
 		$user = $event->getUser();
 		$username = $user->getUID();
+		$newValue = $event->getValue();
 		
 		if ($feature === self::QUOTA_FEATURE) {
 			$updatedQuota = $event->getValue();
@@ -56,7 +63,15 @@ class UserChangedListener implements IEventListener {
 				'recoveryMailAddress' => $recoveryEmail
 			];
 
-			$this->updateAttributesInLDAP($username, $recoveryEmailAttribute);
+			$this->userService->updateAttributesInLDAP($username, $recoveryEmailAttribute);
+		}
+
+		if ($feature === self::ENABLED_FEATURE) {
+			try {
+				$this->userService->mapActiveAttributesInLDAP($username, $newValue);
+			} catch (Exception $e) {
+				$this->logger->logException('Failed to update LDAP attributes for user: ' . $username, ['exception' => $e]);
+			}
 		}
 	}
 
@@ -69,22 +84,10 @@ class UserChangedListener implements IEventListener {
 				$quotaAttribute = [
 					'quota' => $quotaInBytes
 				];
-				$this->updateAttributesInLDAP($username, $quotaAttribute);
+				$this->userService->updateAttributesInLDAP($username, $quotaAttribute);
 			}
 		} catch (Exception $e) {
 			$this->logger->error("Error setting quota for user $username " . $e->getMessage());
 		}
 	}
-	
-	private function updateAttributesInLDAP(string $username, array $attributes) {
-		if ($this->ldapConnectionService->isLDAPEnabled()) {
-			$conn = $this->ldapConnectionService->getLDAPConnection();
-			$userDn = $this->ldapConnectionService->username2dn($username);
-			
-			if (!ldap_modify($conn, $userDn, $attributes)) {
-				throw new Exception('Could not modify user entry at LDAP server!');
-			}
-			$this->ldapConnectionService->closeLDAPConnection($conn);
-		}
-	}
 }
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index c8ad16b8..97af0072 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -544,6 +544,38 @@ class UserService {
 			throw new AddUsernameToCommonStoreException("Error adding username '$username' to common data store.");
 		}
 	}
+
+	public function mapActiveAttributesInLDAP(string $username, bool $isEnabled): void {
+		$userActiveAttributes = $this->getActiveAttributes($isEnabled);
+		$this->updateAttributesInLDAP($username, $userActiveAttributes);
+	}
+
+	private function getActiveAttributes(bool $isEnabled): array {
+		return [
+			'active' => $isEnabled ? 'TRUE' : 'FALSE',
+			'mailActive' => $isEnabled ? 'TRUE' : 'FALSE',
+		];
+	}
+
+	public function updateAttributesInLDAP(string $username, array $attributes): void {
+		if (!$this->LDAPConnectionService->isLDAPEnabled()) {
+			return;
+		}
+	
+		$conn = $this->LDAPConnectionService->getLDAPConnection();
+		$userDn = $this->LDAPConnectionService->username2dn($username);
+	
+		if ($userDn === false) {
+			throw new Exception('Could not find DN for username: ' . $username);
+		}
+	
+		if (!ldap_modify($conn, $userDn, $attributes)) {
+			throw new Exception('Could not modify user ' . $username . ' entry at LDAP server. Attributes: ' . print_r($attributes, true));
+		}
+	
+		$this->LDAPConnectionService->closeLDAPConnection($conn);
+	}
+	
 	private function getDefaultQuota() {
 		return $this->config->getSystemValueInt('default_quota_in_megabytes', 1024);
 	}
-- 
GitLab


From ece3906bf12b2ac65aac58ea608707cc811f3895 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Tue, 21 May 2024 08:17:58 +0000
Subject: [PATCH 079/185] Escape display name

---
 lib/Service/UserService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 97af0072..7cea78aa 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -313,9 +313,9 @@ class UserService {
 	private function addNewUserToLDAP(string $displayName, string $recoveryEmail, string $username, string $userEmail, string $password): void {
 		$connection = $this->LDAPConnectionService->getLDAPConnection();
 		$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
-		
 		$newUserDN = "username=$username," . $base;
 		
+		$displayName = htmlspecialchars($displayName);
 		$quota = $this->getDefaultQuota() * 1024 * 1024;
 		
 		$newUserEntry = [
-- 
GitLab


From 00ffd334cf0c8d915ea020daad25d205cde8248d Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Fri, 31 May 2024 05:36:08 +0000
Subject: [PATCH 080/185] Invalidate sso sessions on password update

---
 lib/AppInfo/Application.php               |  3 ++
 lib/Listeners/PasswordUpdatedListener.php | 39 +++++++++++++++++++++++
 lib/Service/SSOService.php                | 11 +++++++
 3 files changed, 53 insertions(+)
 create mode 100644 lib/Listeners/PasswordUpdatedListener.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b8070465..b1635540 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -28,6 +28,7 @@ namespace OCA\EcloudAccounts\AppInfo;
 
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
+use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
@@ -39,6 +40,7 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
+use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
 
 class Application extends App implements IBootstrap {
@@ -53,6 +55,7 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
+		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/Listeners/PasswordUpdatedListener.php b/lib/Listeners/PasswordUpdatedListener.php
new file mode 100644
index 00000000..c283ac91
--- /dev/null
+++ b/lib/Listeners/PasswordUpdatedListener.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Listeners;
+
+use Exception;
+use OCA\EcloudAccounts\Service\SSOService;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\ILogger;
+use OCP\User\Events\PasswordUpdatedEvent;
+
+class PasswordUpdatedListener implements IEventListener {
+	
+	private SSOService $ssoService;
+
+	private $logger;
+
+	public function __construct(SSOService $ssoService, ILogger $logger) {
+		$this->ssoService = $ssoService;
+		$this->logger = $logger;
+	}
+
+	public function handle(Event $event): void {
+		if (!($event instanceof PasswordUpdatedEvent)) {
+			return;
+		}
+
+		$user = $event->getUser();
+		$username = $user->getUID();
+
+		try {
+			$this->ssoService->logout($username);
+		} catch (Exception $e) {
+			$this->logger->logException('Failed to logout from ssoService for user: ' . $username, ['exception' => $e]);
+		}
+	}
+}
diff --git a/lib/Service/SSOService.php b/lib/Service/SSOService.php
index b176b59d..896b2d20 100644
--- a/lib/Service/SSOService.php
+++ b/lib/Service/SSOService.php
@@ -85,6 +85,17 @@ class SSOService {
 		}
 	}
 
+	public function logout(string $username) : void {
+		if(empty($this->currentUserId)) {
+			$this->getUserId($username);
+		}
+
+		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '/' . $this->currentUserId . '/logout';
+
+		$this->logger->debug('logout calling SSO API with url: '. $url);
+		$this->callSSOAPI($url, 'POST', [], 204);
+	}
+
 	private function getCredentialIds() : array {
 		$url = $this->ssoConfig['admin_rest_api_url'] . self::CREDENTIALS_ENDPOINT;
 		$url = str_replace('{USER_ID}', $this->currentUserId, $url);
-- 
GitLab


From 10e1fe95c08c2c3c1190f7e58b4c7b39bd380828 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 11 Jun 2024 18:15:54 +0000
Subject: [PATCH 081/185] Set recoveryMailAddress attribute blank while
 creating account as it is not verified

---
 lib/Service/UserService.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 7cea78aa..1371c74f 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -255,7 +255,7 @@ class UserService {
 		if (!empty($recoveryEmail)) {
 			$this->validateRecoveryEmail($recoveryEmail);
 		}
-		$this->addNewUserToLDAP($displayname, $recoveryEmail, $username, $userEmail, $password);
+		$this->addNewUserToLDAP($displayname, $username, $userEmail, $password);
 	}
 	/**
 	 * Validates the recovery email address.
@@ -302,7 +302,6 @@ class UserService {
 	 * Add a new user to the LDAP directory.
 	 *
 	 * @param string $displayname The display name of the new user.
-	 * @param string $recoveryEmail The recovery email address of the new user.
 	 * @param string $username The username of the new user.
 	 * @param string $userEmail The email address of the new user.
 	 * @param string $password The password of the new user.
@@ -310,7 +309,7 @@ class UserService {
 	 * @return void
 	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
-	private function addNewUserToLDAP(string $displayName, string $recoveryEmail, string $username, string $userEmail, string $password): void {
+	private function addNewUserToLDAP(string $displayName, string $username, string $userEmail, string $password): void {
 		$connection = $this->LDAPConnectionService->getLDAPConnection();
 		$base = $this->LDAPConnectionService->getLDAPBaseUsers()[0];
 		$newUserDN = "username=$username," . $base;
@@ -325,7 +324,7 @@ class UserService {
 			'userPassword' => $password,
 			'displayName' => $displayName,
 			'quota' => $quota,
-			'recoveryMailAddress' => $recoveryEmail,
+			'recoveryMailAddress' => '',
 			'active' => 'TRUE',
 			'mailActive' => 'TRUE',
 			'userClusterID' => $this->apiConfig['userCluserId'],
-- 
GitLab


From 8d8266606c025f90b7689caa86bf3a57d41c9fc9 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Wed, 12 Jun 2024 17:45:24 +0000
Subject: [PATCH 082/185] Ecloud Accounts Bump Release 6.0.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7d1778f1..64f674f2 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>5.1.0</version>
+    <version>6.0.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 26c5139924a829fabb7c5ef1bb2199fad24aa630 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Thu, 13 Jun 2024 11:08:51 +0000
Subject: [PATCH 083/185] cluser -> cluster

---
 lib/Service/UserService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 1371c74f..c2db1c52 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -63,7 +63,7 @@ class UserService {
 			'commonServicesToken' => $this->config->getSystemValue('common_services_token', ''),
 			'aliasDomain' => $this->config->getSystemValue('alias_domain', ''),
 			'commonApiVersion' => $this->config->getSystemValue('common_api_version', ''),
-			'userCluserId' => $this->config->getSystemValue('user_cluser_id', ''),
+			'userClusterID' => $this->config->getSystemValue('user_cluster_id', ''),
 			'objectClass' => $this->config->getSystemValue('ldap_object_class', []),
 		];
 	}
@@ -327,7 +327,7 @@ class UserService {
 			'recoveryMailAddress' => '',
 			'active' => 'TRUE',
 			'mailActive' => 'TRUE',
-			'userClusterID' => $this->apiConfig['userCluserId'],
+			'userClusterID' => $this->apiConfig['userClusterID'],
 			'objectClass' => $this->apiConfig['objectClass']
 		];
 		
-- 
GitLab


From 0433f18d1f90328077ed44272abcc59accc44aeb Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 17 Jun 2024 14:29:45 +0530
Subject: [PATCH 084/185] Commented PasswordUpdateEvent

---
 appinfo/info.xml            | 2 +-
 lib/AppInfo/Application.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 64f674f2..2e37f78c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.0.0</version>
+    <version>6.0.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b1635540..1859c022 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -55,7 +55,7 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
-		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
+		// $context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
-- 
GitLab


From 61b52463e38cd5ff00385ac9b8147fcbf7eeba1f Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 17 Jun 2024 11:57:18 +0000
Subject: [PATCH 085/185] lowercase username before processing

---
 lib/Controller/AccountController.php | 3 +++
 lib/Service/UserService.php          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index de1f8d41..82aa8507 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -138,6 +138,7 @@ class AccountController extends Controller {
 		}
 		
 		try {
+			$username = mb_strtolower($username, 'UTF-8');
 			$mainDomain = $this->userService->getMainDomain();
 			$userEmail = $username.'@'.$mainDomain;
 			$this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
@@ -215,6 +216,7 @@ class AccountController extends Controller {
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
 	public function checkUsernameAvailable(string $username) : DataResponse {
+		$this->session->remove(self::SESSION_USERNAME_CHECK);
 		$response = new DataResponse();
 		$response->setStatus(400);
 
@@ -223,6 +225,7 @@ class AccountController extends Controller {
 		}
 
 		try {
+			$username = mb_strtolower($username, 'UTF-8');
 			if (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) {
 				$response->setStatus(200);
 				$this->session->set(self::SESSION_USERNAME_CHECK, true);
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index c2db1c52..0101604b 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -249,7 +249,7 @@ class UserService {
 	 */
 	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): void {
 		
-		if ($this->userExists($username)) {
+		if ($this->userExists($username) || $this->isUsernameTaken($username)) {
 			throw new Exception("Username '$username' is already taken.");
 		}
 		if (!empty($recoveryEmail)) {
-- 
GitLab


From 83e589f699173ed5d297785a811c5d26b6add750 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 18 Jun 2024 05:22:12 +0000
Subject: [PATCH 086/185] remove blacklist domain job

---
 appinfo/info.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2e37f78c..2f017641 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.0.1</version>
+    <version>6.0.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
@@ -25,12 +25,8 @@
 		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
 	</settings>
     <commands>
-        <command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
     </commands>
-    <background-jobs>
-		<job>OCA\EcloudAccounts\BackgroundJob\BlacklistedDomainsJob</job>
-    </background-jobs>
 </info>
-- 
GitLab


From abbbf7299d084cbb8214d50c395c7e269a61499a Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 18 Jun 2024 06:56:57 +0000
Subject: [PATCH 087/185] check if blacklisted_domains is empty

---
 appinfo/info.xml            | 2 +-
 lib/Service/UserService.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2f017641..9d095387 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.0.2</version>
+    <version>6.0.3</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 0101604b..ecf5bddd 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -287,8 +287,15 @@ class UserService {
 	public function isBlacklistedEmail(string $email): bool {
 		// Get the blacklisted domains from configuration
 		$blacklistedDomainsInJson = $this->config->getAppValue(Application::APP_ID, 'blacklisted_domains');
+		if (empty($blacklistedDomainsInJson)) {
+			return false;
+		}
 		$blacklistedDomains = json_decode($blacklistedDomainsInJson, true);
-		
+
+		if (empty($blacklistedDomains)) {
+			return false;
+		}
+
 		// Split the email address into parts using explode
 		$emailParts = explode('@', $email);
 		
-- 
GitLab


From c397924756522fc0eae5716f4b44a765c3bb678b Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 18 Jun 2024 15:57:14 +0530
Subject: [PATCH 088/185] removed background job and update domains code

---
 appinfo/info.xml                            |  2 +-
 lib/BackgroundJob/BlacklistedDomainsJob.php | 35 ---------------------
 lib/Command/UpdateBlacklistedDomains.php    | 30 ------------------
 lib/Service/UserService.php                 |  5 ---
 4 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 lib/BackgroundJob/BlacklistedDomainsJob.php
 delete mode 100644 lib/Command/UpdateBlacklistedDomains.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9d095387..e6f7fd12 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.0.3</version>
+    <version>6.0.4</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/BackgroundJob/BlacklistedDomainsJob.php b/lib/BackgroundJob/BlacklistedDomainsJob.php
deleted file mode 100644
index cf776076..00000000
--- a/lib/BackgroundJob/BlacklistedDomainsJob.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\BackgroundJob;
-
-use OCA\EcloudAccounts\Service\UserService;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\TimedJob;
-use Psr\Log\LoggerInterface;
-
-class BlacklistedDomainsJob extends TimedJob {
-	private LoggerInterface $logger;
-	private UserService $userService;
-	private ITimeFactory $timeFactory;
-	public const INTERVAL_PERIOD = 7 * 24 * 60 * 60;// Run for 7 days
-	public function __construct(LoggerInterface $logger, ITimeFactory $timeFactory, UserService $userService) {
-		parent::__construct($timeFactory);
-
-		$this->setInterval(self::INTERVAL_PERIOD);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-		$this->timeFactory = $timeFactory;
-		$this->userService = $userService;
-		$this->logger = $logger;
-	}
-
-	protected function run($argument): void {
-		try {
-			$this->userService->updateBlacklistedDomains();
-		} catch (\Exception $e) {
-			$this->logger->logException('Error updating blacklisted domains for account creation', ['exception' => $e]);
-			return;
-		}
-	}
-}
diff --git a/lib/Command/UpdateBlacklistedDomains.php b/lib/Command/UpdateBlacklistedDomains.php
deleted file mode 100644
index 8b51a28a..00000000
--- a/lib/Command/UpdateBlacklistedDomains.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Command;
-
-use OCA\EcloudAccounts\AppInfo\Application;
-use OCA\EcloudAccounts\Service\UserService;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class UpdateBlacklistedDomains extends Command {
-	private UserService $userService;
-
-	public function __construct(UserService $userService) {
-		parent::__construct();
-		$this->userService = $userService;
-	}
-
-	protected function configure() {
-		$this->setName(Application::APP_ID.':update-blacklisted-domains')->setDescription('Update blacklisted domains');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->userService->updateBlacklistedDomains();
-		$output->writeln('Updated blacklisted domains for creation.');
-		return 1;
-	}
-}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index ecf5bddd..1b8d5f46 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -585,9 +585,4 @@ class UserService {
 	private function getDefaultQuota() {
 		return $this->config->getSystemValueInt('default_quota_in_megabytes', 1024);
 	}
-	public function updateBlacklistedDomains() {
-		$blacklisted_domain_url = 'https://raw.githubusercontent.com/disposable/disposable-email-domains/master/domains.json';
-		$json_data = file_get_contents($blacklisted_domain_url);
-		$this->config->setAppValue(Application::APP_ID, 'blacklisted_domains', $json_data);
-	}
 }
-- 
GitLab


From f8083625cec2065535383f16c9b2025138a2ee29 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 21 Jun 2024 07:40:36 +0000
Subject: [PATCH 089/185] Storing blacklisted domains in appdata

---
 appinfo/info.xml                         |   1 +
 lib/Command/UpdateBlacklistedDomains.php |  39 ++++++++
 lib/Service/BlackListService.php         | 118 +++++++++++++++++++++++
 lib/Service/UserService.php              |  34 +------
 4 files changed, 162 insertions(+), 30 deletions(-)
 create mode 100644 lib/Command/UpdateBlacklistedDomains.php
 create mode 100644 lib/Service/BlackListService.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e6f7fd12..b3a4c439 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -25,6 +25,7 @@
 		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
 	</settings>
     <commands>
+        <command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
diff --git a/lib/Command/UpdateBlacklistedDomains.php b/lib/Command/UpdateBlacklistedDomains.php
new file mode 100644
index 00000000..74bc1642
--- /dev/null
+++ b/lib/Command/UpdateBlacklistedDomains.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Command;
+
+use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Service\BlackListService;
+use OCP\ILogger;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class UpdateBlacklistedDomains extends Command {
+	private BlackListService $blackListService;
+	private ILogger $logger;
+
+
+	public function __construct(BlackListService $blackListService, ILogger $logger) {
+		parent::__construct();
+		$this->blackListService = $blackListService;
+		$this->logger = $logger;
+	}
+
+	protected function configure() {
+		$this->setName(Application::APP_ID.':update-blacklisted-domains')->setDescription('Update blacklisted domains');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		try {
+			$this->blackListService->updateBlacklistedDomains();
+			$output->writeln('Updated blacklisted domains for creation.');
+		} catch (\Throwable $th) {
+			$this->logger->error('Error while updating blacklisted domains. ' . $th->getMessage());
+			$output->writeln('Error while updating blacklisted domains. '. $th->getMessage());
+		}
+		return 1;
+	}
+}
diff --git a/lib/Service/BlackListService.php b/lib/Service/BlackListService.php
new file mode 100644
index 00000000..ba9d0a21
--- /dev/null
+++ b/lib/Service/BlackListService.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Service;
+
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\ILogger;
+
+class BlackListService {
+	private IAppData $appData;
+	private ILogger $logger;
+	private const BLACKLISTED_DOMAINS_FILE_NAME = 'blacklisted_domains.json';
+	private const BLACKLISTED_DOMAINS_URL = 'https://raw.githubusercontent.com/disposable/disposable-email-domains/master/domains.json';
+
+	public function __construct(ILogger $logger, IAppData $appData) {
+		$this->appData = $appData;
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Check if an email domain is blacklisted against a JSON list of disposable email domains.
+	 *
+	 * @param string $email The email address to check.
+	 * @return bool True if the email domain is blacklisted, false otherwise.
+	 */
+	public function isBlacklistedEmail(string $email): bool {
+		if (!$this->ensureDocumentsFolder()) {
+			return false;
+		}
+		$blacklistedDomains = $this->getBlacklistedDomainData();
+		if (empty($blacklistedDomains)) {
+			return false;
+		}
+		$emailParts = explode('@', $email);
+		$emailDomain = strtolower(end($emailParts));
+		return in_array($emailDomain, $blacklistedDomains);
+	}
+	/**
+	 * Update the blacklisted domains data by fetching it from a URL and saving it locally.
+	 *
+	 * @return void
+	 */
+	public function updateBlacklistedDomains(): void {
+		$blacklisted_domain_url = self::BLACKLISTED_DOMAINS_URL;
+		$json_data = file_get_contents($blacklisted_domain_url);
+		$this->setBlacklistedDomainsData($json_data);
+	}
+	/**
+	 * Store blacklisted domain data in a file within AppData.
+	 *
+	 * @param string $data The data to be stored in the file.
+	 * @return void
+	 */
+	private function setBlacklistedDomainsData(string $data): void {
+		$file = $this->getBlacklistedDomainsFile();
+		$file->putContent($data);
+	}
+	/**
+	 * Retrieve the blacklisted domain file path
+	 *
+	 * @return ISimpleFile
+	 */
+	private function getBlacklistedDomainsFile(): ISimpleFile {
+		try {
+			$currentFolder = $this->appData->getFolder('/');
+		} catch (NotFoundException $e) {
+			$currentFolder = $this->appData->newFolder('/');
+		}
+		$filename = self::BLACKLISTED_DOMAINS_FILE_NAME;
+		if ($currentFolder->fileExists($filename)) {
+			return $currentFolder->getFile($filename);
+		}
+		return $currentFolder->newFile($filename);
+	}
+	/**
+	 * Retrieve the blacklisted domain data.
+	 *
+	 * @return array The array of blacklisted domains.
+	 */
+	public function getBlacklistedDomainData(): array {
+		$document = self::BLACKLISTED_DOMAINS_FILE_NAME;
+		$file = $this->getBlacklistedDomainsFile();
+		try {
+			$blacklistedDomainsInJson = $file->getContent();
+			if (empty($blacklistedDomainsInJson)) {
+				return [];
+			}
+			return json_decode($blacklistedDomainsInJson, true, 512, JSON_THROW_ON_ERROR);
+		} catch (NotFoundException $e) {
+			$this->logger->warning('Blacklisted domains file ' . $document . ' not found!');
+			return [];
+		} catch (\Throwable $e) {
+			$this->logger->warning('Error decoding blacklisted domains file ' . $document . ': ' . $e->getMessage());
+			return [];
+		}
+	}
+	
+	/**
+	 * Ensure the specified folder exists within AppData.
+	 *
+	 * @return bool
+	 */
+	private function ensureDocumentsFolder(): bool {
+		try {
+			$this->appData->getFolder('/');
+		} catch (NotFoundException $e) {
+			$this->logger->error(Application::APP_ID . ' AppData folder not found!');
+			return false;
+		} catch (\RuntimeException $e) {
+			$this->logger->error(Application::APP_ID . ' AppData folder not found! Runtime Error: '.$e->getMessage());
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 1b8d5f46..8364edeb 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -41,8 +41,8 @@ class UserService {
 	private $apiConfig;
 	/** @var LDAPConnectionService */
 	private $LDAPConnectionService;
-
-	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults, IFactory $l10nFactory, LDAPConnectionService $LDAPConnectionService) {
+	private BlackListService $blackListService;
+	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults, IFactory $l10nFactory, LDAPConnectionService $LDAPConnectionService, BlackListService $blackListService) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->appConfig = $this->config->getSystemValue($appName);
@@ -51,6 +51,7 @@ class UserService {
 		$this->defaults = $defaults;
 		$this->l10nFactory = $l10nFactory;
 		$this->LDAPConnectionService = $LDAPConnectionService;
+		$this->blackListService = $blackListService;
 		$commonServiceURL = $this->config->getSystemValue('common_services_url', '');
 
 		if (!empty($commonServiceURL)) {
@@ -274,37 +275,10 @@ class UserService {
 		if ($this->isRecoveryEmailDomainDisallowed($recoveryEmail)) {
 			throw new Exception('You cannot set an email address with a Murena domain as recovery email address.');
 		}
-		if ($this->isBlacklistedEmail($recoveryEmail)) {
+		if ($this->blackListService->isBlacklistedEmail($recoveryEmail)) {
 			throw new BlacklistedEmailException('The domain of this email address is blacklisted. Please provide another recovery address.');
 		}
 	}
-	/**
-	 * Check if an email domain is blacklisted against a JSON list of disposable email domains.
-	 *
-	 * @param string $email The email address to check.
-	 * @return bool True if the email domain is blacklisted, false otherwise.
-	 */
-	public function isBlacklistedEmail(string $email): bool {
-		// Get the blacklisted domains from configuration
-		$blacklistedDomainsInJson = $this->config->getAppValue(Application::APP_ID, 'blacklisted_domains');
-		if (empty($blacklistedDomainsInJson)) {
-			return false;
-		}
-		$blacklistedDomains = json_decode($blacklistedDomainsInJson, true);
-
-		if (empty($blacklistedDomains)) {
-			return false;
-		}
-
-		// Split the email address into parts using explode
-		$emailParts = explode('@', $email);
-		
-		// Extract the domain part
-		$emailDomain = strtolower(end($emailParts));
-		
-		// Check if the email domain is in the blacklisted domains array
-		return in_array($emailDomain, $blacklistedDomains);
-	}
 	/**
 	 * Add a new user to the LDAP directory.
 	 *
-- 
GitLab


From 62502b70ef39e45c096f2972a0b12c0d69016d96 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Fri, 21 Jun 2024 09:46:31 +0530
Subject: [PATCH 090/185] bump to 6.1.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b3a4c439..3b020429 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.0.4</version>
+    <version>6.1.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From fbb39e506e59b3dfdbed86cfbcdba5b0d795abdd Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 24 Jun 2024 13:50:50 +0000
Subject: [PATCH 091/185] Added Validation Exception to show validation message

---
 lib/Controller/AccountController.php               | 3 ++-
 lib/Exception/RecoveryEmailValidationException.php | 9 +++++++++
 lib/Service/UserService.php                        | 7 ++++---
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 lib/Exception/RecoveryEmailValidationException.php

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 82aa8507..4b1421d1 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -11,6 +11,7 @@ use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
 use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
+use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
 use OCA\EcloudAccounts\Service\CaptchaService;
 use OCA\EcloudAccounts\Service\NewsLetterService;
 use OCA\EcloudAccounts\Service\UserService;
@@ -168,7 +169,7 @@ class AccountController extends Controller {
 			$this->logger->logException($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 (BlacklistedEmailException | Error $e) {
+		} catch (BlacklistedEmailException | RecoveryEmailValidationException | Error $e) {
 			$this->logger->logException($e, ['app' => Application::APP_ID]);
 			$response->setData(['message' => $e->getMessage(), 'success' => false]);
 			$response->setStatus(500);
diff --git a/lib/Exception/RecoveryEmailValidationException.php b/lib/Exception/RecoveryEmailValidationException.php
new file mode 100644
index 00000000..528a3372
--- /dev/null
+++ b/lib/Exception/RecoveryEmailValidationException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class RecoveryEmailValidationException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 8364edeb..1c1b85cb 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -11,6 +11,7 @@ use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
 use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
+use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
 use OCP\Defaults;
 use OCP\IConfig;
 use OCP\ILogger;
@@ -267,13 +268,13 @@ class UserService {
 	 */
 	public function validateRecoveryEmail(string $recoveryEmail): void {
 		if (!$this->isValidEmailFormat($recoveryEmail)) {
-			throw new Exception('Recovery email address has an incorrect format.');
+			throw new RecoveryEmailValidationException('Recovery email address has an incorrect format.');
 		}
 		if ($this->checkRecoveryEmailAvailable($recoveryEmail)) {
-			throw new Exception('Recovery email address is already taken.');
+			throw new RecoveryEmailValidationException('Recovery email address is already taken.');
 		}
 		if ($this->isRecoveryEmailDomainDisallowed($recoveryEmail)) {
-			throw new Exception('You cannot set an email address with a Murena domain as recovery email address.');
+			throw new RecoveryEmailValidationException('You cannot set an email address with a Murena domain as recovery email address.');
 		}
 		if ($this->blackListService->isBlacklistedEmail($recoveryEmail)) {
 			throw new BlacklistedEmailException('The domain of this email address is blacklisted. Please provide another recovery address.');
-- 
GitLab


From 58bd149cde302f4cf967828ce839e7ac9f9b5078 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 25 Jun 2024 10:01:27 +0000
Subject: [PATCH 092/185] fix logging cause crash on password update

---
 lib/AppInfo/Application.php               |  2 +-
 lib/Listeners/PasswordUpdatedListener.php | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 1859c022..b1635540 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -55,7 +55,7 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
-		// $context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
+		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/Listeners/PasswordUpdatedListener.php b/lib/Listeners/PasswordUpdatedListener.php
index c283ac91..8d1dd8f8 100644
--- a/lib/Listeners/PasswordUpdatedListener.php
+++ b/lib/Listeners/PasswordUpdatedListener.php
@@ -5,21 +5,28 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Listeners;
 
 use Exception;
+use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Service\SSOService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\ILogger;
+use OCP\ISession;
+use OCP\IUserSession;
 use OCP\User\Events\PasswordUpdatedEvent;
 
 class PasswordUpdatedListener implements IEventListener {
 	
 	private SSOService $ssoService;
 
-	private $logger;
+	private ILogger $logger;
+	private ISession $session;
+	private IUserSession $userSession;
 
-	public function __construct(SSOService $ssoService, ILogger $logger) {
+	public function __construct(SSOService $ssoService, ILogger $logger, ISession $session, IUserSession $userSession) {
 		$this->ssoService = $ssoService;
 		$this->logger = $logger;
+		$this->session = $session;
+		$this->userSession = $userSession;
 	}
 
 	public function handle(Event $event): void {
@@ -27,13 +34,17 @@ class PasswordUpdatedListener implements IEventListener {
 			return;
 		}
 
+		if (!$this->userSession->isLoggedIn() || !$this->session->exists('is_oidc')) {
+			return;
+		}
+
 		$user = $event->getUser();
 		$username = $user->getUID();
 
 		try {
 			$this->ssoService->logout($username);
 		} catch (Exception $e) {
-			$this->logger->logException('Failed to logout from ssoService for user: ' . $username, ['exception' => $e]);
+			$this->logger->logException($e, ['app' => Application::APP_ID]);
 		}
 	}
 }
-- 
GitLab


From 75c0313d2449e21309987eb29719c0ea75af59ce Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Wed, 26 Jun 2024 09:03:54 +0000
Subject: [PATCH 093/185] Dev/remove autologin sso from ecloud accounts

---
 .../BeforeTemplateRenderedListener.php        | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
index adece9c3..d124d813 100644
--- a/lib/Listeners/BeforeTemplateRenderedListener.php
+++ b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -23,9 +23,6 @@ class BeforeTemplateRenderedListener implements IEventListener {
 	private $appManager;
 	private Util $util;
 
-	private const SNAPPYMAIL_APP_ID = 'snappymail';
-	private const SNAPPYMAIL_URL = '/apps/snappymail/';
-	private const SNAPPYMAIL_AUTOLOGIN_PWD = '1';
 
 	public function __construct($appName, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, IAppManager $appManager, Util $util) {
 		$this->appName = $appName;
@@ -41,9 +38,7 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		if (!($event instanceof BeforeTemplateRenderedEvent)) {
 			return;
 		}
-		if ($this->userSession->isLoggedIn() && $this->appManager->isEnabledForUser(self::SNAPPYMAIL_APP_ID) && strpos($this->request->getPathInfo(), self::SNAPPYMAIL_URL) !== false) {
-			$this->autoLoginWebmail();
-		}
+
 		$pathInfo = $this->request->getPathInfo();
 
 		if (strpos($pathInfo, '/apps/ecloud-accounts/accounts') !== false) {
@@ -51,36 +46,4 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		}
 
 	}
-
-
-	private function autoLoginWebmail() {
-		$isOidcLogin = $this->session->get('is_oidc');
-		if (!$isOidcLogin) {
-			return;
-		}
-		$accountId = $this->getAccountId();
-		$actions = \RainLoop\Api::Actions();
-
-		if (empty($accountId) || $actions->getMainAccountFromToken(false)) {
-			return;
-		}
-
-		// Just send over '1' as password to trigger login as the plugin will set the correct access token
-		$password = self::SNAPPYMAIL_AUTOLOGIN_PWD; // As we cannot pass by reference to LoginProcess
-		$account = $actions->LoginProcess($accountId, $password, false);
-		if ($account) {
-			$actions->Plugins()->RunHook('login.success', array($account));
-			$actions->SetAuthToken($account);
-		}
-	}
-
-	private function getAccountId(): string {
-		$username = $this->userSession->getUser()->getUID();
-		if ($this->config->getAppValue('snappymail', 'snappymail-autologin', false)) {
-			return $username;
-		}
-		if ($this->config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
-			return $this->config->getUserValue($username, 'settings', 'email', '');
-		}
-	}
 }
-- 
GitLab


From 37f6ed40f29b9c0abfb43f596daee50b4295cf80 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 27 Jun 2024 17:57:56 +0530
Subject: [PATCH 094/185] Bump to 6.1.1

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 3b020429..fdd6d0b9 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.1.0</version>
+    <version>6.1.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 9829c91e976c317762921e913f98cdbef48ef8b0 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 15 Jul 2024 14:05:54 +0000
Subject: [PATCH 095/185] Remove duplication and use EmailRecovery functions

---
 appinfo/info.xml                            |   1 -
 l10n/de.js                                  |   6 +-
 l10n/de.json                                |   6 +-
 l10n/en.js                                  |   7 +-
 l10n/en.json                                |   6 +-
 l10n/es.js                                  |   6 +-
 l10n/es.json                                |   6 +-
 l10n/fr.js                                  |   6 +-
 l10n/fr.json                                |   6 +-
 l10n/it.js                                  |   6 +-
 l10n/it.json                                |   6 +-
 lib/Command/UpdateBlacklistedDomains.php    |  39 -------
 lib/Controller/AccountController.php        |   7 +-
 lib/Event/BeforeUserRegisteredEvent.php     |  62 ++++++++++
 lib/Exception/BlacklistedEmailException.php |   9 --
 lib/Listeners/UserChangedListener.php       |  21 +---
 lib/Service/BlackListService.php            | 118 --------------------
 lib/Service/LDAPConnectionService.php       |  18 +++
 lib/Service/UserService.php                 | 113 ++-----------------
 19 files changed, 105 insertions(+), 344 deletions(-)
 delete mode 100644 lib/Command/UpdateBlacklistedDomains.php
 create mode 100644 lib/Event/BeforeUserRegisteredEvent.php
 delete mode 100644 lib/Exception/BlacklistedEmailException.php
 delete mode 100644 lib/Service/BlackListService.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index fdd6d0b9..99285740 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -25,7 +25,6 @@
 		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
 	</settings>
     <commands>
-        <command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
diff --git a/l10n/de.js b/l10n/de.js
index 26bd31c0..92cbe4ee 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -79,12 +79,8 @@ OC.L10N.register(
 		"Important:": "Das ist wichtig:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
 		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
-		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
-		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
-		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 581f0a74..8d5e2d08 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -77,13 +77,9 @@
 		"Important:": "Das ist wichtig:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
 		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
-		"Recovery email address has an incorrect format.": "Die E-Mail-Adresse für die Wiederherstellung hat ein falsches Format.",
-		"Recovery email address is already taken.": "Die E-Mail-Adresse für die Wiederherstellung ist bereits vergeben.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
-		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index b25bf722..8030a730 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -77,18 +77,13 @@ OC.L10N.register(
 		"Success!": "Success!",
 		"Your <b>__username__@__domain__</b> account was successfully created.": "Your <b>__username__@__domain__</b> account was successfully created.",
 		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.",
-		"Recovery email address is already taken.": "Recovery email address is already taken.",
 		"Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32",
 		"Use an alternative email": "Use an alternative email",
 		"Important:": "Important:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
 		"Set a recovery email address": "Set a recovery email address",
-		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
-		"Recovery email address is already taken.": "Recovery email address is already taken.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
-		"An error occurred while creating your account!": "An error occurred while creating your account!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."
+		"An error occurred while creating your account!": "An error occurred while creating your account!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index be378a0a..4ff11bf0 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -79,13 +79,9 @@
 		"Important:": "Important:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.",
 		"Set a recovery email address": "Set a recovery email address",
-		"Recovery email address has an incorrect format.": "Recovery email address has an incorrect format.",
-		"Recovery email address is already taken.": "Recovery email address is already taken.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
-		"An error occurred while creating your account!": "An error occurred while creating your account!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."
+		"An error occurred while creating your account!": "An error occurred while creating your account!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index 19fa33c7..5f992f49 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -81,12 +81,8 @@ OC.L10N.register(
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.",
 		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación",
-		"Recovery email address has an incorrect format.": "La dirección de correo electrónico de recuperación tiene un formato incorrecto.",
-		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
-		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "El dominio de esta dirección de correo electrónico está en lista negra. Por favor, proporciona otra dirección de recuperación."
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 867f150d..d4083680 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -80,13 +80,9 @@
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.",
 		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación",
-		"Recovery email address has an incorrect format.": "La dirección de correo electrónico de recuperación tiene un formato incorrecto.",
-		"Recovery email address is already taken.": "La dirección de correo electrónico de recuperación ya está ocupada.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "No puede establecer una dirección de correo electrónico con un dominio de Murena como dirección de correo electrónico de recuperación.",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
-		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "El dominio de esta dirección de correo electrónico está en lista negra. Por favor, proporciona otra dirección de recuperación."
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 6efaeeca..f4e12ac1 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -80,12 +80,8 @@ OC.L10N.register(
 		"Important:": "Important :",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.",
 		"Set a recovery email address": "Définir une adresse électronique de récupération",
-		"Recovery email address has an incorrect format.": "Le format de l'adresse électronique de récupération est incorrect.",
-		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
-		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "Le domain de cette adresse e-mail est sur liste noire. Merci de bien vouloir fournir une autre adresse de récupération."
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 19facc30..479b0cf1 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -79,13 +79,9 @@
 		"Important:": "Important :",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.",
 		"Set a recovery email address": "Définir une adresse électronique de récupération",
-		"Recovery email address has an incorrect format.": "Le format de l'adresse électronique de récupération est incorrect.",
-		"Recovery email address is already taken.": "L'adresse électronique de récupération est déjà prise.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "Vous ne pouvez pas définir une adresse électronique avec un domaine Murena comme adresse électronique de récupération.",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
-		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "Le domain de cette adresse e-mail est sur liste noire. Merci de bien vouloir fournir une autre adresse de récupération."
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 84c211cd..6399df1e 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -80,12 +80,8 @@ OC.L10N.register(
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.",
 		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero",
-		"Recovery email address has an incorrect format.": "L'indirizzo e-mail di recupero ha un formato errato.",
-		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
-		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "Il dominio cui appartiene questo indirizzo e-mail è contenuto in una black list. Inserisci un indirizzo di recovery differente."
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 2685c394..840043dc 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -75,13 +75,9 @@
 		"Important:": "Importante:",
 		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.",
 		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero",
-		"Recovery email address has an incorrect format.": "L'indirizzo e-mail di recupero ha un formato errato.",
-		"Recovery email address is already taken.": "L'indirizzo e-mail di recupero è già stato preso.",
-		"You cannot set an email address with a Murena domain as recovery email address.": "Non è possibile impostare un indirizzo e-mail con un dominio Murena come indirizzo e-mail di recupero.",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
-		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
-		"The domain of this email address is blacklisted. Please provide another recovery address.": "Il dominio cui appartiene questo indirizzo e-mail è contenuto in una black list. Inserisci un indirizzo di recovery differente."
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Command/UpdateBlacklistedDomains.php b/lib/Command/UpdateBlacklistedDomains.php
deleted file mode 100644
index 74bc1642..00000000
--- a/lib/Command/UpdateBlacklistedDomains.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Command;
-
-use OCA\EcloudAccounts\AppInfo\Application;
-use OCA\EcloudAccounts\Service\BlackListService;
-use OCP\ILogger;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class UpdateBlacklistedDomains extends Command {
-	private BlackListService $blackListService;
-	private ILogger $logger;
-
-
-	public function __construct(BlackListService $blackListService, ILogger $logger) {
-		parent::__construct();
-		$this->blackListService = $blackListService;
-		$this->logger = $logger;
-	}
-
-	protected function configure() {
-		$this->setName(Application::APP_ID.':update-blacklisted-domains')->setDescription('Update blacklisted domains');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		try {
-			$this->blackListService->updateBlacklistedDomains();
-			$output->writeln('Updated blacklisted domains for creation.');
-		} catch (\Throwable $th) {
-			$this->logger->error('Error while updating blacklisted domains. ' . $th->getMessage());
-			$output->writeln('Error while updating blacklisted domains. '. $th->getMessage());
-		}
-		return 1;
-	}
-}
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 4b1421d1..6d78e275 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -9,7 +9,6 @@ namespace OCA\EcloudAccounts\Controller;
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
 use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
-use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
 use OCA\EcloudAccounts\Service\CaptchaService;
@@ -142,7 +141,7 @@ class AccountController extends Controller {
 			$username = mb_strtolower($username, 'UTF-8');
 			$mainDomain = $this->userService->getMainDomain();
 			$userEmail = $username.'@'.$mainDomain;
-			$this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password);
+			$this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password, $language);
 			sleep(2);
 
 			$this->userService->setAccountDataLocally($username, $userEmail);
@@ -169,10 +168,10 @@ class AccountController extends Controller {
 			$this->logger->logException($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 (BlacklistedEmailException | RecoveryEmailValidationException | Error $e) {
+		} catch (RecoveryEmailValidationException $e) {
 			$this->logger->logException($e, ['app' => Application::APP_ID]);
 			$response->setData(['message' => $e->getMessage(), 'success' => false]);
-			$response->setStatus(500);
+			$response->setStatus(400);
 		} catch (AddUsernameToCommonStoreException $e) {
 			$this->logger->logException($e, ['app' => Application::APP_ID]);
 			$response->setStatus(200);
diff --git a/lib/Event/BeforeUserRegisteredEvent.php b/lib/Event/BeforeUserRegisteredEvent.php
new file mode 100644
index 00000000..422873e7
--- /dev/null
+++ b/lib/Event/BeforeUserRegisteredEvent.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2024 Murena SAS <ronak.patel.ext@murena.com>
+ *
+ * @author Murena SAS <ronak.patel.ext@murena.com>
+ *
+ * @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 OCA\EcloudAccounts\Event;
+
+use OCP\EventDispatcher\Event;
+
+/**
+ * Emitted before a new user is created on the back-end.
+ *
+ * @since 18.0.0
+ */
+class BeforeUserRegisteredEvent extends Event {
+
+	private $recoveryMailAddress;
+	private $language;
+	private $username;
+	private $displayName;
+
+	public function __construct(string $username, string $displayName, string $recoveryMailAddress, string $language) {
+		$this->username = $username;
+		$this->displayName = $displayName;
+		$this->recoveryMailAddress = $recoveryMailAddress;
+		$this->language = $language;
+	}
+	public function getRecoveryEmail(): string {
+		return $this->recoveryMailAddress;
+	}
+
+	public function getLanguage(): string {
+		return $this->language;
+	}
+	public function getUsername(): string {
+		return $this->username;
+	}
+	public function getDisplayName(): string {
+		return $this->displayName;
+	}
+}
diff --git a/lib/Exception/BlacklistedEmailException.php b/lib/Exception/BlacklistedEmailException.php
deleted file mode 100644
index a435268b..00000000
--- a/lib/Exception/BlacklistedEmailException.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace OCA\EcloudAccounts\Exception;
-
-class BlacklistedEmailException extends \Exception {
-	public function __construct($message = null, $code = 0) {
-		parent::__construct($message, $code);
-	}
-}
diff --git a/lib/Listeners/UserChangedListener.php b/lib/Listeners/UserChangedListener.php
index 7204f3e0..d211224e 100644
--- a/lib/Listeners/UserChangedListener.php
+++ b/lib/Listeners/UserChangedListener.php
@@ -16,27 +16,23 @@ use OCP\Util;
 
 class UserChangedListener implements IEventListener {
 	private const QUOTA_FEATURE = 'quota';
-
-	private const RECOVERY_EMAIL_FEATURE = 'recovery-email';
-
 	private const ENABLED_FEATURE = 'enabled';
 
 	private $util;
 
 	private $logger;
 
-	private $ldapConnectionService;
-
 	private $mailboxMapper;
 
 	private $userService;
+	private $LDAPConnectionService;
 
-	public function __construct(Util $util, LDAPConnectionService $LDAPConnectionService, ILogger $logger, MailboxMapper $mailboxMapper, UserService $userService) {
+	public function __construct(Util $util, ILogger $logger, MailboxMapper $mailboxMapper, UserService $userService, LDAPConnectionService $LDAPConnectionService) {
 		$this->util = $util;
-		$this->ldapConnectionService = $LDAPConnectionService;
 		$this->mailboxMapper = $mailboxMapper;
 		$this->logger = $logger;
 		$this->userService = $userService;
+		$this->LDAPConnectionService = $LDAPConnectionService;
 	}
 
 	public function handle(Event $event): void {
@@ -57,15 +53,6 @@ class UserChangedListener implements IEventListener {
 			$this->updateQuota($username, $backend, $quotaInBytes);
 		}
 
-		if ($feature === self::RECOVERY_EMAIL_FEATURE) {
-			$recoveryEmail = $event->getValue();
-			$recoveryEmailAttribute = [
-				'recoveryMailAddress' => $recoveryEmail
-			];
-
-			$this->userService->updateAttributesInLDAP($username, $recoveryEmailAttribute);
-		}
-
 		if ($feature === self::ENABLED_FEATURE) {
 			try {
 				$this->userService->mapActiveAttributesInLDAP($username, $newValue);
@@ -84,7 +71,7 @@ class UserChangedListener implements IEventListener {
 				$quotaAttribute = [
 					'quota' => $quotaInBytes
 				];
-				$this->userService->updateAttributesInLDAP($username, $quotaAttribute);
+				$this->LDAPConnectionService->updateAttributesInLDAP($username, $quotaAttribute);
 			}
 		} catch (Exception $e) {
 			$this->logger->error("Error setting quota for user $username " . $e->getMessage());
diff --git a/lib/Service/BlackListService.php b/lib/Service/BlackListService.php
deleted file mode 100644
index ba9d0a21..00000000
--- a/lib/Service/BlackListService.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Service;
-
-use OCP\Files\IAppData;
-use OCP\Files\NotFoundException;
-use OCP\Files\SimpleFS\ISimpleFile;
-use OCP\ILogger;
-
-class BlackListService {
-	private IAppData $appData;
-	private ILogger $logger;
-	private const BLACKLISTED_DOMAINS_FILE_NAME = 'blacklisted_domains.json';
-	private const BLACKLISTED_DOMAINS_URL = 'https://raw.githubusercontent.com/disposable/disposable-email-domains/master/domains.json';
-
-	public function __construct(ILogger $logger, IAppData $appData) {
-		$this->appData = $appData;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Check if an email domain is blacklisted against a JSON list of disposable email domains.
-	 *
-	 * @param string $email The email address to check.
-	 * @return bool True if the email domain is blacklisted, false otherwise.
-	 */
-	public function isBlacklistedEmail(string $email): bool {
-		if (!$this->ensureDocumentsFolder()) {
-			return false;
-		}
-		$blacklistedDomains = $this->getBlacklistedDomainData();
-		if (empty($blacklistedDomains)) {
-			return false;
-		}
-		$emailParts = explode('@', $email);
-		$emailDomain = strtolower(end($emailParts));
-		return in_array($emailDomain, $blacklistedDomains);
-	}
-	/**
-	 * Update the blacklisted domains data by fetching it from a URL and saving it locally.
-	 *
-	 * @return void
-	 */
-	public function updateBlacklistedDomains(): void {
-		$blacklisted_domain_url = self::BLACKLISTED_DOMAINS_URL;
-		$json_data = file_get_contents($blacklisted_domain_url);
-		$this->setBlacklistedDomainsData($json_data);
-	}
-	/**
-	 * Store blacklisted domain data in a file within AppData.
-	 *
-	 * @param string $data The data to be stored in the file.
-	 * @return void
-	 */
-	private function setBlacklistedDomainsData(string $data): void {
-		$file = $this->getBlacklistedDomainsFile();
-		$file->putContent($data);
-	}
-	/**
-	 * Retrieve the blacklisted domain file path
-	 *
-	 * @return ISimpleFile
-	 */
-	private function getBlacklistedDomainsFile(): ISimpleFile {
-		try {
-			$currentFolder = $this->appData->getFolder('/');
-		} catch (NotFoundException $e) {
-			$currentFolder = $this->appData->newFolder('/');
-		}
-		$filename = self::BLACKLISTED_DOMAINS_FILE_NAME;
-		if ($currentFolder->fileExists($filename)) {
-			return $currentFolder->getFile($filename);
-		}
-		return $currentFolder->newFile($filename);
-	}
-	/**
-	 * Retrieve the blacklisted domain data.
-	 *
-	 * @return array The array of blacklisted domains.
-	 */
-	public function getBlacklistedDomainData(): array {
-		$document = self::BLACKLISTED_DOMAINS_FILE_NAME;
-		$file = $this->getBlacklistedDomainsFile();
-		try {
-			$blacklistedDomainsInJson = $file->getContent();
-			if (empty($blacklistedDomainsInJson)) {
-				return [];
-			}
-			return json_decode($blacklistedDomainsInJson, true, 512, JSON_THROW_ON_ERROR);
-		} catch (NotFoundException $e) {
-			$this->logger->warning('Blacklisted domains file ' . $document . ' not found!');
-			return [];
-		} catch (\Throwable $e) {
-			$this->logger->warning('Error decoding blacklisted domains file ' . $document . ': ' . $e->getMessage());
-			return [];
-		}
-	}
-	
-	/**
-	 * Ensure the specified folder exists within AppData.
-	 *
-	 * @return bool
-	 */
-	private function ensureDocumentsFolder(): bool {
-		try {
-			$this->appData->getFolder('/');
-		} catch (NotFoundException $e) {
-			$this->logger->error(Application::APP_ID . ' AppData folder not found!');
-			return false;
-		} catch (\RuntimeException $e) {
-			$this->logger->error(Application::APP_ID . ' AppData folder not found! Runtime Error: '.$e->getMessage());
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 35537b56..f7609941 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -104,4 +104,22 @@ class LDAPConnectionService {
 	public function getLdapQuota() {
 		return $this->config->getSystemValue('default_quota', '1024');
 	}
+	public function updateAttributesInLDAP(string $username, array $attributes): void {
+		if (!$this->isLDAPEnabled()) {
+			return;
+		}
+
+		$conn = $this->getLDAPConnection();
+		$userDn = $this->username2dn($username);
+
+		if ($userDn === false) {
+			throw new Exception('Could not find DN for username: ' . $username);
+		}
+
+		if (!ldap_modify($conn, $userDn, $attributes)) {
+			throw new Exception('Could not modify user ' . $username . ' entry at LDAP server. Attributes: ' . print_r($attributes, true));
+		}
+
+		$this->closeLDAPConnection($conn);
+	}
 }
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 1c1b85cb..8fb5b220 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -8,18 +8,17 @@ require __DIR__ . '/../../vendor/autoload.php';
 
 use Exception;
 use OCA\EcloudAccounts\AppInfo\Application;
+use OCA\EcloudAccounts\Event\BeforeUserRegisteredEvent;
 use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
-use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
-use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
 use OCP\Defaults;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Util;
-
 use Throwable;
 use UnexpectedValueException;
 
@@ -42,8 +41,8 @@ class UserService {
 	private $apiConfig;
 	/** @var LDAPConnectionService */
 	private $LDAPConnectionService;
-	private BlackListService $blackListService;
-	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults, IFactory $l10nFactory, LDAPConnectionService $LDAPConnectionService, BlackListService $blackListService) {
+	private IEventDispatcher $dispatcher;
+	public function __construct($appName, IUserManager $userManager, IConfig $config, CurlService $curlService, ILogger $logger, Defaults $defaults, IFactory $l10nFactory, LDAPConnectionService $LDAPConnectionService, IEventDispatcher $dispatcher) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->appConfig = $this->config->getSystemValue($appName);
@@ -52,7 +51,7 @@ class UserService {
 		$this->defaults = $defaults;
 		$this->l10nFactory = $l10nFactory;
 		$this->LDAPConnectionService = $LDAPConnectionService;
-		$this->blackListService = $blackListService;
+		$this->dispatcher = $dispatcher;
 		$commonServiceURL = $this->config->getSystemValue('common_services_url', '');
 
 		if (!empty($commonServiceURL)) {
@@ -249,37 +248,14 @@ class UserService {
 	 * @throws Exception If the username or recovery email is already taken.
 	 * @throws LDAPUserCreationException If there is an error adding new entry to LDAP store
 	 */
-	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): void {
+	public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password, string $language = 'en'): void {
 		
 		if ($this->userExists($username) || $this->isUsernameTaken($username)) {
 			throw new Exception("Username '$username' is already taken.");
 		}
-		if (!empty($recoveryEmail)) {
-			$this->validateRecoveryEmail($recoveryEmail);
-		}
+		$this->dispatcher->dispatchTyped(new BeforeUserRegisteredEvent($username, $displayname, $recoveryEmail, $language));
 		$this->addNewUserToLDAP($displayname, $username, $userEmail, $password);
 	}
-	/**
-	 * Validates the recovery email address.
-	 *
-	 * @param string $recoveryEmail The recovery email address to be validated.
-	 * @throws Exception If the recovery email address has an incorrect format, is already taken, or if the domain is disallowed.
-	 * @return void
-	 */
-	public function validateRecoveryEmail(string $recoveryEmail): void {
-		if (!$this->isValidEmailFormat($recoveryEmail)) {
-			throw new RecoveryEmailValidationException('Recovery email address has an incorrect format.');
-		}
-		if ($this->checkRecoveryEmailAvailable($recoveryEmail)) {
-			throw new RecoveryEmailValidationException('Recovery email address is already taken.');
-		}
-		if ($this->isRecoveryEmailDomainDisallowed($recoveryEmail)) {
-			throw new RecoveryEmailValidationException('You cannot set an email address with a Murena domain as recovery email address.');
-		}
-		if ($this->blackListService->isBlacklistedEmail($recoveryEmail)) {
-			throw new BlacklistedEmailException('The domain of this email address is blacklisted. Please provide another recovery address.');
-		}
-	}
 	/**
 	 * Add a new user to the LDAP directory.
 	 *
@@ -319,59 +295,6 @@ class UserService {
 			throw new LDAPUserCreationException("Error while adding entry to LDAP for username: " .  $username . ' Error: ' . ldap_error($connection), ldap_errno($connection));
 		}
 	}
-	/**
-	 * Check if a recovery email address is available (not already taken by another user).
-	 *
-	 * @param string $recoveryEmail The recovery email address to check.
-	 *
-	 * @return bool True if the recovery email address is available, false otherwise.
-	 */
-	public function checkRecoveryEmailAvailable(string $recoveryEmail): bool {
-		$recoveryEmail = strtolower($recoveryEmail);
-		$users = $this->config->getUsersForUserValue('email-recovery', 'recovery-email', $recoveryEmail);
-		if(count($users)) {
-			return true;
-		}
-		$users = $this->config->getUsersForUserValue('email-recovery', 'unverified-recovery-email', $recoveryEmail);
-		if(count($users)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if a recovery email address domain is restricted for some domains
-	 *
-	 * @param string $recoveryEmail The recovery email address to check.
-	 *
-	 * @return bool True if the recovery email address is disallowed, false otherwise.
-	 */
-	public function isRecoveryEmailDomainDisallowed(string $recoveryEmail): bool {
-		
-		$recoveryEmail = strtolower($recoveryEmail);
-		
-		$emailParts = explode('@', $recoveryEmail);
-		$domain = $emailParts[1] ?? '';
-		
-		$legacyDomain = $this->getLegacyDomain();
-		$mainDomain = $this->getMainDomain();
-		
-		$restrictedDomains = [ $legacyDomain, $mainDomain ];
-
-		return in_array($domain, $restrictedDomains);
-	}
-
-	/**
-	 * Check if a recovery email address is in valid format
-	 *
-	 * @param string $recoveryEmail The recovery email address to check.
-	 *
-	 * @return bool True if the recovery email address is valid, false otherwise.
-	 */
-	public function isValidEmailFormat(string $recoveryEmail): bool {
-		return filter_var($recoveryEmail, FILTER_VALIDATE_EMAIL) !== false;
-	}
-
 	/**
 	 * Create a Hide My Email (HME) alias for a user.
 	 *
@@ -528,7 +451,7 @@ class UserService {
 
 	public function mapActiveAttributesInLDAP(string $username, bool $isEnabled): void {
 		$userActiveAttributes = $this->getActiveAttributes($isEnabled);
-		$this->updateAttributesInLDAP($username, $userActiveAttributes);
+		$this->LDAPConnectionService->updateAttributesInLDAP($username, $userActiveAttributes);
 	}
 
 	private function getActiveAttributes(bool $isEnabled): array {
@@ -537,26 +460,6 @@ class UserService {
 			'mailActive' => $isEnabled ? 'TRUE' : 'FALSE',
 		];
 	}
-
-	public function updateAttributesInLDAP(string $username, array $attributes): void {
-		if (!$this->LDAPConnectionService->isLDAPEnabled()) {
-			return;
-		}
-	
-		$conn = $this->LDAPConnectionService->getLDAPConnection();
-		$userDn = $this->LDAPConnectionService->username2dn($username);
-	
-		if ($userDn === false) {
-			throw new Exception('Could not find DN for username: ' . $username);
-		}
-	
-		if (!ldap_modify($conn, $userDn, $attributes)) {
-			throw new Exception('Could not modify user ' . $username . ' entry at LDAP server. Attributes: ' . print_r($attributes, true));
-		}
-	
-		$this->LDAPConnectionService->closeLDAPConnection($conn);
-	}
-	
 	private function getDefaultQuota() {
 		return $this->config->getSystemValueInt('default_quota_in_megabytes', 1024);
 	}
-- 
GitLab


From 17f19e3a4b2789e71d8a109f769b0b0815d16c24 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 24 Jul 2024 13:42:01 +0530
Subject: [PATCH 096/185] Added IP-Address and Recovery email in API call

---
 lib/Controller/AccountController.php | 5 +++--
 lib/Service/UserService.php          | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 6d78e275..48d5117f 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -66,6 +66,7 @@ class AccountController extends Controller {
 		$this->config = $config;
 		$this->urlGenerator = $urlGenerator;
 		$this->logger = $logger;
+		$this->request = $request;
 	}
 
 	/**
@@ -159,8 +160,8 @@ class AccountController extends Controller {
 			
 			$this->session->remove(self::SESSION_USERNAME_CHECK);
 			$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
-
-			$this->userService->addUsernameToCommonDataStore($username);
+			$ipAddress = $this->request->getRemoteAddress();
+			$this->userService->addUsernameToCommonDataStore($username, $ipAddress, $recoveryEmail);
 			$response->setStatus(200);
 			$response->setData(['success' => true]);
 
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index 8fb5b220..fea70cb8 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -420,10 +420,12 @@ class UserService {
 	 * If the operation fails, an exception will be thrown.
 	 *
 	 * @param string $username The username to add to the common data store.
+	 * @param string $ipAddress IP Address of user
+	 * @param string $recoveryEmail A recovery Email of user
 	 *
 	 * @throws AddUsernameToCommonStoreException If an error occurs while adding the username to the common data store.
 	 */
-	public function addUsernameToCommonDataStore(string $username) : void {
+	public function addUsernameToCommonDataStore(string $username, string $ipAddress, string $recoveryEmail) : void {
 		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
@@ -434,7 +436,9 @@ class UserService {
 		$url = $commonServicesURL . $endpoint ;
 		
 		$params = [
-			'username' => $username
+			'username' => $username,
+			'ipAddress' => $ipAddress,
+			'recoveryEmail' => $recoveryEmail
 		];
 
 		$token = $this->apiConfig['commonServicesToken'];
-- 
GitLab


From 8a56e7804caba6a8411ed356f1be70cdfc47e642 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 25 Jul 2024 11:32:15 +0530
Subject: [PATCH 097/185] Bump to 6.1.2

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 99285740..5d1b766c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.1.1</version>
+    <version>6.1.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From d5a52c75d1d3a118c239ff8b2ef2601fb25826a5 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 25 Jul 2024 09:45:35 +0000
Subject: [PATCH 098/185] Change in choosing langugage in singup

---
 lib/Controller/AccountController.php | 6 +++++-
 src/signup/RegistrationForm.vue      | 9 ++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 48d5117f..239a98a3 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -19,6 +19,7 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IRequest;
@@ -39,6 +40,7 @@ class AccountController extends Controller {
 	private $urlGenerator;
 	/** @var IConfig */
 	private IConfig $config;
+	private IInitialState $initialState;
 	private const SESSION_USERNAME_CHECK = 'username_check_passed';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
 	private ILogger $logger;
@@ -53,6 +55,7 @@ class AccountController extends Controller {
 		IURLGenerator $urlGenerator,
 		ISession $session,
 		IConfig $config,
+		IInitialState $initialState,
 		ILogger $logger
 	) {
 		parent::__construct($AppName, $request);
@@ -67,6 +70,7 @@ class AccountController extends Controller {
 		$this->urlGenerator = $urlGenerator;
 		$this->logger = $logger;
 		$this->request = $request;
+		$this->initialState = $initialState;
 	}
 
 	/**
@@ -83,7 +87,7 @@ class AccountController extends Controller {
 		}
 
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $lang;
-
+		$this->initialState->provideInitialState('lang', $lang);
 		return new TemplateResponse(
 			Application::APP_ID,
 			'signup',
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index db414581..aee692b6 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -162,7 +162,7 @@
 import Axios from '@nextcloud/axios'
 import Password from 'vue-password-strength-meter'
 import { generateUrl } from '@nextcloud/router'
-
+import { loadState } from '@nextcloud/initial-state'
 const APPLICATION_NAME = 'ecloud-accounts'
 
 export default {
@@ -212,12 +212,7 @@ export default {
 		},
 	},
 	created() {
-		const currentURL = window.location.href
-		const urlSegments = currentURL.split('/')
-		this.formData.selectedLanguage = 'en'
-		if (urlSegments.length === 8) {
-			this.formData.selectedLanguage = urlSegments[urlSegments.length - 2]
-		}
+		this.formData.selectedLanguage = loadState(this.appName, 'lang')
 	},
 	methods: {
 		validateForm(fieldsToValidate) {
-- 
GitLab


From 89ba47937323e4cb40fdf2e8de00add61912455d Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Thu, 25 Jul 2024 11:54:16 +0000
Subject: [PATCH 099/185] HCaptcha as the captcha provider

---
 README.md                                   | 14 +++-
 appinfo/routes.php                          |  2 +-
 lib/Controller/AccountController.php        | 87 +++++++++++++++++----
 lib/Listeners/BeforeUserDeletedListener.php |  2 +-
 lib/Service/CurlService.php                 | 10 +--
 lib/Service/HCaptchaService.php             | 35 +++++++++
 lib/Service/UserService.php                 |  8 +-
 package-lock.json                           | 15 ++++
 package.json                                |  3 +-
 src/Signup.vue                              | 11 ++-
 src/signup/CaptchaForm.vue                  |  2 +-
 src/signup/HCaptchaForm.vue                 | 74 ++++++++++++++++++
 12 files changed, 234 insertions(+), 29 deletions(-)
 create mode 100644 lib/Service/HCaptchaService.php
 create mode 100644 src/signup/HCaptchaForm.vue

diff --git a/README.md b/README.md
index 42c9c93d..58d2499c 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,18 @@
 
 - This plugin creates an endpoint `/apps/ecloud-accounts/api/set_account_data` that is to be used to set user's email, quota,recovery email and create the user's folder if necessary
 
+### Captcha Configuration for user account creation
+
+- Simple image based captcha is the default for human verification
+- To change the value, set `ecloud-accounts.captcha_provider` 
+  - Allowed values are `image` (default) and `hcaptcha` (https://hcaptcha.com)
+
+#### HCaptcha Configuration
+
+- For hcaptcha provider to work, set the following values correctly:
+  - `ecloud-accounts.hcaptcha_site_key`
+  - `ecloud-accounts.hcaptcha_secret`
+
 ## Drop account
 
 - The drop account functionality plugin works in conjunction with the drop_account plugin : https://apps.nextcloud.com/apps/drop_account
@@ -25,7 +37,7 @@
 
 Please open issues here : https://gitlab.e.foundation/e/backlog/issues
 
-## Dependancies
+## Dependencies
 
 This plugin works in cunjunction with the drop_account plugin : https://apps.nextcloud.com/apps/drop_account
 
diff --git a/appinfo/routes.php b/appinfo/routes.php
index e89d7d76..eeeec68a 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -10,7 +10,7 @@ return ['routes' => [
 	['name' => 'shop_account#check_shop_email_post_delete', 'url' => '/shop-accounts/check_shop_email_post_delete', 'verb' => 'GET'],
 	[
 		'name' => 'user#preflighted_cors', 'url' => '/api/{path}',
-		'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')
+		'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']
 	],
 	[
 		'name' => 'beta_user#remove_user_in_group',
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 239a98a3..95c4bb47 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -12,6 +12,7 @@ use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
 use OCA\EcloudAccounts\Service\CaptchaService;
+use OCA\EcloudAccounts\Service\HCaptchaService;
 use OCA\EcloudAccounts\Service\NewsLetterService;
 use OCA\EcloudAccounts\Service\UserService;
 use OCP\AppFramework\Controller;
@@ -34,6 +35,7 @@ class AccountController extends Controller {
 	private $userService;
 	private $newsletterService;
 	private $captchaService;
+	private HCaptchaService $hCaptchaService;
 	protected $l10nFactory;
 	private $session;
 	private $userSession;
@@ -43,6 +45,11 @@ class AccountController extends Controller {
 	private IInitialState $initialState;
 	private const SESSION_USERNAME_CHECK = 'username_check_passed';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
+	private const ALLOWED_CAPTCHA_PROVIDERS = ['image', 'hcaptcha'];
+	private const DEFAULT_CAPTCHA_PROVIDER = 'image';
+	private const HCAPTCHA_PROVIDER = 'hcaptcha';
+	private const HCAPTCHA_DOMAINS = ['https://hcaptcha.com', 'https://*.hcaptcha.com'];
+
 	private ILogger $logger;
 	public function __construct(
 		$AppName,
@@ -50,19 +57,21 @@ class AccountController extends Controller {
 		UserService $userService,
 		NewsLetterService $newsletterService,
 		CaptchaService $captchaService,
+		HCaptchaService $hCaptchaService,
 		IFactory $l10nFactory,
 		IUserSession $userSession,
 		IURLGenerator $urlGenerator,
 		ISession $session,
 		IConfig $config,
-		IInitialState $initialState,
-		ILogger $logger
+		ILogger $logger,
+		IInitialState $initialState
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
 		$this->userService = $userService;
 		$this->newsletterService = $newsletterService;
 		$this->captchaService = $captchaService;
+		$this->hCaptchaService = $hCaptchaService;
 		$this->l10nFactory = $l10nFactory;
 		$this->session = $session;
 		$this->userSession = $userSession;
@@ -88,12 +97,30 @@ class AccountController extends Controller {
 
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $lang;
 		$this->initialState->provideInitialState('lang', $lang);
-		return new TemplateResponse(
+		
+		$response = new TemplateResponse(
 			Application::APP_ID,
 			'signup',
 			['appName' => Application::APP_ID, 'lang' => $lang],
 			TemplateResponse::RENDER_AS_GUEST
 		);
+
+		$captchaProvider = $this->getCaptchaProvider();
+		$this->initialState->provideInitialState('captchaProvider', $captchaProvider);
+		
+		if ($captchaProvider === self::HCAPTCHA_PROVIDER) {
+			$csp = $response->getContentSecurityPolicy();
+			foreach (self::HCAPTCHA_DOMAINS as $domain) {
+				$csp->addAllowedScriptDomain($domain);
+				$csp->addAllowedFrameDomain($domain);
+				$csp->addAllowedStyleDomain($domain);
+				$csp->addAllowedConnectDomain($domain);
+			}
+			$response->setContentSecurityPolicy($csp);
+			$hcaptchaSiteKey = $this->config->getSystemValue(Application::APP_ID . '.hcaptcha_site_key');
+			$this->initialState->provideInitialState('hCaptchaSiteKey', $hcaptchaSiteKey);
+		}
+		return $response;
 	}
 	
 	/**
@@ -198,7 +225,7 @@ class AccountController extends Controller {
 	 *
 	 * @return string|null If validation fails, a string describing the error; otherwise, null.
 	 */
-	public function validateInput(string $inputName, string $value, int $maxLength = null) : ?string {
+	public function validateInput(string $inputName, string $value, ?int $maxLength = null) : ?string {
 		if ($value === '') {
 			return "$inputName is required.";
 		}
@@ -249,10 +276,15 @@ class AccountController extends Controller {
 	 * @NoCSRFRequired
 	 */
 	public function captcha(): Http\DataDisplayResponse {
-		$captchaValue = $this->captchaService->generateCaptcha();
+		// Don't allow requests to image captcha if different provider is set
+		if ($this->getCaptchaProvider() !== self::DEFAULT_CAPTCHA_PROVIDER) {
+			$response = new DataResponse();
+			$response->setStatus(400);
+			return $response;
+		}
 
+		$captchaValue = $this->captchaService->generateCaptcha();
 		$response = new Http\DataDisplayResponse($captchaValue, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-
 		return $response;
 	}
 	/**
@@ -262,24 +294,51 @@ class AccountController extends Controller {
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
-	 * @param string $captchaInput The user-provided human verification input.
+	 * @param string $token The user-provided human verification input.
+	 * @param string $bypassToken Token to bypass captcha for automation testing
 	 *
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
-	public function verifyCaptcha(string $captchaInput = '', string $bypassToken = '') : DataResponse {
+	public function verifyCaptcha(string $userToken = '', string $bypassToken = '') : DataResponse {
 		$response = new DataResponse();
-		$captchaToken = $this->config->getSystemValue('bypass_captcha_token', '');
-		// Initialize the default status to 400 (Bad Request)
+
+		// Check if the input matches the bypass token
+		$bypassTokenInConfig = $this->config->getSystemValue('bypass_captcha_token', '');
+		if ((!empty($bypassTokenInConfig) && $bypassToken === $bypassTokenInConfig)) {
+			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
+			$response->setStatus(200);
+		}
+
 		$response->setStatus(400);
-		// Check if the input matches the bypass token or the stored captcha result
-		$captchaResult = (string) $this->session->get(CaptchaService::CAPTCHA_RESULT_KEY, '');
-		if ((!empty($captchaToken) && $bypassToken === $captchaToken) || (!empty($captchaResult) && $captchaInput === $captchaResult)) {
+		$captchaProvider = $this->getCaptchaProvider();
+
+		// Check for default captcha provider
+		if ($captchaProvider === self::DEFAULT_CAPTCHA_PROVIDER && $this->verifyImageCaptcha($userToken)) {
 			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
+			$this->session->remove(CaptchaService::CAPTCHA_RESULT_KEY);
 			$response->setStatus(200);
 		}
 
-		$this->session->remove(CaptchaService::CAPTCHA_RESULT_KEY);
+		// Check for hcaptcha provider
+		if ($captchaProvider === self::HCAPTCHA_PROVIDER && $this->hCaptchaService->verify($userToken)) {
+			$this->session->set(self::CAPTCHA_VERIFIED_CHECK, true);
+			$response->setStatus(200);
+		}
 		return $response;
 	}
 
+	private function verifyImageCaptcha(string $captchaInput = '') : bool {
+		$captchaResult = (string) $this->session->get(CaptchaService::CAPTCHA_RESULT_KEY, '');
+		return (!empty($captchaResult) && $captchaInput === $captchaResult);
+	}
+
+	private function getCaptchaProvider() : string {
+		$captchaProvider = $this->config->getSystemValue('ecloud-accounts.captcha_provider', self::DEFAULT_CAPTCHA_PROVIDER);
+
+		if (!in_array($captchaProvider, self::ALLOWED_CAPTCHA_PROVIDERS)) {
+			$captchaProvider = self::DEFAULT_CAPTCHA_PROVIDER;
+		}
+		return $captchaProvider;
+	}
+
 }
diff --git a/lib/Listeners/BeforeUserDeletedListener.php b/lib/Listeners/BeforeUserDeletedListener.php
index aa4a21eb..a2ab5007 100644
--- a/lib/Listeners/BeforeUserDeletedListener.php
+++ b/lib/Listeners/BeforeUserDeletedListener.php
@@ -46,7 +46,7 @@ class BeforeUserDeletedListener implements IEventListener {
 		$isUserOnLDAP = $this->LDAPConnectionService->isUserOnLDAPBackend($user);
 
 		try {
-			$this->logger->info("PostDelete user {user}", array('user' => $uid));
+			$this->logger->info("PostDelete user {user}", ['user' => $uid]);
 			$this->userService->deleteEmailAccount($email);
 		} catch (Exception $e) {
 			$this->logger->error('Error deleting mail folder for user '. $uid . ' :' . $e->getMessage());
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index 2c6678da..090e7744 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -25,7 +25,7 @@ class CurlService {
 	 * @param array $userOptions
 	 * @return mixed
 	 */
-	public function get($url, $params = array(), $headers = array(), $userOptions = array()) {
+	public function get($url, $params = [], $headers = [], $userOptions = []) {
 		return $this->request('GET', $url, $params, $headers, $userOptions);
 	}
 
@@ -38,7 +38,7 @@ class CurlService {
 	 * @param array $userOptions
 	 * @return mixed
 	 */
-	public function post($url, $params = array(), $headers = array(), $userOptions = array()) {
+	public function post($url, $params = [], $headers = [], $userOptions = []) {
 		return $this->request('POST', $url, $params, $headers, $userOptions);
 	}
 
@@ -88,13 +88,13 @@ class CurlService {
 	 * @return mixed
 	 * @throws Exception
 	 */
-	private function request($method, $url, $params = array(), $headers = array(), $userOptions = array()) {
+	private function request($method, $url, $params = [], $headers = [], $userOptions = []) {
 		$ch = curl_init();
 		$method = strtoupper($method);
-		$options = array(
+		$options = [
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_HTTPHEADER => $headers
-		);
+		];
 		foreach ($userOptions as $key => $value) {
 			$options[$key] = $value;
 		}
diff --git a/lib/Service/HCaptchaService.php b/lib/Service/HCaptchaService.php
new file mode 100644
index 00000000..53757a50
--- /dev/null
+++ b/lib/Service/HCaptchaService.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace OCA\EcloudAccounts\Service;
+
+use OCA\EcloudAccounts\AppInfo\Application;
+use OCP\IConfig;
+use OCP\ISession;
+
+class HCaptchaService {
+	private ISession $session;
+	private IConfig $config;
+	private CurlService $curl;
+
+	private const VERIFY_URL = 'https://hcaptcha.com/siteverify';
+
+	public function __construct(ISession $session, IConfig $config, CurlService $curlService) {
+		$this->session = $session;
+		$this->config = $config;
+		$this->curl = $curlService;
+	}
+
+	public function verify(string $token) : bool {
+		$secret = $this->config->getSystemValue(Application::APP_ID . '.hcaptcha_secret');
+		$data = [
+			'response' => $token,
+			'secret' => $secret
+		];
+
+		$data = http_build_query($data);
+		$response = $this->curl->post(self::VERIFY_URL, $data);
+		$response = json_decode($response, true);
+		
+		return $response['success'];
+	}
+}
diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index fea70cb8..7cca2d81 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -311,9 +311,9 @@ class UserService {
 		
 		$endpoint = $commonApiVersion . '/aliases/hide-my-email/';
 		$url = $commonServicesURL . $endpoint . $resultmail;
-		$data = array(
+		$data = [
 			"domain" => $aliasDomain
-		);
+		];
 		$headers = [
 			"Authorization: Bearer $token"
 		];
@@ -348,10 +348,10 @@ class UserService {
 		$endpoint = $commonApiVersion . '/aliases/';
 		$url = $commonServicesURL . $endpoint . $userEmail;
 
-		$data = array(
+		$data = [
 			"alias" => $username,
 			"domain" => $domain
-		);
+		];
 		$headers = [
 			"Authorization: Bearer $token"
 		];
diff --git a/package-lock.json b/package-lock.json
index 6a1bd3d6..fbfa795e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
 			"name": "ecloud-accounts",
 			"version": "3.1.0",
 			"dependencies": {
+				"@hcaptcha/vue-hcaptcha": "^1.3.0",
 				"@nextcloud/axios": "^2.1.0",
 				"@nextcloud/dialogs": "^3.2.0",
 				"@nextcloud/initial-state": "^2.0.0",
@@ -1786,6 +1787,14 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@hcaptcha/vue-hcaptcha": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz",
+			"integrity": "sha512-aUSWyhRucgFeBOBUC3nWBZuE0TkeoSH5QIVFwiTLnNsYpIaxD1tKBbI5Tdoy0TdpkuXKsB4KqyElbvoMZ9reGw==",
+			"peerDependencies": {
+				"vue": "^2.0.0"
+			}
+		},
 		"node_modules/@humanwhocodes/config-array": {
 			"version": "0.10.4",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
@@ -13001,6 +13010,12 @@
 				}
 			}
 		},
+		"@hcaptcha/vue-hcaptcha": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz",
+			"integrity": "sha512-aUSWyhRucgFeBOBUC3nWBZuE0TkeoSH5QIVFwiTLnNsYpIaxD1tKBbI5Tdoy0TdpkuXKsB4KqyElbvoMZ9reGw==",
+			"requires": {}
+		},
 		"@humanwhocodes/config-array": {
 			"version": "0.10.4",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
diff --git a/package.json b/package.json
index 30435c15..7d599379 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ecloud-accounts",
-	"version": "3.1.0",
+	"version": "6.1.1",
 	"description": "App for ecloud account management.",
 	"repository": {
 		"type": "git",
@@ -18,6 +18,7 @@
 		"stylelint:fix": "stylelint {src,css}/**/{*.scss,*.css} --fix --allow-empty-input"
 	},
 	"dependencies": {
+		"@hcaptcha/vue-hcaptcha": "^1.3.0",
 		"@nextcloud/axios": "^2.1.0",
 		"@nextcloud/dialogs": "^3.2.0",
 		"@nextcloud/initial-state": "^2.0.0",
diff --git a/src/Signup.vue b/src/Signup.vue
index 82e3158c..ccdd0b53 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -3,9 +3,13 @@
 		<section id="main" class="register-page">
 			<div id="registration">
 				<RegistrationForm v-if="showRegistrationForm" v-model="formData" @form-submitted="submitRegistrationForm" />
-				<CaptchaForm v-if="showCaptchaForm"
+				<CaptchaForm v-if="showCaptchaForm && captchaProvider === 'image'"
 					v-model="formData"
 					@form-submitted="submitCaptchaForm" />
+				<HCaptchaForm v-if="showCaptchaForm && captchaProvider === 'hcaptcha'"
+					v-model="formData"
+					:language="language"
+					@form-submitted="submitCaptchaForm" />
 				<RecoveryEmailForm v-if="showRecoveryEmailForm" v-model="formData" @form-submitted="submitRecoveryEmailForm" />
 				<SuccessSection v-if="showSuccessSection" v-model="formData" />
 			</div>
@@ -16,8 +20,10 @@
 <script>
 import Axios from '@nextcloud/axios'
 import { showSuccess, showError } from '@nextcloud/dialogs'
+import { loadState } from '@nextcloud/initial-state'
 import { generateUrl } from '@nextcloud/router'
 import RegistrationForm from './signup/RegistrationForm.vue'
+import HCaptchaForm from './signup/HCaptchaForm.vue'
 import CaptchaForm from './signup/CaptchaForm.vue'
 import RecoveryEmailForm from './signup/RecoveryEmailForm.vue'
 import SuccessSection from './signup/SuccessSection.vue'
@@ -31,6 +37,7 @@ export default {
 		CaptchaForm,
 		RecoveryEmailForm,
 		SuccessSection,
+		HCaptchaForm,
 	},
 	data() {
 		return {
@@ -46,11 +53,13 @@ export default {
 				newsletterProduct: false,
 				selectedLanguage: 'en',
 			},
+			captchaProvider: loadState(APPLICATION_NAME, 'captchaProvider'),
 			appName: APPLICATION_NAME,
 			showRegistrationForm: true,
 			showCaptchaForm: false,
 			showRecoveryEmailForm: false,
 			showSuccessSection: false,
+			language: loadState(APPLICATION_NAME, 'lang'),
 		}
 	},
 	mounted() {
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index 5085b8d8..a919ba32 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -88,7 +88,7 @@ export default {
 				const urlParams = new URLSearchParams(window.location.search)
 				const bypassToken = urlParams.get('bypassToken')
 				const data = {
-					captchaInput: this.formData.captchaInput,
+					userToken: this.formData.captchaInput,
 					bypassToken: bypassToken || null,
 				}
 				const url = generateUrl(`/apps/${this.appName}/accounts/verify_captcha`)
diff --git a/src/signup/HCaptchaForm.vue b/src/signup/HCaptchaForm.vue
new file mode 100644
index 00000000..ac8c21d2
--- /dev/null
+++ b/src/signup/HCaptchaForm.vue
@@ -0,0 +1,74 @@
+<template>
+	<div id="hcaptchaForm">
+		<div class="display-flex">
+			<h1 id="registerHeading" class="has-text-centered subtitle is-3">
+				{{ t(appName,'Captcha Verification') }}
+			</h1>
+		</div>
+		<VueHcaptcha :sitekey="siteKey" :language="language" @verify="onVerify" />
+	</div>
+</template>
+
+<script>
+import { loadState } from '@nextcloud/initial-state'
+import Axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+import VueHcaptcha from '@hcaptcha/vue-hcaptcha'
+
+const APPLICATION_NAME = 'ecloud-accounts'
+
+export default {
+	components: {
+		VueHcaptcha,
+	},
+	props: {
+		language: String,
+	},
+	data() {
+		return {
+			appName: APPLICATION_NAME,
+			siteKey: loadState(APPLICATION_NAME, 'hCaptchaSiteKey'),
+		}
+	},
+	methods: {
+		async onVerify(token, ekey) {
+			const url = generateUrl(`/apps/${APPLICATION_NAME}/accounts/verify_captcha`)
+			await Axios.post(url, { userToken: token })
+			const isFormValid = true
+
+			this.$emit('form-submitted', { isFormValid })
+		},
+	},
+}
+</script>
+
+<style scoped>
+#hcaptchaForm {
+	max-width: 500px;
+	margin: 0 auto;
+	padding: 0 10px;
+}
+.display-flex {
+	display: flex;
+	justify-content: space-between;
+}
+
+@media screen and (max-width: 768px) {
+	#registerHeading {
+		font-size: 1.5em;
+	}
+}
+
+#registerHeading {
+	margin-bottom: 10%;
+	font-size: 24px;
+	text-align: left !important;
+	font-weight: 500;
+}
+@media screen and (max-width: 500px) {
+	#registerHeading {
+		font-size: 18px;
+	}
+}
+
+</style>
-- 
GitLab


From 3792ea1d1afb3a2318821cb25a2294c0ef5c7caa Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Thu, 25 Jul 2024 12:07:56 +0000
Subject: [PATCH 100/185] Add security middleware to block change of user agent
 and IP address

---
 lib/AppInfo/Application.php          |  3 ++
 lib/Controller/AccountController.php |  2 +-
 lib/Exception/SecurityException.php  |  9 ++++
 lib/Middleware/AccountMiddleware.php | 72 ++++++++++++++++++++++++++++
 src/Signup.vue                       |  7 ++-
 5 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 lib/Exception/SecurityException.php
 create mode 100644 lib/Middleware/AccountMiddleware.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b1635540..24c5f795 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -31,6 +31,7 @@ use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
+use OCA\EcloudAccounts\Middleware\AccountMiddleware;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\AppFramework\App;
@@ -56,6 +57,8 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
 		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
+	
+		$context->registerMiddleware(AccountMiddleware::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 95c4bb47..7081ba9a 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -225,7 +225,7 @@ class AccountController extends Controller {
 	 *
 	 * @return string|null If validation fails, a string describing the error; otherwise, null.
 	 */
-	public function validateInput(string $inputName, string $value, ?int $maxLength = null) : ?string {
+	private function validateInput(string $inputName, string $value, ?int $maxLength = null) : ?string {
 		if ($value === '') {
 			return "$inputName is required.";
 		}
diff --git a/lib/Exception/SecurityException.php b/lib/Exception/SecurityException.php
new file mode 100644
index 00000000..56e22b67
--- /dev/null
+++ b/lib/Exception/SecurityException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\EcloudAccounts\Exception;
+
+class SecurityException extends \Exception {
+	public function __construct($message = null, $code = 0) {
+		parent::__construct($message, $code);
+	}
+}
diff --git a/lib/Middleware/AccountMiddleware.php b/lib/Middleware/AccountMiddleware.php
new file mode 100644
index 00000000..4dbf96d4
--- /dev/null
+++ b/lib/Middleware/AccountMiddleware.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace OCA\EcloudAccounts\Middleware;
+
+use OCA\EcloudAccounts\Controller\AccountController;
+use OCA\EcloudAccounts\Exception\SecurityException;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Middleware;
+use OCP\IRequest;
+use OCP\ISession;
+
+class AccountMiddleware extends Middleware {
+	private IRequest $request;
+	private ISession $session;
+
+	private const SESSION_METHODS = ['create', 'checkUsernameAvailable', 'captcha', 'verifyCaptcha'];
+	private const SESSION_USER_AGENT = 'USER_AGENT';
+	private const SESSION_IP_ADDRESS = 'IP_ADDRESS';
+	private const HEADER_USER_AGENT = 'USER_AGENT';
+
+	public function __construct(IRequest $request, ISession $session) {
+		$this->request = $request;
+		$this->session = $session;
+	}
+	
+
+	public function beforeController($controller, $methodName) {
+		if (!$controller instanceof AccountController) {
+			return;
+		}
+		
+		// Add the required params to session for index
+		if ($methodName === 'index') {
+			$ipAddr = $this->request->getRemoteAddress();
+			$userAgent = $this->request->getHeader(self::HEADER_USER_AGENT);
+			$this->session->set(self::SESSION_IP_ADDRESS, $ipAddr);
+			$this->session->set(self::SESSION_USER_AGENT, $userAgent);
+			return;
+		}
+
+		if (!in_array($methodName, self::SESSION_METHODS)) {
+			return;
+		}
+
+		$ipAddr = $this->request->getRemoteAddress();
+		$userAgent = $this->request->getHeader(self::HEADER_USER_AGENT);
+		if (!$this->isValidSessionParam(self::SESSION_IP_ADDRESS, $ipAddr)
+		|| !$this->isValidSessionParam(self::SESSION_USER_AGENT, $userAgent)) {
+			throw new SecurityException;
+		}
+	}
+
+	public function afterException($controller, $methodName, \Exception $exception) {
+		if (!$controller instanceof AccountController || !$exception instanceof SecurityException) {
+			throw $exception;
+		}
+		
+		$response = new DataResponse();
+		$response->setStatus(401);
+		return $response;
+	}
+
+	private function isValidSessionParam(string $sessionParam, string $value) : bool {
+		if (!$this->session->exists($sessionParam)) {
+			return false;
+		}
+		if ($this->session->get($sessionParam) !== $value) {
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/Signup.vue b/src/Signup.vue
index ccdd0b53..0bc40095 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -110,8 +110,13 @@ export default {
 				this.showRecoveryEmailForm = false
 				this.showSuccessSection = true
 			} catch (error) {
+				const genericErrorMessage = 'An error occurred while creating your account!'
 				// Handle network errors and unexpected response structures here
-				const errorMessage = error.response ? t(this.appName, error.response.data.message) : t(this.appName, error.message)
+				let errorMessage = error.response ? t(this.appName, error.response.data.message) : t(this.appName, error.message)
+				if (errorMessage === '') {
+					// Fallback to generic error message
+					errorMessage = t(this.appName, genericErrorMessage)
+				}
 				this.showMessage(errorMessage, 'error')
 			}
 		},
-- 
GitLab


From 2c734216a4c85c365dbe9a5fddfed053df231407 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 26 Jul 2024 17:52:35 +0530
Subject: [PATCH 101/185] 7.0.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5d1b766c..292a0fa0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>6.1.2</version>
+    <version>7.0.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 2f9a4194268ced86555771058128ffed497e70ff Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 30 Jul 2024 12:41:27 +0530
Subject: [PATCH 102/185] Increase sleep timeout to 5 seconds

---
 appinfo/info.xml                     | 2 +-
 lib/Controller/AccountController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 292a0fa0..c4b6a53d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>7.0.0</version>
+    <version>7.0.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 7081ba9a..b6aab241 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -174,7 +174,7 @@ class AccountController extends Controller {
 			$mainDomain = $this->userService->getMainDomain();
 			$userEmail = $username.'@'.$mainDomain;
 			$this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password, $language);
-			sleep(2);
+			sleep(5);
 
 			$this->userService->setAccountDataLocally($username, $userEmail);
 			$this->userService->createHMEAlias($username, $userEmail);
-- 
GitLab


From 1d99d4e5251c8d98049b8cc5bcf4b376dfdb70d9 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Thu, 1 Aug 2024 10:19:32 +0000
Subject: [PATCH 103/185] Disable buttons during API call to avoid interaction

---
 src/Signup.vue                   |  8 +++++++-
 src/signup/RecoveryEmailForm.vue |  3 +++
 src/signup/RegistrationForm.vue  | 13 +++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/Signup.vue b/src/Signup.vue
index 0bc40095..a14320ae 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -10,7 +10,10 @@
 					v-model="formData"
 					:language="language"
 					@form-submitted="submitCaptchaForm" />
-				<RecoveryEmailForm v-if="showRecoveryEmailForm" v-model="formData" @form-submitted="submitRecoveryEmailForm" />
+				<RecoveryEmailForm v-if="showRecoveryEmailForm"
+					v-model="formData"
+					:processing-creation="processingCreation"
+					@form-submitted="submitRecoveryEmailForm" />
 				<SuccessSection v-if="showSuccessSection" v-model="formData" />
 			</div>
 		</section>
@@ -60,6 +63,7 @@ export default {
 			showRecoveryEmailForm: false,
 			showSuccessSection: false,
 			language: loadState(APPLICATION_NAME, 'lang'),
+			processingCreation: false,
 		}
 	},
 	mounted() {
@@ -102,6 +106,7 @@ export default {
 		async submitForm(data) {
 			try {
 				const url = generateUrl(`/apps/${this.appName}/accounts/create`)
+				this.processingCreation = true
 				await Axios.post(url, data)
 
 				// If the execution reaches here, the response status is in the 2xx range
@@ -110,6 +115,7 @@ export default {
 				this.showRecoveryEmailForm = false
 				this.showSuccessSection = true
 			} catch (error) {
+				this.processingCreation = false
 				const genericErrorMessage = 'An error occurred while creating your account!'
 				// Handle network errors and unexpected response structures here
 				let errorMessage = error.response ? t(this.appName, error.response.data.message) : t(this.appName, error.message)
diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue
index 00bc89e9..84fde0bd 100644
--- a/src/signup/RecoveryEmailForm.vue
+++ b/src/signup/RecoveryEmailForm.vue
@@ -35,12 +35,14 @@
 			<button :wide="true"
 				class="btn-primary w-50 mx-10"
 				type="primary"
+				:disabled="processingCreation"
 				@click.prevent="submitRecoveryEmailForm(true)">
 				{{ t(appName,'Set My Recovery Email Now') }}
 			</button>
 			<button :wide="true"
 				class="btn-default w-50 mx-10"
 				type="primary"
+				:disabled="processingCreation"
 				@click.prevent="submitRecoveryEmailForm(false)">
 				{{ t(appName,'Later') }}
 			</button>
@@ -53,6 +55,7 @@ const APPLICATION_NAME = 'ecloud-accounts'
 export default {
 	props: {
 		value: Object,
+		processingCreation: Boolean,
 	},
 	data() {
 		return {
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index aee692b6..34d85342 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -150,8 +150,14 @@
 			<div id="groups" class="aliases-info">
 				<button :wide="true"
 					class="btn-primary"
-					type="primary">
-					{{ t(appName,'Create My Account') }}
+					type="primary"
+					:disabled="processing">
+					<template v-if="!processing">
+						{{ t(appName,'Create My Account') }}
+					</template>
+					<template v-else>
+						...
+					</template>
 				</button>
 			</div>
 		</form>
@@ -199,6 +205,7 @@ export default {
 				{ message: t(this.appName, 'Incorrect password length: Required length is 8 to 32'), regex: /.{8,32}/ },
 			],
 			isUsernameAvailable: false,
+			processing: false,
 		}
 	},
 	computed: {
@@ -285,6 +292,7 @@ export default {
 			}
 		},
 		async submitRegistrationForm() {
+			this.processing = true
 			this.validateForm(['displayname', 'username', 'password', 'repassword', 'termsandservices'])
 			await this.checkUsername()
 			const isFormValid = Object.values(this.validation).every(value => !value)
@@ -292,6 +300,7 @@ export default {
 			if (isFormValid) {
 				this.$emit('form-submitted', { isFormValid })
 			}
+			this.processing = false
 		},
 		onLanguageChange() {
 			window.location.href = window.location.origin + '/apps/' + APPLICATION_NAME + '/accounts/' + this.formData.selectedLanguage + '/signup'
-- 
GitLab


From 502497f205fbfacd506618fed3fa39b056f76f57 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Fri, 2 Aug 2024 08:16:55 +0000
Subject: [PATCH 104/185] Bump version to 7.0.2

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index c4b6a53d..5e3c1415 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>7.0.1</version>
+    <version>7.0.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From 20f7c57f33ed9ce0427a8f9f71138e0085d1bd5e Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Mon, 12 Aug 2024 15:34:13 +0000
Subject: [PATCH 105/185] Support nc-28

---
 appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5e3c1415..6c90f4c9 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>7.0.2</version>
+    <version>8.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="27" max-version="27"/>
+        <nextcloud min-version="28" max-version="28"/>
     </dependencies>
 	<settings>
 		<personal>OCA\EcloudAccounts\Settings\DeleteShopAccountSetting</personal>
-- 
GitLab


From 7d7a7fc2a8193e669a0a033e18e0c97ba18cfdbc Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Thu, 22 Aug 2024 12:48:36 +0000
Subject: [PATCH 106/185] Update frontend package versions compatible to NC28

---
 package-lock.json                | 22967 +++++++++++------------------
 package.json                     |    14 +-
 src/BecomeBetaUser.vue           |     8 +-
 src/DeleteShopAccountSetting.vue |    26 +-
 src/common.js                    |     2 +-
 5 files changed, 8750 insertions(+), 14267 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fbfa795e..3cd4fc6c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,20 +1,20 @@
 {
 	"name": "ecloud-accounts",
-	"version": "3.1.0",
-	"lockfileVersion": 2,
+	"version": "8.0.0",
+	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ecloud-accounts",
-			"version": "3.1.0",
+			"version": "8.0.0",
 			"dependencies": {
 				"@hcaptcha/vue-hcaptcha": "^1.3.0",
-				"@nextcloud/axios": "^2.1.0",
-				"@nextcloud/dialogs": "^3.2.0",
-				"@nextcloud/initial-state": "^2.0.0",
-				"@nextcloud/l10n": "^1.6.0",
-				"@nextcloud/router": "^2.0.0",
-				"@nextcloud/vue": "^5.4.0",
+				"@nextcloud/axios": "^2.5.0",
+				"@nextcloud/dialogs": "^5.3.6",
+				"@nextcloud/initial-state": "^2.2.0",
+				"@nextcloud/l10n": "^3.1.0",
+				"@nextcloud/router": "^3.0.1",
+				"@nextcloud/vue": "^8.16.0",
 				"vue": "^2.7.0",
 				"vue-password-strength-meter": "^1.7.2"
 			},
@@ -31,139 +31,65 @@
 			}
 		},
 		"node_modules/@ampproject/remapping": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-			"integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.1.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@babel/cli": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.18.10.tgz",
-			"integrity": "sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw==",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.8",
-				"commander": "^4.0.1",
-				"convert-source-map": "^1.1.0",
-				"fs-readdir-recursive": "^1.1.0",
-				"glob": "^7.2.0",
-				"make-dir": "^2.1.0",
-				"slash": "^2.0.0"
-			},
-			"bin": {
-				"babel": "bin/babel.js",
-				"babel-external-helpers": "bin/babel-external-helpers.js"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"optionalDependencies": {
-				"@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3",
-				"chokidar": "^3.4.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/cli/node_modules/commander": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-			"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/@babel/cli/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@babel/cli/node_modules/make-dir": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-			"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-			"dependencies": {
-				"pify": "^4.0.1",
-				"semver": "^5.6.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/@babel/cli/node_modules/semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/@babel/cli/node_modules/slash": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-			"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-			"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+			"integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/highlight": "^7.18.6"
+				"@babel/highlight": "^7.24.7",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/compat-data": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
-			"integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==",
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz",
+			"integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/core": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz",
-			"integrity": "sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.1.0",
-				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.0",
-				"@babel/helper-compilation-targets": "^7.19.1",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helpers": "^7.19.0",
-				"@babel/parser": "^7.19.1",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0",
-				"convert-source-map": "^1.7.0",
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+			"integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.24.7",
+				"@babel/generator": "^7.25.0",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-module-transforms": "^7.25.2",
+				"@babel/helpers": "^7.25.0",
+				"@babel/parser": "^7.25.0",
+				"@babel/template": "^7.25.0",
+				"@babel/traverse": "^7.25.2",
+				"@babel/types": "^7.25.2",
+				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.1",
-				"semver": "^6.3.0"
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -174,102 +100,98 @@
 			}
 		},
 		"node_modules/@babel/eslint-parser": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-			"integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+			"version": "7.25.1",
+			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz",
+			"integrity": "sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
 				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
 			},
 			"peerDependencies": {
-				"@babel/core": ">=7.11.0",
-				"eslint": "^7.5.0 || ^8.0.0"
+				"@babel/core": "^7.11.0",
+				"eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
 			}
 		},
 		"node_modules/@babel/generator": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
-			"integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+			"integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.19.0",
-				"@jridgewell/gen-mapping": "^0.3.2",
+				"@babel/types": "^7.25.0",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
 				"jsesc": "^2.5.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-			"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
 		"node_modules/@babel/helper-annotate-as-pure": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-			"integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+			"integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.18.6"
+				"@babel/types": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-			"integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+			"integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-explode-assignable-expression": "^7.18.6",
-				"@babel/types": "^7.18.9"
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
-			"integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+			"integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/compat-data": "^7.19.1",
-				"@babel/helper-validator-option": "^7.18.6",
-				"browserslist": "^4.21.3",
-				"semver": "^6.3.0"
+				"@babel/compat-data": "^7.25.2",
+				"@babel/helper-validator-option": "^7.24.8",
+				"browserslist": "^4.23.1",
+				"lru-cache": "^5.1.1",
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
 			}
 		},
 		"node_modules/@babel/helper-create-class-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz",
+			"integrity": "sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.9",
-				"@babel/helper-split-export-declaration": "^7.18.6"
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-member-expression-to-functions": "^7.24.8",
+				"@babel/helper-optimise-call-expression": "^7.24.7",
+				"@babel/helper-replace-supers": "^7.25.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/traverse": "^7.25.0",
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -279,12 +201,15 @@
 			}
 		},
 		"node_modules/@babel/helper-create-regexp-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz",
+			"integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"regexpu-core": "^5.1.0"
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"regexpu-core": "^5.3.1",
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -294,131 +219,102 @@
 			}
 		},
 		"node_modules/@babel/helper-define-polyfill-provider": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-			"integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+			"integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.17.7",
-				"@babel/helper-plugin-utils": "^7.16.7",
+				"@babel/helper-compilation-targets": "^7.22.6",
+				"@babel/helper-plugin-utils": "^7.22.5",
 				"debug": "^4.1.1",
 				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2",
-				"semver": "^6.1.2"
+				"resolve": "^1.14.2"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.4.0-0"
-			}
-		},
-		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-			"integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-explode-assignable-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-			"integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-			"dependencies": {
-				"@babel/types": "^7.18.6"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-			"integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-			"dependencies": {
-				"@babel/template": "^7.18.10",
-				"@babel/types": "^7.19.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-			"integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-			"dependencies": {
-				"@babel/types": "^7.18.6"
-			},
-			"engines": {
-				"node": ">=6.9.0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/@babel/helper-member-expression-to-functions": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-			"integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
+			"integrity": "sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.18.9"
+				"@babel/traverse": "^7.24.8",
+				"@babel/types": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-imports": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-			"integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+			"integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.18.6"
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-			"integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+			"integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-simple-access": "^7.24.7",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"@babel/traverse": "^7.25.2"
 			},
 			"engines": {
 				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
 		"node_modules/@babel/helper-optimise-call-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-			"integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+			"integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.18.6"
+				"@babel/types": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-			"integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+			"integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-remap-async-to-generator": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-			"integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz",
+			"integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-wrap-function": "^7.18.9",
-				"@babel/types": "^7.18.9"
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-wrap-function": "^7.25.0",
+				"@babel/traverse": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -428,121 +324,129 @@
 			}
 		},
 		"node_modules/@babel/helper-replace-supers": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-			"integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz",
+			"integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0"
+				"@babel/helper-member-expression-to-functions": "^7.24.8",
+				"@babel/helper-optimise-call-expression": "^7.24.7",
+				"@babel/traverse": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
 		"node_modules/@babel/helper-simple-access": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-			"integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+			"integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.18.6"
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-			"integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
-			"dependencies": {
-				"@babel/types": "^7.18.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-			"integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+			"integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/types": "^7.18.6"
+				"@babel/traverse": "^7.24.7",
+				"@babel/types": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
-			"integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+			"integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+			"integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-option": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-			"integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+			"integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-wrap-function": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-			"integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz",
+			"integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/template": "^7.25.0",
+				"@babel/traverse": "^7.25.0",
+				"@babel/types": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helpers": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-			"integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz",
+			"integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/template": "^7.25.0",
+				"@babel/types": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/highlight": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-			"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+			"integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"chalk": "^2.4.2",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
-			"integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==",
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz",
+			"integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
+			"dependencies": {
+				"@babel/types": "^7.25.2"
+			},
 			"bin": {
 				"parser": "bin/babel-parser.js"
 			},
@@ -550,12 +454,15 @@
 				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-			"integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+		"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz",
+			"integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -564,78 +471,79 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+		"node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
+			"integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-				"@babel/plugin-proposal-optional-chaining": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.13.0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-			"integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
+		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
+			"integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-remap-async-to-generator": "^7.18.9",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-class-properties": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-			"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+			"integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/plugin-transform-optional-chaining": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.13.0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-class-static-block": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-			"integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz",
+			"integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5"
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.12.0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-dynamic-import": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-			"integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
-			},
+		"node_modules/@babel/plugin-proposal-private-property-in-object": {
+			"version": "7.21.0-placeholder-for-preset-env.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+			"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=6.9.0"
 			},
@@ -643,43 +551,40 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-export-namespace-from": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-			"integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-			},
-			"engines": {
-				"node": ">=6.9.0"
+				"@babel/helper-plugin-utils": "^7.8.0"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-json-strings": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-			"integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-json-strings": "^7.8.3"
-			},
-			"engines": {
-				"node": ">=6.9.0"
+				"@babel/helper-plugin-utils": "^7.12.13"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-			"integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+		"node_modules/@babel/plugin-syntax-class-static-block": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+				"@babel/helper-plugin-utils": "^7.14.5"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -688,46 +593,40 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-			"integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+		"node_modules/@babel/plugin-syntax-dynamic-import": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-			},
-			"engines": {
-				"node": ">=6.9.0"
+				"@babel/helper-plugin-utils": "^7.8.0"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-numeric-separator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-			"integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+		"node_modules/@babel/plugin-syntax-export-namespace-from": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
-			},
-			"engines": {
-				"node": ">=6.9.0"
+				"@babel/helper-plugin-utils": "^7.8.3"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
-			"integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
+		"node_modules/@babel/plugin-syntax-import-assertions": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
+			"integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/compat-data": "^7.18.8",
-				"@babel/helper-compilation-targets": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.18.8"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -736,112 +635,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-optional-catch-binding": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-			"integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-proposal-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-proposal-private-methods": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-			"integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-proposal-private-property-in-object": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-			"integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
-			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-proposal-unicode-property-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-			"integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			},
-			"engines": {
-				"node": ">=4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+		"node_modules/@babel/plugin-syntax-import-attributes": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+			"integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -850,37 +651,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-syntax-dynamic-import": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-export-namespace-from": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.3"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-assertions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
-			"integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			},
-			"engines": {
-				"node": ">=6.9.0"
+				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
@@ -890,6 +668,8 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
 			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -901,6 +681,8 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
 			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -912,6 +694,8 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
 			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -923,6 +707,8 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
 			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -934,6 +720,8 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
 			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -945,6 +733,8 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
 			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -956,6 +746,8 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
 			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -967,6 +759,8 @@
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
 			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			},
@@ -981,6 +775,8 @@
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
 			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			},
@@ -991,26 +787,31 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-syntax-typescript": {
+		"node_modules/@babel/plugin-syntax-unicode-sets-regex": {
 			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
-			"integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+			"integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.0.0"
 			}
 		},
 		"node_modules/@babel/plugin-transform-arrow-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-			"integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+			"integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1019,14 +820,17 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-async-to-generator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-			"integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+		"node_modules/@babel/plugin-transform-async-generator-functions": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
+			"integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-remap-async-to-generator": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-remap-async-to-generator": "^7.25.0",
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/traverse": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1035,12 +839,16 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-			"integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+		"node_modules/@babel/plugin-transform-async-to-generator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+			"integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-module-imports": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-remap-async-to-generator": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1049,12 +857,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-block-scoping": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz",
-			"integrity": "sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==",
+		"node_modules/@babel/plugin-transform-block-scoped-functions": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+			"integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1063,20 +873,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-classes": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-			"integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
-			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-compilation-targets": "^7.19.0",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-replace-supers": "^7.18.9",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"globals": "^11.1.0"
+		"node_modules/@babel/plugin-transform-block-scoping": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz",
+			"integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1085,12 +889,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-computed-properties": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-			"integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+		"node_modules/@babel/plugin-transform-class-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
+			"integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1099,27 +906,37 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-destructuring": {
-			"version": "7.18.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
-			"integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
+		"node_modules/@babel/plugin-transform-class-static-block": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
+			"integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.12.0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-dotall-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-			"integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+		"node_modules/@babel/plugin-transform-classes": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz",
+			"integrity": "sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-compilation-targets": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-replace-supers": "^7.25.0",
+				"@babel/traverse": "^7.25.0",
+				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1128,12 +945,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-duplicate-keys": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-			"integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+		"node_modules/@babel/plugin-transform-computed-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+			"integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/template": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1142,13 +962,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-			"integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+		"node_modules/@babel/plugin-transform-destructuring": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz",
+			"integrity": "sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1157,12 +978,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-for-of": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-			"integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+		"node_modules/@babel/plugin-transform-dotall-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+			"integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1171,14 +995,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-function-name": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-			"integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+		"node_modules/@babel/plugin-transform-duplicate-keys": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+			"integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.18.9",
-				"@babel/helper-function-name": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1187,26 +1011,32 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-literals": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-			"integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+		"node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
+			"integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.0",
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-member-expression-literals": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-			"integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+		"node_modules/@babel/plugin-transform-dynamic-import": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
+			"integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1215,14 +1045,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-modules-amd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
-			"integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
+		"node_modules/@babel/plugin-transform-exponentiation-operator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+			"integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1231,15 +1062,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-modules-commonjs": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
-			"integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
+		"node_modules/@babel/plugin-transform-export-namespace-from": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
+			"integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1248,16 +1079,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-modules-systemjs": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
-			"integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
+		"node_modules/@babel/plugin-transform-for-of": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+			"integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1266,13 +1096,16 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-modules-umd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-			"integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+		"node_modules/@babel/plugin-transform-function-name": {
+			"version": "7.25.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz",
+			"integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-compilation-targets": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/traverse": "^7.25.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1281,27 +1114,31 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-			"integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+		"node_modules/@babel/plugin-transform-json-strings": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
+			"integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-json-strings": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-new-target": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-			"integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+		"node_modules/@babel/plugin-transform-literals": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz",
+			"integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1310,13 +1147,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-object-super": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-			"integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+		"node_modules/@babel/plugin-transform-logical-assignment-operators": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
+			"integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1325,12 +1164,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-parameters": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-			"integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+		"node_modules/@babel/plugin-transform-member-expression-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+			"integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1339,12 +1180,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-property-literals": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-			"integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+		"node_modules/@babel/plugin-transform-modules-amd": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+			"integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1353,13 +1197,16 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-regenerator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-			"integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+		"node_modules/@babel/plugin-transform-modules-commonjs": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz",
+			"integrity": "sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"regenerator-transform": "^0.15.0"
+				"@babel/helper-module-transforms": "^7.24.8",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-simple-access": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1368,12 +1215,17 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-reserved-words": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-			"integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+		"node_modules/@babel/plugin-transform-modules-systemjs": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
+			"integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-module-transforms": "^7.25.0",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"@babel/traverse": "^7.25.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1382,12 +1234,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-shorthand-properties": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-			"integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+		"node_modules/@babel/plugin-transform-modules-umd": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+			"integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-module-transforms": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1396,27 +1251,31 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-spread": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-			"integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+			"integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-sticky-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-			"integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+		"node_modules/@babel/plugin-transform-new-target": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+			"integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1425,12 +1284,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-template-literals": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-			"integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+		"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
+			"integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1439,12 +1301,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-typeof-symbol": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-			"integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+		"node_modules/@babel/plugin-transform-numeric-separator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
+			"integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1453,14 +1318,17 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-typescript": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz",
-			"integrity": "sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==",
+		"node_modules/@babel/plugin-transform-object-rest-spread": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
+			"integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/plugin-syntax-typescript": "^7.18.6"
+				"@babel/helper-compilation-targets": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-transform-parameters": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1469,12 +1337,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-unicode-escapes": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-			"integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+		"node_modules/@babel/plugin-transform-object-super": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+			"integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-replace-supers": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1483,13 +1354,15 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-unicode-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-			"integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+		"node_modules/@babel/plugin-transform-optional-catch-binding": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
+			"integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1498,103 +1371,16 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/polyfill": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
-			"integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
-			"deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.",
+		"node_modules/@babel/plugin-transform-optional-chaining": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz",
+			"integrity": "sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"core-js": "^2.6.5",
-				"regenerator-runtime": "^0.13.4"
-			}
-		},
-		"node_modules/@babel/polyfill/node_modules/core-js": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-			"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-			"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-			"hasInstallScript": true
-		},
-		"node_modules/@babel/preset-env": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
-			"integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
-			"dependencies": {
-				"@babel/compat-data": "^7.19.1",
-				"@babel/helper-compilation-targets": "^7.19.1",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-validator-option": "^7.18.6",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-				"@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-				"@babel/plugin-proposal-class-properties": "^7.18.6",
-				"@babel/plugin-proposal-class-static-block": "^7.18.6",
-				"@babel/plugin-proposal-dynamic-import": "^7.18.6",
-				"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-				"@babel/plugin-proposal-json-strings": "^7.18.6",
-				"@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-				"@babel/plugin-proposal-numeric-separator": "^7.18.6",
-				"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
-				"@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-				"@babel/plugin-proposal-optional-chaining": "^7.18.9",
-				"@babel/plugin-proposal-private-methods": "^7.18.6",
-				"@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.18.6",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5",
-				"@babel/plugin-transform-arrow-functions": "^7.18.6",
-				"@babel/plugin-transform-async-to-generator": "^7.18.6",
-				"@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-				"@babel/plugin-transform-block-scoping": "^7.18.9",
-				"@babel/plugin-transform-classes": "^7.19.0",
-				"@babel/plugin-transform-computed-properties": "^7.18.9",
-				"@babel/plugin-transform-destructuring": "^7.18.13",
-				"@babel/plugin-transform-dotall-regex": "^7.18.6",
-				"@babel/plugin-transform-duplicate-keys": "^7.18.9",
-				"@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-				"@babel/plugin-transform-for-of": "^7.18.8",
-				"@babel/plugin-transform-function-name": "^7.18.9",
-				"@babel/plugin-transform-literals": "^7.18.9",
-				"@babel/plugin-transform-member-expression-literals": "^7.18.6",
-				"@babel/plugin-transform-modules-amd": "^7.18.6",
-				"@babel/plugin-transform-modules-commonjs": "^7.18.6",
-				"@babel/plugin-transform-modules-systemjs": "^7.19.0",
-				"@babel/plugin-transform-modules-umd": "^7.18.6",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-				"@babel/plugin-transform-new-target": "^7.18.6",
-				"@babel/plugin-transform-object-super": "^7.18.6",
-				"@babel/plugin-transform-parameters": "^7.18.8",
-				"@babel/plugin-transform-property-literals": "^7.18.6",
-				"@babel/plugin-transform-regenerator": "^7.18.6",
-				"@babel/plugin-transform-reserved-words": "^7.18.6",
-				"@babel/plugin-transform-shorthand-properties": "^7.18.6",
-				"@babel/plugin-transform-spread": "^7.19.0",
-				"@babel/plugin-transform-sticky-regex": "^7.18.6",
-				"@babel/plugin-transform-template-literals": "^7.18.9",
-				"@babel/plugin-transform-typeof-symbol": "^7.18.9",
-				"@babel/plugin-transform-unicode-escapes": "^7.18.10",
-				"@babel/plugin-transform-unicode-regex": "^7.18.6",
-				"@babel/preset-modules": "^0.1.5",
-				"@babel/types": "^7.19.0",
-				"babel-plugin-polyfill-corejs2": "^0.3.3",
-				"babel-plugin-polyfill-corejs3": "^0.6.0",
-				"babel-plugin-polyfill-regenerator": "^0.4.1",
-				"core-js-compat": "^3.25.1",
-				"semver": "^6.3.0"
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1603,29 +1389,31 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/preset-modules": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-			"integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+		"node_modules/@babel/plugin-transform-parameters": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+			"integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-				"@babel/plugin-transform-dotall-regex": "^7.4.4",
-				"@babel/types": "^7.4.4",
-				"esutils": "^2.0.2"
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/preset-typescript": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
-			"integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
+		"node_modules/@babel/plugin-transform-private-methods": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
+			"integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-validator-option": "^7.18.6",
-				"@babel/plugin-transform-typescript": "^7.18.6"
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1634,863 +1422,1482 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/runtime": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
-			"integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
+		"node_modules/@babel/plugin-transform-private-property-in-object": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
+			"integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"regenerator-runtime": "^0.13.4"
+				"@babel/helper-annotate-as-pure": "^7.24.7",
+				"@babel/helper-create-class-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
 			},
 			"engines": {
 				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/template": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-			"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+		"node_modules/@babel/plugin-transform-property-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+			"integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/code-frame": "^7.18.6",
-				"@babel/parser": "^7.18.10",
-				"@babel/types": "^7.18.10"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/traverse": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
-			"integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
-			"dependencies": {
-				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.0",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/parser": "^7.19.1",
-				"@babel/types": "^7.19.0",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
+		"node_modules/@babel/plugin-transform-regenerator": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+			"integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"regenerator-transform": "^0.15.2"
 			},
 			"engines": {
 				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/types": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
-			"integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+		"node_modules/@babel/plugin-transform-reserved-words": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+			"integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.18.10",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"to-fast-properties": "^2.0.0"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@csstools/selector-specificity": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-			"integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
+		"node_modules/@babel/plugin-transform-shorthand-properties": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+			"integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
 			"dev": true,
 			"peer": true,
-			"engines": {
-				"node": "^12 || ^14 || >=16"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/csstools"
+			"engines": {
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.2",
-				"postcss-selector-parser": "^6.0.10"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@discoveryjs/json-ext": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+		"node_modules/@babel/plugin-transform-spread": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+			"integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
 			"dev": true,
 			"peer": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+			},
 			"engines": {
-				"node": ">=10.0.0"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@es-joy/jsdoccomment": {
-			"version": "0.31.0",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz",
-			"integrity": "sha512-tc1/iuQcnaiSIUVad72PBierDFpsxdUHtEF/OrfqvM1CBAsIoMP51j52jTMb3dXriwhieTo289InzZj72jL3EQ==",
+		"node_modules/@babel/plugin-transform-sticky-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+			"integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"comment-parser": "1.3.1",
-				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~3.1.0"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
-				"node": "^14 || ^16 || ^17 || ^18"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@eslint/eslintrc": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-			"integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+		"node_modules/@babel/plugin-transform-template-literals": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+			"integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.4.0",
-				"globals": "^13.15.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.1.2",
-				"strip-json-comments": "^3.1.1"
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+				"node": ">=6.9.0"
 			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@eslint/eslintrc/node_modules/globals": {
-			"version": "13.17.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-			"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+		"node_modules/@babel/plugin-transform-typeof-symbol": {
+			"version": "7.24.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
+			"integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"type-fest": "^0.20.2"
+				"@babel/helper-plugin-utils": "^7.24.8"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=6.9.0"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@eslint/eslintrc/node_modules/type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+		"node_modules/@babel/plugin-transform-unicode-escapes": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+			"integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
 			"dev": true,
 			"peer": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=6.9.0"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/@hcaptcha/vue-hcaptcha": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz",
-			"integrity": "sha512-aUSWyhRucgFeBOBUC3nWBZuE0TkeoSH5QIVFwiTLnNsYpIaxD1tKBbI5Tdoy0TdpkuXKsB4KqyElbvoMZ9reGw==",
 			"peerDependencies": {
-				"vue": "^2.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.10.4",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
-			"integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+		"node_modules/@babel/plugin-transform-unicode-property-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
+			"integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
 			},
 			"engines": {
-				"node": ">=10.10.0"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@humanwhocodes/gitignore-to-minimatch": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-			"integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+		"node_modules/@babel/plugin-transform-unicode-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+			"integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
 			"dev": true,
 			"peer": true,
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@humanwhocodes/module-importer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+		"node_modules/@babel/plugin-transform-unicode-sets-regex": {
+			"version": "7.24.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
+			"integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
 			"dev": true,
 			"peer": true,
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.24.7",
+				"@babel/helper-plugin-utils": "^7.24.7"
+			},
 			"engines": {
-				"node": ">=12.22"
+				"node": ">=6.9.0"
 			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-			"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-			"dependencies": {
-				"@jridgewell/set-array": "^1.0.0",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
+		"node_modules/@babel/preset-env": {
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
+			"integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@babel/compat-data": "^7.25.2",
+				"@babel/helper-compilation-targets": "^7.25.2",
+				"@babel/helper-plugin-utils": "^7.24.8",
+				"@babel/helper-validator-option": "^7.24.8",
+				"@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
+				"@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+				"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
+				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-class-properties": "^7.12.13",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
+				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+				"@babel/plugin-syntax-import-assertions": "^7.24.7",
+				"@babel/plugin-syntax-import-attributes": "^7.24.7",
+				"@babel/plugin-syntax-import-meta": "^7.10.4",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+				"@babel/plugin-syntax-top-level-await": "^7.14.5",
+				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+				"@babel/plugin-transform-arrow-functions": "^7.24.7",
+				"@babel/plugin-transform-async-generator-functions": "^7.25.0",
+				"@babel/plugin-transform-async-to-generator": "^7.24.7",
+				"@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+				"@babel/plugin-transform-block-scoping": "^7.25.0",
+				"@babel/plugin-transform-class-properties": "^7.24.7",
+				"@babel/plugin-transform-class-static-block": "^7.24.7",
+				"@babel/plugin-transform-classes": "^7.25.0",
+				"@babel/plugin-transform-computed-properties": "^7.24.7",
+				"@babel/plugin-transform-destructuring": "^7.24.8",
+				"@babel/plugin-transform-dotall-regex": "^7.24.7",
+				"@babel/plugin-transform-duplicate-keys": "^7.24.7",
+				"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
+				"@babel/plugin-transform-dynamic-import": "^7.24.7",
+				"@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+				"@babel/plugin-transform-export-namespace-from": "^7.24.7",
+				"@babel/plugin-transform-for-of": "^7.24.7",
+				"@babel/plugin-transform-function-name": "^7.25.1",
+				"@babel/plugin-transform-json-strings": "^7.24.7",
+				"@babel/plugin-transform-literals": "^7.25.2",
+				"@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+				"@babel/plugin-transform-member-expression-literals": "^7.24.7",
+				"@babel/plugin-transform-modules-amd": "^7.24.7",
+				"@babel/plugin-transform-modules-commonjs": "^7.24.8",
+				"@babel/plugin-transform-modules-systemjs": "^7.25.0",
+				"@babel/plugin-transform-modules-umd": "^7.24.7",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+				"@babel/plugin-transform-new-target": "^7.24.7",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+				"@babel/plugin-transform-numeric-separator": "^7.24.7",
+				"@babel/plugin-transform-object-rest-spread": "^7.24.7",
+				"@babel/plugin-transform-object-super": "^7.24.7",
+				"@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+				"@babel/plugin-transform-optional-chaining": "^7.24.8",
+				"@babel/plugin-transform-parameters": "^7.24.7",
+				"@babel/plugin-transform-private-methods": "^7.24.7",
+				"@babel/plugin-transform-private-property-in-object": "^7.24.7",
+				"@babel/plugin-transform-property-literals": "^7.24.7",
+				"@babel/plugin-transform-regenerator": "^7.24.7",
+				"@babel/plugin-transform-reserved-words": "^7.24.7",
+				"@babel/plugin-transform-shorthand-properties": "^7.24.7",
+				"@babel/plugin-transform-spread": "^7.24.7",
+				"@babel/plugin-transform-sticky-regex": "^7.24.7",
+				"@babel/plugin-transform-template-literals": "^7.24.7",
+				"@babel/plugin-transform-typeof-symbol": "^7.24.8",
+				"@babel/plugin-transform-unicode-escapes": "^7.24.7",
+				"@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+				"@babel/plugin-transform-unicode-regex": "^7.24.7",
+				"@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+				"@babel/preset-modules": "0.1.6-no-external-plugins",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.4",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"core-js-compat": "^3.37.1",
+				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=6.0.0"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-			"integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+		"node_modules/@babel/preset-modules": {
+			"version": "0.1.6-no-external-plugins",
+			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+			"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@babel/types": "^7.4.4",
+				"esutils": "^2.0.2"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-			"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-			"peer": true,
+		"node_modules/@babel/regjsgen": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@babel/runtime": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
+			"integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
 			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"regenerator-runtime": "^0.14.0"
 			},
 			"engines": {
-				"node": ">=6.0.0"
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+		"node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
 		},
-		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
-			"integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+		"node_modules/@babel/template": {
+			"version": "7.25.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+			"integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
+				"@babel/code-frame": "^7.24.7",
+				"@babel/parser": "^7.25.0",
+				"@babel/types": "^7.25.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@leichtgewicht/ip-codec": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+		"node_modules/@babel/traverse": {
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz",
+			"integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==",
 			"dev": true,
-			"peer": true
-		},
-		"node_modules/@nextcloud/auth": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
-			"integrity": "sha512-v8K8tvjkOsGt1+gKydVeMiEwWLXlfPWSptXnMqP21Xd6pFAQxNuNNCY679XKU4MNaKzpZqLstCCxv/KrjeQv8A==",
+			"peer": true,
 			"dependencies": {
-				"@nextcloud/event-bus": "^3.0.0"
+				"@babel/code-frame": "^7.24.7",
+				"@babel/generator": "^7.25.0",
+				"@babel/parser": "^7.25.3",
+				"@babel/template": "^7.25.0",
+				"@babel/types": "^7.25.2",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@nextcloud/axios": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.1.0.tgz",
-			"integrity": "sha512-fUwRQeYfdX0sP+DJnQiqlJfB7ngNHWu6Gbi0nYapkB7IFiLECeL2SWzDOFj+M04j4ApsblEMBqGOJ38WEgdeyA==",
+		"node_modules/@babel/types": {
+			"version": "7.25.2",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
+			"integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
 			"dependencies": {
-				"@nextcloud/auth": "^2.0.0",
-				"@nextcloud/router": "^2.0.0",
-				"axios": "^0.27.2",
-				"tslib": "^2.4.0"
+				"@babel/helper-string-parser": "^7.24.8",
+				"@babel/helper-validator-identifier": "^7.24.7",
+				"to-fast-properties": "^2.0.0"
 			},
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@nextcloud/babel-config": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/babel-config/-/babel-config-1.0.0.tgz",
-			"integrity": "sha512-olz7sqPD7xMDP2KcYwODtitH37faR/C5jKX1oxXzdDf+s1FRy6OQTC5ZqZR2LHZA6jTUvmwM/xWBPoEB/HPFRw==",
-			"dev": true,
-			"peerDependencies": {
-				"@babel/core": "^7.13.10",
-				"@babel/plugin-proposal-class-properties": "^7.13.0",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-transform-modules-commonjs": "^7.13.8",
-				"@babel/plugin-transform-shorthand-properties": "^7.12.13",
-				"@babel/preset-env": "^7.13.12"
+		"node_modules/@buttercup/fetch": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz",
+			"integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
+			"optionalDependencies": {
+				"node-fetch": "^3.3.0"
 			}
 		},
-		"node_modules/@nextcloud/browser-storage": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.1.1.tgz",
-			"integrity": "sha512-bWzs/A44rEK8b3CMOFw0ZhsenagrWdsB902LOEwmlMCcFysiFgWiOPbF4/0/ODlOYjvPrO02wf6RigWtb8P+gA==",
-			"dependencies": {
-				"core-js": "3.6.1"
+		"node_modules/@csstools/css-parser-algorithms": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz",
+			"integrity": "sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"peer": true,
+			"engines": {
+				"node": "^14 || ^16 || >=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-tokenizer": "^2.4.1"
 			}
 		},
-		"node_modules/@nextcloud/browser-storage/node_modules/core-js": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz",
-			"integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==",
-			"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-			"hasInstallScript": true,
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/core-js"
+		"node_modules/@csstools/css-tokenizer": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz",
+			"integrity": "sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"peer": true,
+			"engines": {
+				"node": "^14 || ^16 || >=18"
 			}
 		},
-		"node_modules/@nextcloud/browserslist-config": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.3.0.tgz",
-			"integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg==",
+		"node_modules/@csstools/media-query-list-parser": {
+			"version": "2.1.13",
+			"resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz",
+			"integrity": "sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"peer": true,
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": "^14 || ^16 || >=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-parser-algorithms": "^2.7.1",
+				"@csstools/css-tokenizer": "^2.4.1"
 			}
 		},
-		"node_modules/@nextcloud/calendar-js": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-3.1.0.tgz",
-			"integrity": "sha512-tGjKfUKigyTFg3AUhW57MCMwP26rWv2EwU8QUYCJntHs8a1qzltgSJ5t3+zMsp2oDct3tHz04Q6vPR+O4T1n+Q==",
+		"node_modules/@csstools/selector-specificity": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
+			"integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"peer": true,
 			"engines": {
-				"node": ">=14.0.0",
-				"npm": ">=7.0.0"
+				"node": "^14 || ^16 || >=18"
 			},
 			"peerDependencies": {
-				"ical.js": "^1.5.0",
-				"uuid": "^8.3.2"
+				"postcss-selector-parser": "^6.0.13"
 			}
 		},
-		"node_modules/@nextcloud/capabilities": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz",
-			"integrity": "sha512-xsmwPPUJ8NN7YfLcq0gpDTibeb9lMBvY/bffMFnHcZi8hMGOouPiEY+CWAgJ5I9W6I2vNeacHUuTanEN5Ncb2A==",
-			"dependencies": {
-				"@nextcloud/initial-state": "^1.1.2",
-				"core-js": "^3.6.4"
+		"node_modules/@discoveryjs/json-ext": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=10.0.0"
 			}
 		},
-		"node_modules/@nextcloud/capabilities/node_modules/@nextcloud/initial-state": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.2.1.tgz",
-			"integrity": "sha512-2TH2DzJBolYHWfbSovTWkByAIg0gdsyuVfZpf5APnJu/9PixXKbnrVFnaEdxjeP262Gok7ARMFFQeSiuzKRQeQ==",
+		"node_modules/@es-joy/jsdoccomment": {
+			"version": "0.41.0",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.41.0.tgz",
+			"integrity": "sha512-aKUhyn1QI5Ksbqcr3fFJj16p99QdjUxXAEuFst1Z47DRyoiMwivIH9MV/ARcJOCXVjPfjITciej8ZD2O/6qUmw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"core-js": "^3.6.4"
+				"comment-parser": "1.4.1",
+				"esquery": "^1.5.0",
+				"jsdoc-type-pratt-parser": "~4.0.0"
+			},
+			"engines": {
+				"node": ">=16"
 			}
 		},
-		"node_modules/@nextcloud/dialogs": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.2.0.tgz",
-			"integrity": "sha512-notaHF8LXPJINBbILCbRe+dgXnJPe7NQTIrN1vwfaGUSG9GUfEf+v367yyg2brCgV6ulE/HmNhYjTQwW5AqSJA==",
+		"node_modules/@eslint-community/eslint-utils": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@nextcloud/l10n": "^1.3.0",
-				"@nextcloud/typings": "^1.0.0",
-				"core-js": "^3.6.4",
-				"toastify-js": "^1.12.0"
+				"eslint-visitor-keys": "^3.3.0"
 			},
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
 			}
 		},
-		"node_modules/@nextcloud/eslint-config": {
-			"version": "8.1.2",
-			"resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.1.2.tgz",
-			"integrity": "sha512-uyYBSGQrbq7VZaqv0A4RBH5c80go07Xaebc00RxPhpG7IHkry92gTYlY8YarnlEFWaeAnXGPh3OhfXGDC40EyQ==",
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
+			"peer": true,
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
-			"peerDependencies": {
-				"@babel/core": "^7.13.10",
-				"@babel/eslint-parser": "^7.16.5",
-				"@nextcloud/eslint-plugin": "^2.0.0",
-				"eslint": "^8.6.0",
-				"eslint-config-standard": "^17.0.0-0",
-				"eslint-plugin-import": "^2.25.4",
-				"eslint-plugin-jsdoc": "^39.2.1",
-				"eslint-plugin-n": "^15.2.3",
-				"eslint-plugin-promise": "^6.0.0",
-				"eslint-plugin-vue": "^9.1.1",
-				"webpack": "^5.4.0"
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@nextcloud/eslint-plugin": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/eslint-plugin/-/eslint-plugin-2.0.0.tgz",
-			"integrity": "sha512-j5WXTDTprr/cDilVJtC1mnrpkvD6jlEMShs72V5plllatHjO7kpZHzUfCX3dSvGwYc2ACa0XH+FbkPoZQ3+eWQ==",
+		"node_modules/@eslint-community/regexpp": {
+			"version": "4.11.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+			"integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+			"integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"requireindex": "^1.2.0"
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.6.0",
+				"globals": "^13.19.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.1.2",
+				"strip-json-comments": "^3.1.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
-			"peerDependencies": {
-				"eslint": ">=6.0.0"
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@nextcloud/event-bus": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.0.2.tgz",
-			"integrity": "sha512-svXCZa4UkoZKsBiGzTi0cVcbPFUOhCm7pMKjGumRwBvHywX+8by478IQ8Grw75PFHxajMJZ0KrOTTM8WnzzEAw==",
+		"node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"semver": "^7.3.7"
-			},
-			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
-		"node_modules/@nextcloud/event-bus/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/@eslint/eslintrc/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"type-fest": "^0.20.2"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@nextcloud/event-bus/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+		"node_modules/@eslint/eslintrc/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
+				"brace-expansion": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "*"
 			}
 		},
-		"node_modules/@nextcloud/event-bus/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
-		"node_modules/@nextcloud/initial-state": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.0.0.tgz",
-			"integrity": "sha512-xmNP30v/RnkJ2z1HcuEo7YfcLJJa+FdWTwgNldXHOlMeMbl/ESpsGkWL2sULrhYurz64L0JpfwEdi/cHcmyuZQ=="
-		},
-		"node_modules/@nextcloud/l10n": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz",
-			"integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==",
-			"dependencies": {
-				"core-js": "^3.6.4",
-				"node-gettext": "^3.0.0"
+		"node_modules/@eslint/eslintrc/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@nextcloud/logger": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.3.0.tgz",
-			"integrity": "sha512-Oa8DLJLuLY+MdpCc/xK+bbGsyiIX+ExmNnP2wsahOebVUuM7fSRA1oSLEsSBWT2IQIvjLvCo/xMw3q4vmTeVFQ==",
-			"dependencies": {
-				"@nextcloud/auth": "^1.2.2",
-				"core-js": "^3.6.4"
-			},
+		"node_modules/@eslint/js": {
+			"version": "8.57.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+			"integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+			"dev": true,
+			"peer": true,
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/@nextcloud/logger/node_modules/@nextcloud/auth": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
-			"integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
+		"node_modules/@floating-ui/core": {
+			"version": "1.6.7",
+			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz",
+			"integrity": "sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g==",
 			"dependencies": {
-				"@nextcloud/event-bus": "^1.1.3",
-				"@nextcloud/typings": "^0.2.2",
-				"core-js": "^3.6.4"
+				"@floating-ui/utils": "^0.2.7"
 			}
 		},
-		"node_modules/@nextcloud/logger/node_modules/@nextcloud/event-bus": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
-			"integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
+		"node_modules/@floating-ui/dom": {
+			"version": "1.6.10",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.10.tgz",
+			"integrity": "sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A==",
 			"dependencies": {
-				"@types/semver": "^7.3.5",
-				"core-js": "^3.11.2",
-				"semver": "^7.3.5"
+				"@floating-ui/core": "^1.6.0",
+				"@floating-ui/utils": "^0.2.7"
 			}
 		},
-		"node_modules/@nextcloud/logger/node_modules/@nextcloud/typings": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.4.tgz",
-			"integrity": "sha512-49M8XUDQH27VIQE+13KrqSOYcyOsDUk6Yfw17jbBVtXFoDJ3YBSYYq8YaKeAM3Lz2JVbEpqQW9suAT+EyYSb6g==",
-			"dependencies": {
-				"@types/jquery": "2.0.54"
-			}
+		"node_modules/@floating-ui/utils": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz",
+			"integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA=="
 		},
-		"node_modules/@nextcloud/logger/node_modules/@types/jquery": {
-			"version": "2.0.54",
-			"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.54.tgz",
-			"integrity": "sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg=="
+		"node_modules/@hcaptcha/vue-hcaptcha": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz",
+			"integrity": "sha512-aUSWyhRucgFeBOBUC3nWBZuE0TkeoSH5QIVFwiTLnNsYpIaxD1tKBbI5Tdoy0TdpkuXKsB4KqyElbvoMZ9reGw==",
+			"peerDependencies": {
+				"vue": "^2.0.0"
+			}
 		},
-		"node_modules/@nextcloud/logger/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.11.14",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+			"integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+			"deprecated": "Use @eslint/config-array instead",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"@humanwhocodes/object-schema": "^2.0.2",
+				"debug": "^4.3.1",
+				"minimatch": "^3.0.5"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=10.10.0"
 			}
 		},
-		"node_modules/@nextcloud/logger/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+		"node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
-		"node_modules/@nextcloud/logger/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
-		"node_modules/@nextcloud/router": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
-			"integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
+		"node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"core-js": "^3.6.4"
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"node_modules/@nextcloud/stylelint-config": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.2.0.tgz",
-			"integrity": "sha512-kH3pGAofdnDZJCTyYr2hc9Y63KVVrJ3845j3DOKJNW4uUVybiRZkMccwuJvT1mJ8Gn7lgETh4vceDXuwnJlJ3Q==",
+		"node_modules/@humanwhocodes/module-importer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
 			"dev": true,
+			"peer": true,
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": ">=12.22"
 			},
-			"peerDependencies": {
-				"stylelint": "^14.2.0",
-				"stylelint-config-recommended-scss": "^7.0.0",
-				"stylelint-config-recommended-vue": "^1.1.0"
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
-		"node_modules/@nextcloud/typings": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.4.3.tgz",
-			"integrity": "sha512-9Yc40alExKpHwNKdpZzULwb+Fz5HgEFKZvywXYK5QbR96Z7V5iI3Greu8MhmZErfUJ6zES7PHpz3S3jM1kdnUw==",
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+			"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+			"deprecated": "Use @eslint/object-schema instead",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@types/jquery": "2.0.60"
+				"@jridgewell/set-array": "^1.2.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@nextcloud/vue": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.4.0.tgz",
-			"integrity": "sha512-YybOMuStBKtCwbssxMNEd0A8k/Qr5+zm9vnSOaLaMxeB8iaUU+PgBNiYGo8O24UJjSS6FqFwg02V4XzI1Sd6Lw==",
-			"dependencies": {
-				"@nextcloud/auth": "^1.2.3",
-				"@nextcloud/axios": "^1.3.2",
-				"@nextcloud/browser-storage": "^0.1.1",
-				"@nextcloud/calendar-js": "^3.0.0",
-				"@nextcloud/capabilities": "^1.0.2",
-				"@nextcloud/dialogs": "^3.0.0",
-				"@nextcloud/event-bus": "^2.0.0",
-				"@nextcloud/l10n": "^1.2.3",
-				"@nextcloud/logger": "^2.0.0",
-				"@nextcloud/router": "^2.0.0",
-				"debounce": "1.2.1",
-				"emoji-mart-vue-fast": "^10.2.1",
-				"escape-html": "^1.0.3",
-				"focus-trap": "^6.8.1",
-				"hammerjs": "^2.0.8",
-				"linkify-string": "^3.0.2",
-				"md5": "^2.2.1",
-				"splitpanes": "^2.3.6",
-				"string-length": "^5.0.0",
-				"striptags": "^3.1.1",
-				"style-loader": "^3.3.1",
-				"tributejs": "^5.1.3",
-				"v-click-outside": "^3.0.1",
-				"v-tooltip": "^2.0.3",
-				"vue": "^2.6.14",
-				"vue-color": "^2.7.1",
-				"vue-material-design-icons": "^5.0.0",
-				"vue-multiselect": "^2.1.6",
-				"vue2-datepicker": "^3.6.3"
-			},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"dev": true,
+			"peer": true,
 			"engines": {
-				"node": "^14.0.0",
-				"npm": "^7.0.0"
+				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@nextcloud/auth": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
-			"integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/source-map": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@nextcloud/event-bus": "^1.1.3",
-				"@nextcloud/typings": "^0.2.2",
-				"core-js": "^3.6.4"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@nextcloud/auth/node_modules/@nextcloud/event-bus": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
-			"integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@types/semver": "^7.3.5",
-				"core-js": "^3.11.2",
-				"semver": "^7.3.5"
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@nextcloud/axios": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-1.8.0.tgz",
-			"integrity": "sha512-ni29rhouV6aWIeVG5aSv89fS5UIBN3ZADhFsbFKLO+xKuukDQlIwlWWViS3ZuPW6TR5FlK2dF84xnYnfKnHa5w==",
+		"node_modules/@leichtgewicht/ip-codec": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+			"integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@linusborg/vue-simple-portal": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@linusborg/vue-simple-portal/-/vue-simple-portal-0.1.5.tgz",
+			"integrity": "sha512-dq+oubEVW4UabBoQxmH97GiDa+F6sTomw4KcXFHnXEpw69rdkXFCxo1WzwuvWjoLiUVYJTyN1dtlUvTa50VcXg==",
 			"dependencies": {
-				"@babel/cli": "^7.8.4",
-				"@babel/core": "^7.9.0",
-				"@babel/preset-env": "^7.9.0",
-				"@babel/preset-typescript": "^7.9.0",
-				"@nextcloud/auth": "^1.2.2",
-				"axios": "^0.24.0",
-				"core-js": "^3.6.4"
+				"nanoid": "^3.1.20"
 			},
-			"engines": {
-				"node": ">=14.0.0",
-				"npm": ">=7.0.0"
+			"peerDependencies": {
+				"vue": "^2.6.6"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@nextcloud/event-bus": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-2.1.1.tgz",
-			"integrity": "sha512-YEui6N+23uyjBSIUZhf8rEjG9vol7UGgxcgxMddEbO0HS7M/sh1cocRqtn+ZVi/yPybeToGmt68SDPCgwHQHKw==",
+		"node_modules/@mapbox/hast-util-table-cell-style": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.2.1.tgz",
+			"integrity": "sha512-LyQz4XJIdCdY/+temIhD/Ed0x/p4GAOUycpFSEK2Ads1CPKZy6b7V/2ROEtQiLLQ8soIs0xe/QAoR6kwpyW/yw==",
 			"dependencies": {
-				"@types/semver": "^7.1.0",
-				"core-js": "^3.6.2",
-				"semver": "^7.3.2"
+				"unist-util-visit": "^1.4.1"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@nextcloud/typings": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.4.tgz",
-			"integrity": "sha512-49M8XUDQH27VIQE+13KrqSOYcyOsDUk6Yfw17jbBVtXFoDJ3YBSYYq8YaKeAM3Lz2JVbEpqQW9suAT+EyYSb6g==",
+		"node_modules/@mapbox/hast-util-table-cell-style/node_modules/unist-util-is": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
+			"integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
+		},
+		"node_modules/@mapbox/hast-util-table-cell-style/node_modules/unist-util-visit": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
+			"integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
 			"dependencies": {
-				"@types/jquery": "2.0.54"
+				"unist-util-visit-parents": "^2.0.0"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@types/jquery": {
-			"version": "2.0.54",
-			"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.54.tgz",
-			"integrity": "sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg=="
-		},
-		"node_modules/@nextcloud/vue/node_modules/axios": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-			"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+		"node_modules/@mapbox/hast-util-table-cell-style/node_modules/unist-util-visit-parents": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
+			"integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
 			"dependencies": {
-				"follow-redirects": "^1.14.4"
+				"unist-util-is": "^3.0.0"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/@mdi/js": {
+			"version": "7.4.47",
+			"resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.4.47.tgz",
+			"integrity": "sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ=="
+		},
+		"node_modules/@nextcloud/auth": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.4.0.tgz",
+			"integrity": "sha512-T5OFltKd0O9Hfj47VrzE7TVjCwqOMHH9JLyjjLUR3pu2MaTY9WL6AjL79sHbFTXUaIkftZgJKu12lHYmqXnL2Q==",
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"@nextcloud/browser-storage": "^0.4.0",
+				"@nextcloud/event-bus": "^3.3.1"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+		"node_modules/@nextcloud/axios": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.5.0.tgz",
+			"integrity": "sha512-82LQ5PZA0ZVUnS8QiGoAGOR5kE7EKD84qEEgeZJ+Y7p5iljwi3AT6niQuP7YuHjt3MKM+6jQiyghZk5SquiszQ==",
 			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
+				"@nextcloud/auth": "^2.3.0",
+				"@nextcloud/router": "^3.0.1",
+				"axios": "^1.6.8"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
-		"node_modules/@nextcloud/webpack-vue-config": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.3.0.tgz",
-			"integrity": "sha512-qkrFUakFS6vGQlM1oXHh2+JQhmACZtSt7bt5W3iwpCirrVarBdyxG0ZRw1PK4jOVTdAEju0fYlIoieo7X+GLIg==",
+		"node_modules/@nextcloud/babel-config": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/babel-config/-/babel-config-1.2.0.tgz",
+			"integrity": "sha512-QOESlmX99UOfXdPANpoeFtfoRWWfKhBm1wXgF2lLnwpOBq4ZzdtqI+wphhWA/lkdfw/sftZzd1UJF/gcPDpiAw==",
 			"dev": true,
 			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.16.7",
-				"babel-loader": "^8.2.3",
-				"css-loader": "^6.5.1",
-				"node-polyfill-webpack-plugin": "2.0.1",
-				"sass": "^1.47.0",
-				"sass-loader": "^13.0.1",
-				"style-loader": "^3.3.1",
-				"vue-loader": "^15.9.8",
-				"vue-template-compiler": "^2.7.0",
-				"webpack": "^5.66.0",
-				"webpack-cli": "^4.9.1",
-				"webpack-dev-server": "^4.7.2"
+				"@babel/core": "^7.24.5",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
+				"@babel/preset-env": "^7.24.5"
 			}
 		},
-		"node_modules/@nicolo-ribaudo/chokidar-2": {
-			"version": "2.1.8-no-fsevents.3",
-			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
-			"integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
-			"optional": true
-		},
-		"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-			"version": "5.1.1-v1",
-			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-			"integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-			"dev": true,
-			"peer": true,
+		"node_modules/@nextcloud/browser-storage": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.4.0.tgz",
+			"integrity": "sha512-D6XxznxCYmJ3oBCC3p0JB6GZJ2RZ9dgbB1UqtTePXrIvHUMBAeF/YkiGKYxLAVZCZb+NSNZXgAYHm/3LnIUbDg==",
 			"dependencies": {
-				"eslint-scope": "5.1.1"
+				"core-js": "3.37.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
 			}
 		},
-		"node_modules/@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"dev": true,
-			"peer": true,
+		"node_modules/@nextcloud/browserslist-config": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.2.0.tgz",
+			"integrity": "sha512-kC42RQW5rZjZZsRaEjVlIQpp6aW/yxm+zZdETnrRQnUzcPwBgF4wO4makfGT63Ckd+LkgUW+geesPiPRqxFVew==",
+			"dev": true
+		},
+		"node_modules/@nextcloud/capabilities": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.2.0.tgz",
+			"integrity": "sha512-L1NQtOfHWzkfj0Ple1MEJt6HmOHWAi3y4qs+OnwSWexqJT0DtXTVPyRxi7ADyITwRxS5H9R/HMl6USAj4Nr1nQ==",
 			"dependencies": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
+				"@nextcloud/initial-state": "^2.1.0"
 			},
 			"engines": {
-				"node": ">= 8"
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
 			}
 		},
-		"node_modules/@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true,
-			"peer": true,
+		"node_modules/@nextcloud/dialogs": {
+			"version": "5.3.7",
+			"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-5.3.7.tgz",
+			"integrity": "sha512-//pRF2GJNhW3VbVzSoE97J+DR9nZ/+IkzOzgKKDdMr65JYYMAdOs9Iew4nMf+OruDgZanGyXrfubSMVNI+1svQ==",
+			"dependencies": {
+				"@mdi/js": "^7.4.47",
+				"@nextcloud/auth": "^2.3.0",
+				"@nextcloud/axios": "^2.5.0",
+				"@nextcloud/event-bus": "^3.3.1",
+				"@nextcloud/files": "^3.8.0",
+				"@nextcloud/initial-state": "^2.2.0",
+				"@nextcloud/l10n": "^3.1.0",
+				"@nextcloud/router": "^3.0.1",
+				"@nextcloud/sharing": "^0.2.3",
+				"@nextcloud/typings": "^1.9.1",
+				"@types/toastify-js": "^1.12.3",
+				"@vueuse/core": "^10.11.1",
+				"cancelable-promise": "^4.3.1",
+				"toastify-js": "^1.12.0",
+				"vue-frag": "^1.4.3",
+				"webdav": "^5.7.1"
+			},
 			"engines": {
-				"node": ">= 8"
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			},
+			"peerDependencies": {
+				"@nextcloud/vue": "^8.9.1",
+				"vue": "^2.7.16"
 			}
 		},
-		"node_modules/@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"dev": true,
-			"peer": true,
+		"node_modules/@nextcloud/dialogs/node_modules/@vueuse/core": {
+			"version": "10.11.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
+			"integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
 			"dependencies": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
+				"@types/web-bluetooth": "^0.0.20",
+				"@vueuse/metadata": "10.11.1",
+				"@vueuse/shared": "10.11.1",
+				"vue-demi": ">=0.14.8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/@nextcloud/dialogs/node_modules/@vueuse/core/node_modules/vue-demi": {
+			"version": "0.14.10",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+			"integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+			"hasInstallScript": true,
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
 			},
 			"engines": {
-				"node": ">= 8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@types/body-parser": {
-			"version": "1.19.2",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/connect": "*",
-				"@types/node": "*"
+		"node_modules/@nextcloud/dialogs/node_modules/@vueuse/metadata": {
+			"version": "10.11.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
+			"integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==",
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
 			}
 		},
-		"node_modules/@types/bonjour": {
-			"version": "3.5.10",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-			"integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-			"dev": true,
-			"peer": true,
+		"node_modules/@nextcloud/dialogs/node_modules/@vueuse/shared": {
+			"version": "10.11.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz",
+			"integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==",
 			"dependencies": {
-				"@types/node": "*"
+				"vue-demi": ">=0.14.8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
 			}
 		},
-		"node_modules/@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+		"node_modules/@nextcloud/dialogs/node_modules/@vueuse/shared/node_modules/vue-demi": {
+			"version": "0.14.10",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+			"integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+			"hasInstallScript": true,
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@nextcloud/eslint-config": {
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.4.1.tgz",
+			"integrity": "sha512-ilrPxOnfVkB4dAddtkhbJmbYK9FwEVZ5oIJ2ipiE97rQz82TUZxmfEHE1tr87FbIvz0drIcREgGil3zuNWHjrg==",
 			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/node": "*"
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.24.5",
+				"@babel/eslint-parser": "^7.16.5",
+				"@nextcloud/eslint-plugin": "^2.2.1",
+				"@vue/eslint-config-typescript": "^13.0.0",
+				"eslint": "^8.27.0",
+				"eslint-config-standard": "^17.1.0",
+				"eslint-import-resolver-exports": "^1.0.0-beta.5",
+				"eslint-import-resolver-typescript": "^3.6.1",
+				"eslint-plugin-import": "^2.26.0",
+				"eslint-plugin-jsdoc": "^46.2.6",
+				"eslint-plugin-n": "^16.0.0",
+				"eslint-plugin-promise": "^6.1.1",
+				"eslint-plugin-vue": "^9.7.0",
+				"typescript": "^5.0.2"
 			}
 		},
-		"node_modules/@types/connect-history-api-fallback": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-			"integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+		"node_modules/@nextcloud/eslint-plugin": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/eslint-plugin/-/eslint-plugin-2.2.1.tgz",
+			"integrity": "sha512-RX+0FxpL1h2EzjNLeW0VSGTkbyWIq7WgV7QAjtyUmDbSGwf1ds9Zy5OcRkgXRHRIu/W0gB0DhS2iz9qXHphCzA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@types/express-serve-static-core": "*",
-				"@types/node": "*"
+				"fast-xml-parser": "^4.2.5",
+				"requireindex": "^1.2.0",
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			},
+			"peerDependencies": {
+				"eslint": ">=7.0.0"
+			}
+		},
+		"node_modules/@nextcloud/eslint-plugin/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@nextcloud/event-bus": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.3.1.tgz",
+			"integrity": "sha512-VBYJspOVk5aZopgZwCUoMKFqcTLCNel2TLvtu0HMPV2gR5ZLPiPAKbkyKkYTh+Sd5QB1gR6l3STTv1gyal0soQ==",
+			"dependencies": {
+				"@types/node": "^20.12.12",
+				"semver": "^7.6.2"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/event-bus/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@nextcloud/files": {
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.8.0.tgz",
+			"integrity": "sha512-5oi61suf2nDcXPTA4BSxl7EomJBCWrmc6ZGaokaj+jREOsSVlS+nR3ID/6eMqZSsqODpAARK56djyUPmiHOLWQ==",
+			"dependencies": {
+				"@nextcloud/auth": "^2.3.0",
+				"@nextcloud/capabilities": "^1.2.0",
+				"@nextcloud/l10n": "^3.1.0",
+				"@nextcloud/logger": "^3.0.2",
+				"@nextcloud/paths": "^2.2.1",
+				"@nextcloud/router": "^3.0.1",
+				"@nextcloud/sharing": "^0.2.3",
+				"cancelable-promise": "^4.3.1",
+				"is-svg": "^5.0.1",
+				"typedoc-plugin-missing-exports": "^3.0.0",
+				"typescript-event-target": "^1.1.1",
+				"webdav": "^5.7.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/initial-state": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.2.0.tgz",
+			"integrity": "sha512-cDW98L5KGGgpS8pzd+05304/p80cyu8U2xSDQGa+kGPTpUFmCbv2qnO5WrwwGTauyjYijCal2bmw82VddSH+Pg==",
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/l10n": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-3.1.0.tgz",
+			"integrity": "sha512-unciqr8QSJ29vFBw9S1bquyoj1PTWHszNL8tcUNuxUAYpq0hX+8o7rpB5gimELA4sj4m9+VCJwgLtBZd1Yj0lg==",
+			"dependencies": {
+				"@nextcloud/router": "^3.0.1",
+				"@nextcloud/typings": "^1.8.0",
+				"@types/dompurify": "^3.0.5",
+				"@types/escape-html": "^1.0.4",
+				"dompurify": "^3.1.2",
+				"escape-html": "^1.0.3",
+				"node-gettext": "^3.0.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/logger": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-3.0.2.tgz",
+			"integrity": "sha512-wByt0R0/6QC44RBpaJr1MWghjjOxk/pRbACHo/ZWWKht1qYbJRHB4GtEi+35KEIHY07ZpqxiDk6dIRuN7sXYWQ==",
+			"dependencies": {
+				"@nextcloud/auth": "^2.3.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/paths": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/paths/-/paths-2.2.1.tgz",
+			"integrity": "sha512-M3ShLjrxR7B48eKThLMoqbxTqTKyQXcwf9TgeXQGbCIhiHoXU6as5j8l5qNv/uZlANokVdowpuWHBi3b2+YNNA==",
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/router": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-3.0.1.tgz",
+			"integrity": "sha512-Ci/uD3x8OKHdxSqXL6gRJ+mGJOEXjeiHjj7hqsZqVTsT7kOrCjDf0/J8z5RyLlokKZ0IpSe+hGxgi3YB7Gpw3Q==",
+			"dependencies": {
+				"@nextcloud/typings": "^1.7.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/sharing": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.2.3.tgz",
+			"integrity": "sha512-hxQFOBBahbJkcmAGZFVS3943pQGSafNF6LMHmgcj0JPqExu1DWKuZvsCXZnGkaRJVcewHnZFcLAhpOf+VfcZmA==",
+			"dependencies": {
+				"@nextcloud/initial-state": "^2.2.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/stylelint-config": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.4.0.tgz",
+			"integrity": "sha512-S/q/offcs9pwnkjSrnfvsONryCOe6e1lfK2sszN6ZtkYyXvaqi8EbQuuhaGlxCstn9oXwbXfAI6O3Y8lGrjdFg==",
+			"dev": true,
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			},
+			"peerDependencies": {
+				"stylelint": "^15.6.0",
+				"stylelint-config-recommended-scss": "^13.1.0",
+				"stylelint-config-recommended-vue": "^1.1.0"
+			}
+		},
+		"node_modules/@nextcloud/timezones": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/timezones/-/timezones-0.1.1.tgz",
+			"integrity": "sha512-ldLuLyz605sszetnp6jy6mtlThu4ICKsZThxHIZwn6t4QzjQH3xr+k8mRU7GIvKq9egUFDqBp4gBjxm3/ROZig==",
+			"dependencies": {
+				"ical.js": "^2.0.1"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/typings": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.9.1.tgz",
+			"integrity": "sha512-i0l/L5gKW8EACbXHVxXM6wn3sUhY2qmnL2OijppzU4dENC7/hqySMQDer7/+cJbNSNG7uHF/Z+9JmHtDfRfuGg==",
+			"dependencies": {
+				"@types/jquery": "3.5.16"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/vue": {
+			"version": "8.17.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.17.0.tgz",
+			"integrity": "sha512-BylZZlJcGiEfBO9k/TE8iuKEzzSfmxek1fFwU2fpo0xUDxH9qQurMdTli3ix/kgXaBJgwBD8H8hjzYirpAYbXg==",
+			"dependencies": {
+				"@floating-ui/dom": "^1.1.0",
+				"@linusborg/vue-simple-portal": "^0.1.5",
+				"@nextcloud/auth": "^2.2.1",
+				"@nextcloud/axios": "^2.4.0",
+				"@nextcloud/browser-storage": "^0.4.0",
+				"@nextcloud/capabilities": "^1.1.0",
+				"@nextcloud/event-bus": "^3.1.0",
+				"@nextcloud/initial-state": "^2.1.0",
+				"@nextcloud/l10n": "^3.0.1",
+				"@nextcloud/logger": "^3.0.1",
+				"@nextcloud/router": "^3.0.0",
+				"@nextcloud/sharing": "^0.2.2",
+				"@nextcloud/timezones": "^0.1.1",
+				"@nextcloud/vue-select": "^3.25.0",
+				"@vueuse/components": "^11.0.0",
+				"@vueuse/core": "^11.0.0",
+				"clone": "^2.1.2",
+				"debounce": "2.1.0",
+				"dompurify": "^3.0.5",
+				"emoji-mart-vue-fast": "^15.0.1",
+				"escape-html": "^1.0.3",
+				"floating-vue": "^1.0.0-beta.19",
+				"focus-trap": "^7.4.3",
+				"linkify-string": "^4.0.0",
+				"md5": "^2.3.0",
+				"rehype-external-links": "^3.0.0",
+				"rehype-react": "^7.1.2",
+				"remark-breaks": "^4.0.0",
+				"remark-gfm": "^4.0.0",
+				"remark-parse": "^11.0.0",
+				"remark-rehype": "^11.0.0",
+				"splitpanes": "^2.4.1",
+				"string-length": "^5.0.1",
+				"striptags": "^3.2.0",
+				"tributejs": "^5.1.3",
+				"unified": "^11.0.1",
+				"unist-builder": "^4.0.0",
+				"unist-util-visit": "^5.0.0",
+				"vue": "^2.7.16",
+				"vue-color": "^2.8.1",
+				"vue-frag": "^1.4.3",
+				"vue-router": "^3.6.5",
+				"vue2-datepicker": "^3.11.0"
+			},
+			"engines": {
+				"node": "^20.0.0",
+				"npm": "^10.0.0"
+			}
+		},
+		"node_modules/@nextcloud/vue-select": {
+			"version": "3.25.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.25.1.tgz",
+			"integrity": "sha512-jqCi4G+Q0H6+Hm8wSN3vRX2+eXG2jXR2bwBX/sErVEsH5UaxT4Nb7KqgdeIjVfeF7ccIdRqpmIb4Pkf0lao67w==",
+			"engines": {
+				"node": "^20.0.0"
+			},
+			"peerDependencies": {
+				"vue": "2.x"
+			}
+		},
+		"node_modules/@nextcloud/webpack-vue-config": {
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz",
+			"integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==",
+			"dev": true,
+			"engines": {
+				"node": "^16.0.0",
+				"npm": "^7.0.0 || ^8.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.19.6",
+				"babel-loader": "^9.0.0",
+				"css-loader": "^6.7.1",
+				"node-polyfill-webpack-plugin": "2.0.1",
+				"sass": "^1.55.0",
+				"sass-loader": "^13.1.0",
+				"style-loader": "^3.3.1",
+				"vue": "^2.7.13",
+				"vue-loader": "^15.10.0",
+				"vue-template-compiler": "^2.7.13",
+				"webpack": "^5.74.0",
+				"webpack-cli": "^5.0.1",
+				"webpack-dev-server": "^4.11.1"
+			}
+		},
+		"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+			"version": "5.1.1-v1",
+			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+			"integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"eslint-scope": "5.1.1"
+			}
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@shikijs/core": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.14.1.tgz",
+			"integrity": "sha512-KyHIIpKNaT20FtFPFjCQB5WVSTpLR/n+jQXhWHWVUMm9MaOaG9BGOG0MSyt7yA4+Lm+4c9rTc03tt3nYzeYSfw==",
+			"peer": true,
+			"dependencies": {
+				"@types/hast": "^3.0.4"
+			}
+		},
+		"node_modules/@types/body-parser": {
+			"version": "1.19.5",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+			"integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/connect": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/bonjour": {
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+			"integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/connect": {
+			"version": "3.4.38",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+			"integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/connect-history-api-fallback": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+			"integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/express-serve-static-core": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/debug": {
+			"version": "4.1.12",
+			"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+			"integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+			"dependencies": {
+				"@types/ms": "*"
+			}
+		},
+		"node_modules/@types/dompurify": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
+			"integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
+			"dependencies": {
+				"@types/trusted-types": "*"
 			}
 		},
+		"node_modules/@types/escape-html": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@types/escape-html/-/escape-html-1.0.4.tgz",
+			"integrity": "sha512-qZ72SFTgUAZ5a7Tj6kf2SHLetiH5S6f8G5frB2SPQ3EyF02kxdyBFf4Tz4banE3xCgGnKgWLt//a6VuYHKYJTg=="
+		},
 		"node_modules/@types/eslint": {
-			"version": "8.4.6",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
-			"integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
+			"version": "9.6.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz",
+			"integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@types/estree": "*",
@@ -2498,9 +2905,10 @@
 			}
 		},
 		"node_modules/@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+			"version": "3.7.7",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@types/eslint": "*",
@@ -2508,40 +2916,57 @@
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "0.0.51",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/@types/express": {
-			"version": "4.17.14",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-			"integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+			"integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@types/body-parser": "*",
-				"@types/express-serve-static-core": "^4.17.18",
+				"@types/express-serve-static-core": "^4.17.33",
 				"@types/qs": "*",
 				"@types/serve-static": "*"
 			}
 		},
 		"node_modules/@types/express-serve-static-core": {
-			"version": "4.17.31",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-			"integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+			"version": "4.19.5",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
+			"integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/qs": "*",
-				"@types/range-parser": "*"
+				"@types/range-parser": "*",
+				"@types/send": "*"
+			}
+		},
+		"node_modules/@types/hast": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+			"integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+			"dependencies": {
+				"@types/unist": "*"
 			}
 		},
+		"node_modules/@types/http-errors": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+			"integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+			"dev": true,
+			"peer": true
+		},
 		"node_modules/@types/http-proxy": {
-			"version": "1.17.9",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-			"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+			"version": "1.17.15",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+			"integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -2549,14 +2974,18 @@
 			}
 		},
 		"node_modules/@types/jquery": {
-			"version": "2.0.60",
-			"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.60.tgz",
-			"integrity": "sha512-izi6OBEVrAwaHiqWITjOPBbVtcKZKAXTocJqPZsAKA2lvmbpFEyPSAxgcqmisbiMYj9EvrooUEPLHQeQqVMWAg=="
+			"version": "3.5.16",
+			"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.16.tgz",
+			"integrity": "sha512-bsI7y4ZgeMkmpG9OM710RRzDFp+w4P1RGiIt30C1mSBT+ExCleeh4HObwgArnDFELmRrOpXgSYN9VF1hj+f1lw==",
+			"dependencies": {
+				"@types/sizzle": "*"
+			}
 		},
 		"node_modules/@types/json-schema": {
-			"version": "7.0.11",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-			"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/@types/json5": {
@@ -2566,54 +2995,88 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/@types/mdast": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+			"integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+			"dependencies": {
+				"@types/unist": "*"
+			}
+		},
 		"node_modules/@types/mime": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-			"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+			"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
 			"dev": true,
 			"peer": true
 		},
 		"node_modules/@types/minimist": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-			"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/@types/ms": {
+			"version": "0.7.34",
+			"resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+			"integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
+		},
 		"node_modules/@types/node": {
-			"version": "18.7.18",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
-			"integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==",
-			"peer": true
+			"version": "20.16.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.1.tgz",
+			"integrity": "sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
+		},
+		"node_modules/@types/node-forge": {
+			"version": "1.3.11",
+			"resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+			"integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
 		},
 		"node_modules/@types/normalize-package-data": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+			"integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-			"dev": true,
+		"node_modules/@types/prop-types": {
+			"version": "15.7.12",
+			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
+			"integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
 			"peer": true
 		},
 		"node_modules/@types/qs": {
-			"version": "6.9.7",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+			"version": "6.9.15",
+			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
+			"integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
 			"dev": true,
 			"peer": true
 		},
 		"node_modules/@types/range-parser": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+			"integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/@types/react": {
+			"version": "18.3.4",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz",
+			"integrity": "sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw==",
+			"peer": true,
+			"dependencies": {
+				"@types/prop-types": "*",
+				"csstype": "^3.0.2"
+			}
+		},
 		"node_modules/@types/retry": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
@@ -2622,301 +3085,784 @@
 			"peer": true
 		},
 		"node_modules/@types/semver": {
-			"version": "7.3.12",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz",
-			"integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A=="
+			"version": "7.5.8",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+			"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+			"dev": true,
+			"peer": true
 		},
-		"node_modules/@types/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+		"node_modules/@types/send": {
+			"version": "0.17.4",
+			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+			"integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@types/express": "*"
+				"@types/mime": "^1",
+				"@types/node": "*"
 			}
 		},
-		"node_modules/@types/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+		"node_modules/@types/serve-index": {
+			"version": "1.9.4",
+			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+			"integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@types/mime": "*",
-				"@types/node": "*"
+				"@types/express": "*"
 			}
 		},
-		"node_modules/@types/sockjs": {
-			"version": "0.3.33",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+		"node_modules/@types/serve-static": {
+			"version": "1.15.7",
+			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+			"integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@types/node": "*"
+				"@types/http-errors": "*",
+				"@types/node": "*",
+				"@types/send": "*"
 			}
 		},
-		"node_modules/@types/ws": {
-			"version": "8.5.3",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-			"integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+		"node_modules/@types/sizzle": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+			"integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg=="
+		},
+		"node_modules/@types/sockjs": {
+			"version": "0.3.36",
+			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+			"integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
-		"node_modules/@vue/compiler-sfc": {
-			"version": "2.7.10",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
-			"integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
+		"node_modules/@types/toastify-js": {
+			"version": "1.12.3",
+			"resolved": "https://registry.npmjs.org/@types/toastify-js/-/toastify-js-1.12.3.tgz",
+			"integrity": "sha512-9RjLlbAHMSaae/KZNHGv19VG4gcLIm3YjvacCXBtfMfYn26h76YP5oxXI8k26q4iKXCB9LNfv18lsoS0JnFPTg=="
+		},
+		"node_modules/@types/trusted-types": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+			"integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
+		},
+		"node_modules/@types/unist": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+			"integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="
+		},
+		"node_modules/@types/web-bluetooth": {
+			"version": "0.0.20",
+			"resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+			"integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow=="
+		},
+		"node_modules/@types/ws": {
+			"version": "8.5.12",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
+			"integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/parser": "^7.18.4",
-				"postcss": "^8.4.14",
-				"source-map": "^0.6.1"
+				"@types/node": "*"
 			}
 		},
-		"node_modules/@vue/component-compiler-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-			"integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz",
+			"integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"consolidate": "^0.15.1",
-				"hash-sum": "^1.0.2",
-				"lru-cache": "^4.1.2",
-				"merge-source-map": "^1.1.0",
-				"postcss": "^7.0.36",
-				"postcss-selector-parser": "^6.0.2",
-				"source-map": "~0.6.1",
-				"vue-template-es2015-compiler": "^1.9.0"
+				"@eslint-community/regexpp": "^4.5.1",
+				"@typescript-eslint/scope-manager": "7.2.0",
+				"@typescript-eslint/type-utils": "7.2.0",
+				"@typescript-eslint/utils": "7.2.0",
+				"@typescript-eslint/visitor-keys": "7.2.0",
+				"debug": "^4.3.4",
+				"graphemer": "^1.4.0",
+				"ignore": "^5.2.4",
+				"natural-compare": "^1.4.0",
+				"semver": "^7.5.4",
+				"ts-api-utils": "^1.0.1"
 			},
-			"optionalDependencies": {
-				"prettier": "^1.18.2 || ^2.0.0"
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^7.0.0",
+				"eslint": "^8.56.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"node_modules/@vue/component-compiler-utils/node_modules/postcss": {
-			"version": "7.0.39",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+		"node_modules/@typescript-eslint/parser": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz",
+			"integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"picocolors": "^0.2.1",
-				"source-map": "^0.6.1"
+				"@typescript-eslint/scope-manager": "7.2.0",
+				"@typescript-eslint/types": "7.2.0",
+				"@typescript-eslint/typescript-estree": "7.2.0",
+				"@typescript-eslint/visitor-keys": "7.2.0",
+				"debug": "^4.3.4"
 			},
 			"engines": {
-				"node": ">=6.0.0"
+				"node": "^16.0.0 || >=18.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.56.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@webassemblyjs/ast": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
+			"integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@webassemblyjs/helper-numbers": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+				"@typescript-eslint/types": "7.2.0",
+				"@typescript-eslint/visitor-keys": "7.2.0"
+			},
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
-		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-			"peer": true
-		},
-		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-			"peer": true
-		},
-		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-			"peer": true
-		},
-		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+		"node_modules/@typescript-eslint/type-utils": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz",
+			"integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@xtuc/long": "4.2.2"
+				"@typescript-eslint/typescript-estree": "7.2.0",
+				"@typescript-eslint/utils": "7.2.0",
+				"debug": "^4.3.4",
+				"ts-api-utils": "^1.0.1"
+			},
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.56.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-			"peer": true
-		},
-		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+		"node_modules/@typescript-eslint/types": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
+			"integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
+			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1"
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
-		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
+			"integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@xtuc/ieee754": "^1.2.0"
+				"@typescript-eslint/types": "7.2.0",
+				"@typescript-eslint/visitor-keys": "7.2.0",
+				"debug": "^4.3.4",
+				"globby": "^11.1.0",
+				"is-glob": "^4.0.3",
+				"minimatch": "9.0.3",
+				"semver": "^7.5.4",
+				"ts-api-utils": "^1.0.1"
+			},
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"@xtuc/long": "4.2.2"
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-			"peer": true
-		},
-		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+		"node_modules/@typescript-eslint/utils": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
+			"integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/helper-wasm-section": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-opt": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
-				"@webassemblyjs/wast-printer": "1.11.1"
+				"@eslint-community/eslint-utils": "^4.4.0",
+				"@types/json-schema": "^7.0.12",
+				"@types/semver": "^7.5.0",
+				"@typescript-eslint/scope-manager": "7.2.0",
+				"@typescript-eslint/types": "7.2.0",
+				"@typescript-eslint/typescript-estree": "7.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.56.0"
 			}
 		},
-		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+		"node_modules/@typescript-eslint/utils/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
+			"integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1"
+				"@typescript-eslint/types": "7.2.0",
+				"eslint-visitor-keys": "^3.4.1"
+			},
+			"engines": {
+				"node": "^16.0.0 || >=18.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
-		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+		"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+			"dev": true,
 			"peer": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@ungap/structured-clone": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+			"integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+		},
+		"node_modules/@vue/compiler-sfc": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+			"integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
+				"@babel/parser": "^7.23.5",
+				"postcss": "^8.4.14",
+				"source-map": "^0.6.1"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
 			}
 		},
-		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+		"node_modules/@vue/component-compiler-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
+			"integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@xtuc/long": "4.2.2"
+				"consolidate": "^0.15.1",
+				"hash-sum": "^1.0.2",
+				"lru-cache": "^4.1.2",
+				"merge-source-map": "^1.1.0",
+				"postcss": "^7.0.36",
+				"postcss-selector-parser": "^6.0.2",
+				"source-map": "~0.6.1",
+				"vue-template-es2015-compiler": "^1.9.0"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
 			}
 		},
-		"node_modules/@webpack-cli/configtest": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-			"integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+		"node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
 			"dev": true,
 			"peer": true,
-			"peerDependencies": {
-				"webpack": "4.x.x || 5.x.x",
-				"webpack-cli": "4.x.x"
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
 			}
 		},
-		"node_modules/@webpack-cli/info": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-			"integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+		"node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@vue/component-compiler-utils/node_modules/postcss": {
+			"version": "7.0.39",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"envinfo": "^7.7.3"
+				"picocolors": "^0.2.1",
+				"source-map": "^0.6.1"
 			},
-			"peerDependencies": {
-				"webpack-cli": "4.x.x"
+			"engines": {
+				"node": ">=6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
 			}
 		},
-		"node_modules/@webpack-cli/serve": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-			"integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+		"node_modules/@vue/component-compiler-utils/node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@vue/eslint-config-typescript": {
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-13.0.0.tgz",
+			"integrity": "sha512-MHh9SncG/sfqjVqjcuFLOLD6Ed4dRAis4HNt0dXASeAuLqIAx4YMB1/m2o4pUKK1vCt8fUvYG8KKX2Ot3BVZTg==",
 			"dev": true,
 			"peer": true,
+			"dependencies": {
+				"@typescript-eslint/eslint-plugin": "^7.1.1",
+				"@typescript-eslint/parser": "^7.1.1",
+				"vue-eslint-parser": "^9.3.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || >=20.0.0"
+			},
 			"peerDependencies": {
-				"webpack-cli": "4.x.x"
+				"eslint": "^8.56.0",
+				"eslint-plugin-vue": "^9.0.0",
+				"typescript": ">=4.7.4"
 			},
 			"peerDependenciesMeta": {
-				"webpack-dev-server": {
+				"typescript": {
 					"optional": true
 				}
 			}
 		},
-		"node_modules/@xtuc/ieee754": {
+		"node_modules/@vueuse/components": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/components/-/components-11.0.1.tgz",
+			"integrity": "sha512-iZYHc7XcZ2NqpEaSiDXF6qcVcCzAwnA74s+ZV8aHJhdxO61BFpACGuT32Jb5oR+pVc6dfrUUspcCoYzLcFtOOA==",
+			"dependencies": {
+				"@vueuse/core": "11.0.1",
+				"@vueuse/shared": "11.0.1",
+				"vue-demi": ">=0.14.10"
+			}
+		},
+		"node_modules/@vueuse/components/node_modules/vue-demi": {
+			"version": "0.14.10",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+			"integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+			"hasInstallScript": true,
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vueuse/core": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.0.1.tgz",
+			"integrity": "sha512-YTrekI18WwEyP3h168Fir94G/HNC27wvXJI21Alm0sPOwvhihfkrvHIe+5PNJq+MpgWdRcsjvE/38JaoKrgZhQ==",
+			"dependencies": {
+				"@types/web-bluetooth": "^0.0.20",
+				"@vueuse/metadata": "11.0.1",
+				"@vueuse/shared": "11.0.1",
+				"vue-demi": ">=0.14.10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/@vueuse/core/node_modules/vue-demi": {
+			"version": "0.14.10",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+			"integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+			"hasInstallScript": true,
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vueuse/metadata": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.0.1.tgz",
+			"integrity": "sha512-dTFvuHFAjLYOiSd+t9Sk7xUiuL6jbfay/eX+g+jaipXXlwKur2VCqBCZX+jfu+2vROUGcUsdn3fJR9KkpadIOg==",
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/@vueuse/shared": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.0.1.tgz",
+			"integrity": "sha512-eAPf5CQB3HR0S76HqrhjBqFYstZfiHWZq8xF9EQmobGBkrhPfErJEhr8aMNQMqd6MkENIx2pblIEfJGlHpClug==",
+			"dependencies": {
+				"vue-demi": ">=0.14.10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/@vueuse/shared/node_modules/vue-demi": {
+			"version": "0.14.10",
+			"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+			"integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+			"hasInstallScript": true,
+			"bin": {
+				"vue-demi-fix": "bin/vue-demi-fix.js",
+				"vue-demi-switch": "bin/vue-demi-switch.js"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			},
+			"peerDependencies": {
+				"@vue/composition-api": "^1.0.0-rc.1",
+				"vue": "^3.0.0-0 || ^2.6.0"
+			},
+			"peerDependenciesMeta": {
+				"@vue/composition-api": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@webassemblyjs/ast": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+			"integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/helper-numbers": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/floating-point-hex-parser": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@webassemblyjs/helper-api-error": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@webassemblyjs/helper-buffer": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+			"integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@webassemblyjs/helper-numbers": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
+				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@webassemblyjs/helper-wasm-section": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+			"integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/wasm-gen": "1.12.1"
+			}
+		},
+		"node_modules/@webassemblyjs/ieee754": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+			"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@xtuc/ieee754": "^1.2.0"
+			}
+		},
+		"node_modules/@webassemblyjs/leb128": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+			"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/utf8": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/@webassemblyjs/wasm-edit": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+			"integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/helper-wasm-section": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-opt": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1",
+				"@webassemblyjs/wast-printer": "1.12.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-gen": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+			"integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/ieee754": "1.11.6",
+				"@webassemblyjs/leb128": "1.11.6",
+				"@webassemblyjs/utf8": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-opt": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+			"integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-parser": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+			"integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/ieee754": "1.11.6",
+				"@webassemblyjs/leb128": "1.11.6",
+				"@webassemblyjs/utf8": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wast-printer": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+			"integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.12.1",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webpack-cli/configtest": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+			"integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=14.15.0"
+			},
+			"peerDependencies": {
+				"webpack": "5.x.x",
+				"webpack-cli": "5.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/info": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+			"integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=14.15.0"
+			},
+			"peerDependencies": {
+				"webpack": "5.x.x",
+				"webpack-cli": "5.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/serve": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+			"integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=14.15.0"
+			},
+			"peerDependencies": {
+				"webpack": "5.x.x",
+				"webpack-cli": "5.x.x"
+			},
+			"peerDependenciesMeta": {
+				"webpack-dev-server": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
 			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/abort-controller": {
@@ -2947,9 +3893,10 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.8.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-			"integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+			"version": "8.12.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+			"integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+			"dev": true,
 			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
@@ -2958,10 +3905,11 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-			"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+		"node_modules/acorn-import-attributes": {
+			"version": "1.9.5",
+			"resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+			"integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+			"dev": true,
 			"peer": true,
 			"peerDependencies": {
 				"acorn": "^8"
@@ -2981,6 +3929,7 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
@@ -3012,16 +3961,16 @@
 			}
 		},
 		"node_modules/ajv-formats/node_modules/ajv": {
-			"version": "8.11.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -3039,6 +3988,7 @@
 			"version": "3.5.2",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
 			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"dev": true,
 			"peer": true,
 			"peerDependencies": {
 				"ajv": "^6.9.1"
@@ -3071,6 +4021,8 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"color-convert": "^1.9.0"
 			},
@@ -3079,10 +4031,11 @@
 			}
 		},
 		"node_modules/anymatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-			"devOptional": true,
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"normalize-path": "^3.0.0",
 				"picomatch": "^2.0.4"
@@ -3091,31 +4044,58 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/are-docs-informative": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+			"integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=14"
+			}
+		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true,
 			"peer": true
 		},
+		"node_modules/array-buffer-byte-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+			"integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"is-array-buffer": "^3.0.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/array-flatten": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
 			"dev": true,
 			"peer": true
 		},
 		"node_modules/array-includes": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-			"integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+			"version": "3.1.8",
+			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+			"integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5",
-				"get-intrinsic": "^1.1.1",
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2",
+				"es-object-atoms": "^1.0.0",
+				"get-intrinsic": "^1.2.4",
 				"is-string": "^1.0.7"
 			},
 			"engines": {
@@ -3135,16 +4115,56 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/array.prototype.findlastindex": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+			"integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.0.0",
+				"es-shim-unscopables": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/array.prototype.flat": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-			"integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+			"integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"es-abstract": "^1.22.1",
+				"es-shim-unscopables": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/array.prototype.flatmap": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+			"integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
+				"define-properties": "^1.2.0",
+				"es-abstract": "^1.22.1",
 				"es-shim-unscopables": "^1.0.0"
 			},
 			"engines": {
@@ -3154,6 +4174,29 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/arraybuffer.prototype.slice": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+			"integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"array-buffer-byte-length": "^1.0.1",
+				"call-bind": "^1.0.5",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.22.3",
+				"es-errors": "^1.2.1",
+				"get-intrinsic": "^1.2.3",
+				"is-array-buffer": "^3.0.4",
+				"is-shared-array-buffer": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/arrify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -3165,16 +4208,15 @@
 			}
 		},
 		"node_modules/asn1.js": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
+				"minimalistic-assert": "^1.0.0"
 			}
 		},
 		"node_modules/asn1.js/node_modules/bn.js": {
@@ -3185,16 +4227,17 @@
 			"peer": true
 		},
 		"node_modules/assert": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-			"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+			"integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"es6-object-assign": "^1.1.0",
-				"is-nan": "^1.2.1",
-				"object-is": "^1.0.1",
-				"util": "^0.12.0"
+				"call-bind": "^1.0.2",
+				"is-nan": "^1.3.2",
+				"object-is": "^1.1.5",
+				"object.assign": "^4.1.4",
+				"util": "^0.12.5"
 			}
 		},
 		"node_modules/astral-regex": {
@@ -3213,11 +4256,14 @@
 			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
 		},
 		"node_modules/available-typed-arrays": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+			"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
 			"dev": true,
 			"peer": true,
+			"dependencies": {
+				"possible-typed-array-names": "^1.0.0"
+			},
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -3226,76 +4272,82 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "0.27.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-			"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+			"integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
 			"dependencies": {
-				"follow-redirects": "^1.14.9",
-				"form-data": "^4.0.0"
+				"follow-redirects": "^1.15.6",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
 			}
 		},
 		"node_modules/babel-loader": {
-			"version": "8.2.5",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-			"integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+			"integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
+				"find-cache-dir": "^4.0.0",
+				"schema-utils": "^4.0.0"
 			},
 			"engines": {
-				"node": ">= 8.9"
+				"node": ">= 14.15.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0",
-				"webpack": ">=2"
-			}
-		},
-		"node_modules/babel-plugin-dynamic-import-node": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-			"dependencies": {
-				"object.assign": "^4.1.0"
+				"@babel/core": "^7.12.0",
+				"webpack": ">=5"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs2": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+			"version": "0.4.11",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+			"integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/compat-data": "^7.17.7",
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"semver": "^6.1.1"
+				"@babel/compat-data": "^7.22.6",
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"semver": "^6.3.1"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs3": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-			"integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+			"version": "0.10.6",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+			"integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"core-js-compat": "^3.25.1"
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"core-js-compat": "^3.38.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-regenerator": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-			"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+			"integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3"
+				"@babel/helper-define-polyfill-provider": "^0.6.2"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/bail": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+			"integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
 		"node_modules/balanced-match": {
@@ -3303,6 +4355,11 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
 		},
+		"node_modules/base-64": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
+			"integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
+		},
 		"node_modules/base64-js": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -3342,12 +4399,16 @@
 			}
 		},
 		"node_modules/binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-			"devOptional": true,
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/bluebird": {
@@ -3365,22 +4426,22 @@
 			"peer": true
 		},
 		"node_modules/body-parser": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-			"integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+			"version": "1.20.2",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
+				"content-type": "~1.0.5",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
 				"destroy": "1.2.0",
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.10.3",
-				"raw-body": "2.5.1",
+				"qs": "6.11.0",
+				"raw-body": "2.5.2",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
 			},
@@ -3416,15 +4477,29 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/body-parser/node_modules/qs": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/bonjour-service": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-			"integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+			"integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
 				"fast-deep-equal": "^3.1.3",
 				"multicast-dns": "^7.2.5"
 			}
@@ -3437,21 +4512,21 @@
 			"peer": true
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+				"balanced-match": "^1.0.0"
 			}
 		},
 		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"devOptional": true,
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
 				"node": ">=8"
@@ -3516,57 +4591,72 @@
 			}
 		},
 		"node_modules/browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+			"integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
+				"bn.js": "^5.2.1",
+				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
+				"elliptic": "^6.5.5",
+				"hash-base": "~3.0",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"parse-asn1": "^5.1.7",
+				"readable-stream": "^2.3.8",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.12"
 			}
 		},
+		"node_modules/browserify-sign/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"dev": true,
+			"peer": true
+		},
 		"node_modules/browserify-sign/node_modules/readable-stream": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
 			}
 		},
-		"node_modules/browserify-sign/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+		"node_modules/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/browserify-sign/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"node_modules/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
 			"peer": true
 		},
 		"node_modules/browserify-zlib": {
@@ -3580,9 +4670,10 @@
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.21.4",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-			"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+			"version": "4.23.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+			"integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+			"dev": true,
 			"funding": [
 				{
 					"type": "opencollective",
@@ -3591,13 +4682,18 @@
 				{
 					"type": "tidelift",
 					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"peer": true,
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001400",
-				"electron-to-chromium": "^1.4.251",
-				"node-releases": "^2.0.6",
-				"update-browserslist-db": "^1.0.9"
+				"caniuse-lite": "^1.0.30001646",
+				"electron-to-chromium": "^1.5.4",
+				"node-releases": "^2.0.18",
+				"update-browserslist-db": "^1.1.0"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -3635,6 +4731,7 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
 			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/buffer-xor": {
@@ -3644,6 +4741,19 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/builtin-modules": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/builtin-status-codes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -3652,37 +4762,21 @@
 			"peer": true
 		},
 		"node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+			"integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"semver": "^7.0.0"
 			}
 		},
-		"node_modules/builtins/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/builtins/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -3690,12 +4784,10 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/builtins/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
+		"node_modules/byte-length": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/byte-length/-/byte-length-1.0.2.tgz",
+			"integrity": "sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q=="
 		},
 		"node_modules/bytes": {
 			"version": "3.0.0",
@@ -3708,12 +4800,20 @@
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -3730,37 +4830,60 @@
 			}
 		},
 		"node_modules/camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz",
+			"integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
+				"camelcase": "^6.3.0",
+				"map-obj": "^4.1.0",
+				"quick-lru": "^5.1.1",
+				"type-fest": "^1.2.1"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/camelcase-keys/node_modules/type-fest": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+			"integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/cancelable-promise": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/cancelable-promise/-/cancelable-promise-4.3.1.tgz",
+			"integrity": "sha512-A/8PwLk/T7IJDfUdQ68NR24QHa8rIlnN/stiJEBo6dmVUkD4K14LswG0w3VwdeK/o7qOwRUR1k2MhK5Rpy2m7A=="
+		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001409",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001409.tgz",
-			"integrity": "sha512-V0mnJ5dwarmhYv8/MzhJ//aW68UpvnQBXv8lJ2QUsvn2pHcmAuNtu8hQEDz37XnA1iE+lRR9CIfGWWpgJ5QedQ==",
+			"version": "1.0.30001651",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
+			"integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
+			"dev": true,
 			"funding": [
 				{
 					"type": "opencollective",
@@ -3769,13 +4892,29 @@
 				{
 					"type": "tidelift",
 					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
-			]
+			],
+			"peer": true
+		},
+		"node_modules/ccount": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+			"integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
 		"node_modules/chalk": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -3793,6 +4932,15 @@
 				"node": ">=12.20"
 			}
 		},
+		"node_modules/character-entities": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+			"integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/charenc": {
 			"version": "0.0.2",
 			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
@@ -3802,16 +4950,11 @@
 			}
 		},
 		"node_modules/chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"devOptional": true,
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://paulmillr.com/funding/"
-				}
-			],
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -3824,6 +4967,9 @@
 			"engines": {
 				"node": ">= 8.10.0"
 			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
 			"optionalDependencies": {
 				"fsevents": "~2.3.2"
 			}
@@ -3832,7 +4978,8 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"devOptional": true,
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -3841,9 +4988,10 @@
 			}
 		},
 		"node_modules/chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">=6.0"
@@ -3865,6 +5013,14 @@
 			"resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
 			"integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
 		},
+		"node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/clone-deep": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -3893,20 +5049,12 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/clone-deep/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/color-convert": {
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"color-name": "1.1.3"
 			}
@@ -3914,7 +5062,9 @@
 		"node_modules/color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/colord": {
 			"version": "2.9.3",
@@ -3924,9 +5074,9 @@
 			"peer": true
 		},
 		"node_modules/colorette": {
-			"version": "2.0.19",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-			"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+			"version": "2.0.20",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 			"dev": true,
 			"peer": true
 		},
@@ -3941,26 +5091,36 @@
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/comma-separated-tokens": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+			"integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/commander": {
 			"version": "2.20.3",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/comment-parser": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
-			"integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+			"integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
 			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">= 12.0.0"
 			}
 		},
-		"node_modules/commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+		"node_modules/common-path-prefix": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
 			"dev": true,
 			"peer": true
 		},
@@ -4013,10 +5173,19 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/compression/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true,
+			"peer": true
+		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/connect-history-api-fallback": {
 			"version": "2.0.0",
@@ -4039,6 +5208,7 @@
 			"version": "0.15.1",
 			"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
 			"integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+			"deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -4068,31 +5238,10 @@
 				"node": ">= 0.6"
 			}
 		},
-		"node_modules/content-disposition/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"peer": true
-		},
 		"node_modules/content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -4100,17 +5249,16 @@
 			}
 		},
 		"node_modules/convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"dependencies": {
-				"safe-buffer": "~5.1.1"
-			}
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -4125,9 +5273,9 @@
 			"peer": true
 		},
 		"node_modules/core-js": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
-			"integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A==",
+			"version": "3.37.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.0.tgz",
+			"integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==",
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -4135,11 +5283,13 @@
 			}
 		},
 		"node_modules/core-js-compat": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
-			"integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+			"integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"browserslist": "^4.21.4"
+				"browserslist": "^4.23.3"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -4154,20 +5304,30 @@
 			"peer": true
 		},
 		"node_modules/cosmiconfig": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-			"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+			"version": "8.3.6",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
+				"import-fresh": "^3.3.0",
+				"js-yaml": "^4.1.0",
+				"parse-json": "^5.2.0",
+				"path-type": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/d-fischer"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/create-ecdh": {
@@ -4264,30 +5424,30 @@
 			}
 		},
 		"node_modules/css-functions-list": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-			"integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz",
+			"integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">=12.22"
+				"node": ">=12 || >=16"
 			}
 		},
 		"node_modules/css-loader": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-			"integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+			"integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.7",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.0",
-				"postcss-modules-scope": "^3.0.0",
+				"postcss": "^8.4.33",
+				"postcss-modules-extract-imports": "^3.1.0",
+				"postcss-modules-local-by-default": "^4.0.5",
+				"postcss-modules-scope": "^3.2.0",
 				"postcss-modules-values": "^4.0.0",
 				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.5"
+				"semver": "^7.5.4"
 			},
 			"engines": {
 				"node": ">= 12.13.0"
@@ -4297,45 +5457,45 @@
 				"url": "https://opencollective.com/webpack"
 			},
 			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
 				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/css-loader/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/css-loader/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
+			"bin": {
+				"semver": "bin/semver.js"
 			},
 			"engines": {
 				"node": ">=10"
 			}
 		},
-		"node_modules/css-loader/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+		"node_modules/css-tree": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
+				"mdn-data": "2.0.30",
+				"source-map-js": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
 			}
 		},
-		"node_modules/css-loader/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/cssesc": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -4350,9 +5510,71 @@
 			}
 		},
 		"node_modules/csstype": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-			"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+		},
+		"node_modules/data-uri-to-buffer": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+			"integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/data-view-buffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+			"integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"es-errors": "^1.3.0",
+				"is-data-view": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/data-view-byte-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+			"integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"is-data-view": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/data-view-byte-offset": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+			"integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"es-errors": "^1.3.0",
+				"is-data-view": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/date-format-parse": {
 			"version": "0.2.7",
@@ -4367,14 +5589,20 @@
 			"peer": true
 		},
 		"node_modules/debounce": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-			"integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/debounce/-/debounce-2.1.0.tgz",
+			"integrity": "sha512-OkL3+0pPWCqoBc/nhO9u6TIQNTK44fnBnzuVtJAbp13Naxw9R6u21x+8tVTka87AhDZ3htqZ2pSSsZl9fqL2Wg==",
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"version": "4.3.6",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+			"integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
 			"dependencies": {
 				"ms": "2.1.2"
 			},
@@ -4388,25 +5616,41 @@
 			}
 		},
 		"node_modules/decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",
+			"integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+			"integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"decamelize": "^1.1.0",
 				"map-obj": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/decamelize-keys/node_modules/decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -4421,6 +5665,18 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/decode-named-character-reference": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+			"integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
+			"dependencies": {
+				"character-entities": "^2.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -4441,6 +5697,24 @@
 				"node": ">= 10"
 			}
 		},
+		"node_modules/define-data-property": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/define-lazy-prop": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -4452,10 +5726,13 @@
 			}
 		},
 		"node_modules/define-properties": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-			"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
+				"define-data-property": "^1.0.1",
 				"has-property-descriptors": "^1.0.0",
 				"object-keys": "^1.1.1"
 			},
@@ -4484,10 +5761,18 @@
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/dequal": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+			"integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -4513,6 +5798,18 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/devlop": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+			"integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+			"dependencies": {
+				"dequal": "^2.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/diffie-hellman": {
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -4545,17 +5842,10 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/dns-packet": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-			"integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+			"version": "5.6.1",
+			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+			"integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -4594,9 +5884,9 @@
 			}
 		},
 		"node_modules/domain-browser": {
-			"version": "4.22.0",
-			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz",
-			"integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==",
+			"version": "4.23.0",
+			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.23.0.tgz",
+			"integrity": "sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -4635,16 +5925,21 @@
 				"url": "https://github.com/fb55/domhandler?sponsor=1"
 			}
 		},
+		"node_modules/dompurify": {
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
+			"integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ=="
+		},
 		"node_modules/domutils": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-			"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"dom-serializer": "^2.0.0",
 				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.1"
+				"domhandler": "^5.0.3"
 			},
 			"funding": {
 				"url": "https://github.com/fb55/domutils?sponsor=1"
@@ -4658,14 +5953,16 @@
 			"peer": true
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.256",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.256.tgz",
-			"integrity": "sha512-x+JnqyluoJv8I0U9gVe+Sk2st8vF0CzMt78SXxuoWCooLLY2k5VerIBdpvG7ql6GKI4dzNnPjmqgDJ76EdaAKw=="
+			"version": "1.5.13",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
+			"integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"version": "6.5.7",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
+			"integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -4686,13 +5983,12 @@
 			"peer": true
 		},
 		"node_modules/emoji-mart-vue-fast": {
-			"version": "10.2.2",
-			"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-10.2.2.tgz",
-			"integrity": "sha512-SO37LI60Oksog3RhNpEUoQjfceBXfZ3yW9ALhlQgyut7hE6MghHsBJrGPeI6KKK8bQfTMBYlci/RWKsUsmbkPw==",
+			"version": "15.0.2",
+			"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-15.0.2.tgz",
+			"integrity": "sha512-q7VaE6yRrlQd+jpHPToh1XnIatgACkQjBj0vQ7uNaWrbVsKlhZaOsqZVoegT5IZt5XkYoR2x4MHMNep/BJP9rw==",
 			"dependencies": {
-				"@babel/polyfill": "^7.12.1",
-				"@babel/runtime": "^7.16.3",
-				"vue-virtual-scroller": "^1.0.10"
+				"@babel/runtime": "^7.18.6",
+				"core-js": "^3.23.5"
 			},
 			"peerDependencies": {
 				"vue": ">2.0.0"
@@ -4726,9 +6022,10 @@
 			}
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.10.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-			"integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+			"version": "5.17.1",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
@@ -4739,10 +6036,9 @@
 			}
 		},
 		"node_modules/entities": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-			"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-			"dev": true,
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
 			"peer": true,
 			"engines": {
 				"node": ">=0.12"
@@ -4752,9 +6048,9 @@
 			}
 		},
 		"node_modules/envinfo": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-			"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
+			"integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
 			"dev": true,
 			"peer": true,
 			"bin": {
@@ -4775,35 +6071,58 @@
 			}
 		},
 		"node_modules/es-abstract": {
-			"version": "1.20.2",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-			"integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
+			"version": "1.23.3",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+			"integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"array-buffer-byte-length": "^1.0.1",
+				"arraybuffer.prototype.slice": "^1.0.3",
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
+				"data-view-buffer": "^1.0.1",
+				"data-view-byte-length": "^1.0.1",
+				"data-view-byte-offset": "^1.0.0",
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.0.0",
+				"es-set-tostringtag": "^2.0.3",
 				"es-to-primitive": "^1.2.1",
-				"function-bind": "^1.1.1",
-				"function.prototype.name": "^1.1.5",
-				"get-intrinsic": "^1.1.2",
-				"get-symbol-description": "^1.0.0",
-				"has": "^1.0.3",
-				"has-property-descriptors": "^1.0.0",
+				"function.prototype.name": "^1.1.6",
+				"get-intrinsic": "^1.2.4",
+				"get-symbol-description": "^1.0.2",
+				"globalthis": "^1.0.3",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2",
+				"has-proto": "^1.0.3",
 				"has-symbols": "^1.0.3",
-				"internal-slot": "^1.0.3",
-				"is-callable": "^1.2.4",
-				"is-negative-zero": "^2.0.2",
+				"hasown": "^2.0.2",
+				"internal-slot": "^1.0.7",
+				"is-array-buffer": "^3.0.4",
+				"is-callable": "^1.2.7",
+				"is-data-view": "^1.0.1",
+				"is-negative-zero": "^2.0.3",
 				"is-regex": "^1.1.4",
-				"is-shared-array-buffer": "^1.0.2",
+				"is-shared-array-buffer": "^1.0.3",
 				"is-string": "^1.0.7",
+				"is-typed-array": "^1.1.13",
 				"is-weakref": "^1.0.2",
-				"object-inspect": "^1.12.2",
+				"object-inspect": "^1.13.1",
 				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.4",
-				"regexp.prototype.flags": "^1.4.3",
-				"string.prototype.trimend": "^1.0.5",
-				"string.prototype.trimstart": "^1.0.5",
-				"unbox-primitive": "^1.0.2"
+				"object.assign": "^4.1.5",
+				"regexp.prototype.flags": "^1.5.2",
+				"safe-array-concat": "^1.1.2",
+				"safe-regex-test": "^1.0.3",
+				"string.prototype.trim": "^1.2.9",
+				"string.prototype.trimend": "^1.0.8",
+				"string.prototype.trimstart": "^1.0.8",
+				"typed-array-buffer": "^1.0.2",
+				"typed-array-byte-length": "^1.0.1",
+				"typed-array-byte-offset": "^1.0.2",
+				"typed-array-length": "^1.0.6",
+				"unbox-primitive": "^1.0.2",
+				"which-typed-array": "^1.1.15"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -4812,20 +6131,72 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/es-define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/es-module-lexer": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+			"integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+			"dev": true,
 			"peer": true
 		},
-		"node_modules/es-shim-unscopables": {
+		"node_modules/es-object-atoms": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-			"integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+			"integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"es-errors": "^1.3.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-set-tostringtag": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+			"integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"get-intrinsic": "^1.2.4",
+				"has-tostringtag": "^1.0.2",
+				"hasown": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-shim-unscopables": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+			"integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"has": "^1.0.3"
+				"hasown": "^2.0.0"
 			}
 		},
 		"node_modules/es-to-primitive": {
@@ -4846,19 +6217,14 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/es6-object-assign": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-			"engines": {
-				"node": ">=6"
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+			"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=6"
 			}
 		},
 		"node_modules/escape-html": {
@@ -4870,55 +6236,56 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=0.8.0"
 			}
 		},
 		"node_modules/eslint": {
-			"version": "8.23.1",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
-			"integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+			"version": "8.57.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+			"integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@eslint/eslintrc": "^1.3.2",
-				"@humanwhocodes/config-array": "^0.10.4",
-				"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/regexpp": "^4.6.1",
+				"@eslint/eslintrc": "^2.1.4",
+				"@eslint/js": "8.57.0",
+				"@humanwhocodes/config-array": "^0.11.14",
 				"@humanwhocodes/module-importer": "^1.0.1",
-				"ajv": "^6.10.0",
+				"@nodelib/fs.walk": "^1.2.8",
+				"@ungap/structured-clone": "^1.2.0",
+				"ajv": "^6.12.4",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
 				"debug": "^4.3.2",
 				"doctrine": "^3.0.0",
 				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.4.0",
-				"esquery": "^1.4.0",
+				"eslint-scope": "^7.2.2",
+				"eslint-visitor-keys": "^3.4.3",
+				"espree": "^9.6.1",
+				"esquery": "^1.4.2",
 				"esutils": "^2.0.2",
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
 				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.15.0",
-				"globby": "^11.1.0",
-				"grapheme-splitter": "^1.0.4",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
+				"graphemer": "^1.4.0",
 				"ignore": "^5.2.0",
-				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
-				"js-sdsl": "^4.1.4",
+				"is-path-inside": "^3.0.3",
 				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.4.1",
 				"lodash.merge": "^4.6.2",
 				"minimatch": "^3.1.2",
 				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
+				"optionator": "^0.9.3",
 				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
 				"text-table": "^0.2.0"
 			},
 			"bin": {
@@ -4931,10 +6298,39 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
+		"node_modules/eslint-compat-utils": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
+			"integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"eslint": ">=6.0.0"
+			}
+		},
+		"node_modules/eslint-compat-utils/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/eslint-config-standard": {
-			"version": "17.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-			"integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+			"version": "17.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+			"integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
 			"dev": true,
 			"funding": [
 				{
@@ -4951,22 +6347,40 @@
 				}
 			],
 			"peer": true,
+			"engines": {
+				"node": ">=12.0.0"
+			},
 			"peerDependencies": {
 				"eslint": "^8.0.1",
 				"eslint-plugin-import": "^2.25.2",
-				"eslint-plugin-n": "^15.0.0",
+				"eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
 				"eslint-plugin-promise": "^6.0.0"
 			}
 		},
+		"node_modules/eslint-import-resolver-exports": {
+			"version": "1.0.0-beta.5",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-exports/-/eslint-import-resolver-exports-1.0.0-beta.5.tgz",
+			"integrity": "sha512-o6t0w7muUpXr7MkUVzD5igQoDfAQvTmcPp8HEAJdNF8eOuAO+yn6I/TTyMxz9ecCwzX7e02vzlkHURoScUuidg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"resolve.exports": "^2.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "*",
+				"eslint-plugin-import": "*"
+			}
+		},
 		"node_modules/eslint-import-resolver-node": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-			"integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+			"integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"debug": "^3.2.7",
-				"resolve": "^1.20.0"
+				"is-core-module": "^2.13.0",
+				"resolve": "^1.22.4"
 			}
 		},
 		"node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -4979,10 +6393,36 @@
 				"ms": "^2.1.1"
 			}
 		},
+		"node_modules/eslint-import-resolver-typescript": {
+			"version": "3.6.1",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz",
+			"integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"debug": "^4.3.4",
+				"enhanced-resolve": "^5.12.0",
+				"eslint-module-utils": "^2.7.4",
+				"fast-glob": "^3.3.1",
+				"get-tsconfig": "^4.5.0",
+				"is-core-module": "^2.11.0",
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": "^14.18.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+			},
+			"peerDependencies": {
+				"eslint": "*",
+				"eslint-plugin-import": "*"
+			}
+		},
 		"node_modules/eslint-module-utils": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-			"integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+			"integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -5007,72 +6447,52 @@
 				"ms": "^2.1.1"
 			}
 		},
-		"node_modules/eslint-plugin-es": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-			"integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+		"node_modules/eslint-plugin-es-x": {
+			"version": "7.8.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz",
+			"integrity": "sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==",
 			"dev": true,
+			"funding": [
+				"https://github.com/sponsors/ota-meshi",
+				"https://opencollective.com/eslint"
+			],
 			"peer": true,
 			"dependencies": {
-				"eslint-utils": "^2.0.0",
-				"regexpp": "^3.0.0"
+				"@eslint-community/eslint-utils": "^4.1.2",
+				"@eslint-community/regexpp": "^4.11.0",
+				"eslint-compat-utils": "^0.5.1"
 			},
 			"engines": {
-				"node": ">=8.10.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
+				"node": "^14.18.0 || >=16.0.0"
 			},
 			"peerDependencies": {
-				"eslint": ">=4.19.1"
-			}
-		},
-		"node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"eslint-visitor-keys": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			}
-		},
-		"node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=4"
+				"eslint": ">=8"
 			}
 		},
 		"node_modules/eslint-plugin-import": {
-			"version": "2.26.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-			"integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+			"version": "2.29.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+			"integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"array-includes": "^3.1.4",
-				"array.prototype.flat": "^1.2.5",
-				"debug": "^2.6.9",
+				"array-includes": "^3.1.7",
+				"array.prototype.findlastindex": "^1.2.3",
+				"array.prototype.flat": "^1.3.2",
+				"array.prototype.flatmap": "^1.3.2",
+				"debug": "^3.2.7",
 				"doctrine": "^2.1.0",
-				"eslint-import-resolver-node": "^0.3.6",
-				"eslint-module-utils": "^2.7.3",
-				"has": "^1.0.3",
-				"is-core-module": "^2.8.1",
+				"eslint-import-resolver-node": "^0.3.9",
+				"eslint-module-utils": "^2.8.0",
+				"hasown": "^2.0.0",
+				"is-core-module": "^2.13.1",
 				"is-glob": "^4.0.3",
 				"minimatch": "^3.1.2",
-				"object.values": "^1.1.5",
-				"resolve": "^1.22.0",
-				"tsconfig-paths": "^3.14.1"
+				"object.fromentries": "^2.0.7",
+				"object.groupby": "^1.0.1",
+				"object.values": "^1.1.7",
+				"semver": "^6.3.1",
+				"tsconfig-paths": "^3.15.0"
 			},
 			"engines": {
 				"node": ">=4"
@@ -5081,14 +6501,25 @@
 				"eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
 			}
 		},
+		"node_modules/eslint-plugin-import/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
 		"node_modules/eslint-plugin-import/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"ms": "2.0.0"
+				"ms": "^2.1.1"
 			}
 		},
 		"node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -5104,33 +6535,41 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/eslint-plugin-import/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+		"node_modules/eslint-plugin-import/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
 		},
 		"node_modules/eslint-plugin-jsdoc": {
-			"version": "39.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz",
-			"integrity": "sha512-R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g==",
+			"version": "46.10.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.10.1.tgz",
+			"integrity": "sha512-x8wxIpv00Y50NyweDUpa+58ffgSAI5sqe+zcZh33xphD0AVh+1kqr1ombaTRb7Fhpove1zfUuujlX9DWWBP5ag==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"@es-joy/jsdoccomment": "~0.31.0",
-				"comment-parser": "1.3.1",
+				"@es-joy/jsdoccomment": "~0.41.0",
+				"are-docs-informative": "^0.0.2",
+				"comment-parser": "1.4.1",
 				"debug": "^4.3.4",
 				"escape-string-regexp": "^4.0.0",
-				"esquery": "^1.4.0",
-				"semver": "^7.3.7",
-				"spdx-expression-parse": "^3.0.1"
+				"esquery": "^1.5.0",
+				"is-builtin-module": "^3.2.1",
+				"semver": "^7.5.4",
+				"spdx-expression-parse": "^4.0.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || ^17 || ^18"
+				"node": ">=16"
 			},
 			"peerDependencies": {
-				"eslint": "^7.0.0 || ^8.0.0"
+				"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
 			}
 		},
 		"node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
@@ -5146,28 +6585,12 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/eslint-plugin-jsdoc/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/eslint-plugin-jsdoc/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -5175,31 +6598,27 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/eslint-plugin-jsdoc/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/eslint-plugin-n": {
-			"version": "15.2.5",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz",
-			"integrity": "sha512-8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g==",
+			"version": "16.6.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz",
+			"integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.4.0",
 				"builtins": "^5.0.1",
-				"eslint-plugin-es": "^4.1.0",
-				"eslint-utils": "^3.0.0",
-				"ignore": "^5.1.1",
-				"is-core-module": "^2.10.0",
+				"eslint-plugin-es-x": "^7.5.0",
+				"get-tsconfig": "^4.7.0",
+				"globals": "^13.24.0",
+				"ignore": "^5.2.4",
+				"is-builtin-module": "^3.2.1",
+				"is-core-module": "^2.12.1",
 				"minimatch": "^3.1.2",
-				"resolve": "^1.22.1",
-				"semver": "^7.3.7"
+				"resolve": "^1.22.2",
+				"semver": "^7.5.3"
 			},
 			"engines": {
-				"node": ">=12.22.0"
+				"node": ">=16.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/mysticatea"
@@ -5208,28 +6627,52 @@
 				"eslint": ">=7.0.0"
 			}
 		},
-		"node_modules/eslint-plugin-n/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/eslint-plugin-n/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/eslint-plugin-n/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/eslint-plugin-n/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+		"node_modules/eslint-plugin-n/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"lru-cache": "^6.0.0"
+				"brace-expansion": "^1.1.7"
 			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/eslint-plugin-n/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"peer": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -5237,70 +6680,80 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/eslint-plugin-n/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+		"node_modules/eslint-plugin-n/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/eslint-plugin-promise": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz",
-			"integrity": "sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==",
+			"version": "6.6.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
+			"integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
 			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			},
 			"peerDependencies": {
-				"eslint": "^7.0.0 || ^8.0.0"
+				"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
 			}
 		},
 		"node_modules/eslint-plugin-vue": {
-			"version": "9.5.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.5.1.tgz",
-			"integrity": "sha512-Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w==",
+			"version": "9.27.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz",
+			"integrity": "sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"eslint-utils": "^3.0.0",
+				"@eslint-community/eslint-utils": "^4.4.0",
+				"globals": "^13.24.0",
 				"natural-compare": "^1.4.0",
-				"nth-check": "^2.0.1",
-				"postcss-selector-parser": "^6.0.9",
-				"semver": "^7.3.5",
-				"vue-eslint-parser": "^9.0.1",
+				"nth-check": "^2.1.1",
+				"postcss-selector-parser": "^6.0.15",
+				"semver": "^7.6.0",
+				"vue-eslint-parser": "^9.4.3",
 				"xml-name-validator": "^4.0.0"
 			},
 			"engines": {
 				"node": "^14.17.0 || >=16.0.0"
 			},
 			"peerDependencies": {
-				"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+				"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
 			}
 		},
-		"node_modules/eslint-plugin-vue/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+		"node_modules/eslint-plugin-vue/node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"type-fest": "^0.20.2"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/eslint-plugin-vue/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -5308,17 +6761,24 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/eslint-plugin-vue/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+		"node_modules/eslint-plugin-vue/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
 			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"esrecurse": "^4.3.0",
@@ -5328,25 +6788,6 @@
 				"node": ">=8.0.0"
 			}
 		},
-		"node_modules/eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"engines": {
-				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			},
-			"peerDependencies": {
-				"eslint": ">=5"
-			}
-		},
 		"node_modules/eslint-visitor-keys": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
@@ -5373,6 +6814,17 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
+		"node_modules/eslint/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
 		"node_modules/eslint/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -5424,9 +6876,9 @@
 			}
 		},
 		"node_modules/eslint/node_modules/eslint-scope": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -5435,16 +6887,22 @@
 			},
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
 		"node_modules/eslint/node_modules/eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
 		"node_modules/eslint/node_modules/estraverse": {
@@ -5458,9 +6916,9 @@
 			}
 		},
 		"node_modules/eslint/node_modules/globals": {
-			"version": "13.17.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-			"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -5483,11 +6941,24 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/eslint/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
+		"node_modules/eslint/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/eslint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
@@ -5510,15 +6981,15 @@
 			}
 		},
 		"node_modules/espree": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-			"integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"acorn": "^8.8.0",
+				"acorn": "^8.9.0",
 				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^3.3.0"
+				"eslint-visitor-keys": "^3.4.1"
 			},
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5528,19 +6999,22 @@
 			}
 		},
 		"node_modules/espree/node_modules/eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
 		"node_modules/esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -5564,6 +7038,7 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
 			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"estraverse": "^5.2.0"
@@ -5576,6 +7051,7 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">=4.0"
@@ -5585,6 +7061,7 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
 			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">=4.0"
@@ -5594,6 +7071,8 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
 			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -5629,6 +7108,7 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
 			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">=0.8.x"
@@ -5670,18 +7150,18 @@
 			}
 		},
 		"node_modules/express": {
-			"version": "4.18.1",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-			"integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+			"version": "4.19.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+			"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
-				"body-parser": "1.20.0",
+				"body-parser": "1.20.2",
 				"content-disposition": "0.5.4",
 				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
+				"cookie": "0.6.0",
 				"cookie-signature": "1.0.6",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
@@ -5697,7 +7177,7 @@
 				"parseurl": "~1.3.3",
 				"path-to-regexp": "0.1.7",
 				"proxy-addr": "~2.0.7",
-				"qs": "6.10.3",
+				"qs": "6.11.0",
 				"range-parser": "~1.2.1",
 				"safe-buffer": "5.2.1",
 				"send": "0.18.0",
@@ -5712,13 +7192,6 @@
 				"node": ">= 0.10.0"
 			}
 		},
-		"node_modules/express/node_modules/array-flatten": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/express/node_modules/debug": {
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -5736,37 +7209,38 @@
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/express/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+		"node_modules/express/node_modules/qs": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"peer": true
+			"peer": true,
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
 		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
 			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/fast-glob": {
-			"version": "3.2.12",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-			"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -5797,6 +7271,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
 			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/fast-levenshtein": {
@@ -5806,6 +7281,34 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/fast-uri": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+			"integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/fast-xml-parser": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+			"integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/NaturalIntelligence"
+				},
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/naturalintelligence"
+				}
+			],
+			"dependencies": {
+				"strnum": "^1.0.5"
+			},
+			"bin": {
+				"fxparser": "src/cli/cli.js"
+			}
+		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
 			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
@@ -5817,9 +7320,9 @@
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+			"version": "1.17.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -5839,6 +7342,28 @@
 				"node": ">=0.8.0"
 			}
 		},
+		"node_modules/fetch-blob": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+			"integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"dependencies": {
+				"node-domexception": "^1.0.0",
+				"web-streams-polyfill": "^3.0.3"
+			},
+			"engines": {
+				"node": "^12.20 || >= 14.13"
+			}
+		},
 		"node_modules/file-entry-cache": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -5853,10 +7378,11 @@
 			}
 		},
 		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"devOptional": true,
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -5911,21 +7437,20 @@
 			"peer": true
 		},
 		"node_modules/find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+			"integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
+				"common-path-prefix": "^3.0.0",
+				"pkg-dir": "^7.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
 			},
 			"funding": {
-				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/find-up": {
@@ -5945,14 +7470,25 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"flat": "cli.js"
+			}
+		},
 		"node_modules/flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+			"integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"flatted": "^3.1.0",
+				"flatted": "^3.2.9",
+				"keyv": "^4.5.3",
 				"rimraf": "^3.0.2"
 			},
 			"engines": {
@@ -5960,24 +7496,49 @@
 			}
 		},
 		"node_modules/flatted": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-			"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+			"integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/floating-vue": {
+			"version": "1.0.0-beta.19",
+			"resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-1.0.0-beta.19.tgz",
+			"integrity": "sha512-OcM7z5Ua4XAykqolmvPj3l1s+KqUKj6Xz2t66eqjgaWfNBjtuifmxO5+4rRXakIch/Crt8IH+vKdKcR3jOUaoQ==",
+			"dependencies": {
+				"@floating-ui/dom": "^0.1.10",
+				"vue-resize": "^1.0.0"
+			},
+			"peerDependencies": {
+				"vue": "^2.6.10"
+			}
+		},
+		"node_modules/floating-vue/node_modules/@floating-ui/core": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.3.1.tgz",
+			"integrity": "sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g=="
+		},
+		"node_modules/floating-vue/node_modules/@floating-ui/dom": {
+			"version": "0.1.10",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.1.10.tgz",
+			"integrity": "sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==",
+			"dependencies": {
+				"@floating-ui/core": "^0.3.0"
+			}
+		},
 		"node_modules/focus-trap": {
-			"version": "6.9.4",
-			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
-			"integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
+			"version": "7.5.4",
+			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.4.tgz",
+			"integrity": "sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==",
 			"dependencies": {
-				"tabbable": "^5.3.3"
+				"tabbable": "^6.2.0"
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"funding": [
 				{
 					"type": "individual",
@@ -6016,6 +7577,17 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/formdata-polyfill": {
+			"version": "4.0.10",
+			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+			"dependencies": {
+				"fetch-blob": "^3.1.2"
+			},
+			"engines": {
+				"node": ">=12.20.0"
+			}
+		},
 		"node_modules/forwarded": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -6037,26 +7609,23 @@
 			}
 		},
 		"node_modules/fs-monkey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-			"integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+			"integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/fs-readdir-recursive": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
-			"integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="
-		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
 			"dev": true,
 			"hasInstallScript": true,
 			"optional": true,
@@ -6069,21 +7638,26 @@
 			}
 		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"dev": true,
+			"peer": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/function.prototype.name": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+			"integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"functions-have-names": "^1.2.2"
+				"define-properties": "^1.2.0",
+				"es-abstract": "^1.22.1",
+				"functions-have-names": "^1.2.3"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -6106,18 +7680,27 @@
 			"version": "1.0.0-beta.2",
 			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
 			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-			"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -6137,14 +7720,15 @@
 			}
 		},
 		"node_modules/get-symbol-description": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+			"integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
+				"call-bind": "^1.0.5",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -6153,6 +7737,41 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/get-tsconfig": {
+			"version": "4.7.6",
+			"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz",
+			"integrity": "sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"resolve-pkg-maps": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -6170,8 +7789,33 @@
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
 			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+			"dev": true,
 			"peer": true
 		},
+		"node_modules/glob/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/glob/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/global-modules": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -6200,16 +7844,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/global-prefix/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/global-prefix/node_modules/which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -6227,10 +7861,29 @@
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
 			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=4"
 			}
 		},
+		"node_modules/globalthis": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+			"integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"define-properties": "^1.2.1",
+				"gopd": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/globby": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -6259,27 +7912,33 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"get-intrinsic": "^1.1.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/graceful-fs": {
-			"version": "4.2.10",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+			"dev": true,
 			"peer": true
 		},
-		"node_modules/grapheme-splitter": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+		"node_modules/graphemer": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/hammerjs": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
-			"integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
 		"node_modules/handle-thing": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -6297,17 +7956,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dependencies": {
-				"function-bind": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4.0"
-			}
-		},
 		"node_modules/has-bigints": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -6322,16 +7970,33 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
 			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"engines": {
+			"dev": true,
+			"peer": true,
+			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"get-intrinsic": "^1.1.1"
+				"es-define-property": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-proto": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -6341,6 +8006,8 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
 			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -6349,13 +8016,13 @@
 			}
 		},
 		"node_modules/has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"has-symbols": "^1.0.2"
+				"has-symbols": "^1.0.3"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -6365,56 +8032,19 @@
 			}
 		},
 		"node_modules/hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
 			},
 			"engines": {
 				"node": ">=4"
 			}
 		},
-		"node_modules/hash-base/node_modules/readable-stream": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/hash-base/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"peer": true
-		},
 		"node_modules/hash-sum": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
@@ -6433,6 +8063,62 @@
 				"minimalistic-assert": "^1.0.1"
 			}
 		},
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/hast-to-hyperscript": {
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-10.0.3.tgz",
+			"integrity": "sha512-NuBoUStp4fRwmvlfbidlEiRSTk0gSHm+97q4Xn9CJ10HO+Py7nlTuDi6RhM1qLOureukGrCXLG7AAxaGqqyslQ==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"comma-separated-tokens": "^2.0.0",
+				"property-information": "^6.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"style-to-object": "^0.4.1",
+				"web-namespaces": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-to-hyperscript/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="
+		},
+		"node_modules/hast-util-is-element": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+			"integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+			"dependencies": {
+				"@types/hast": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-whitespace": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz",
+			"integrity": "sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
 		"node_modules/he": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -6488,6 +8174,11 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/hot-patcher": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/hot-patcher/-/hot-patcher-2.0.1.tgz",
+			"integrity": "sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q=="
+		},
 		"node_modules/hpack.js": {
 			"version": "2.1.6",
 			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
@@ -6501,10 +8192,17 @@
 				"wbuf": "^1.1.0"
 			}
 		},
+		"node_modules/hpack.js/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"dev": true,
+			"peer": true
+		},
 		"node_modules/hpack.js/node_modules/readable-stream": {
-			"version": "2.3.7",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -6517,6 +8215,13 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"node_modules/hpack.js/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true,
+			"peer": true
+		},
 		"node_modules/hpack.js/node_modules/string_decoder": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -6528,16 +8233,26 @@
 			}
 		},
 		"node_modules/html-entities": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-			"integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+			"integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/mdevils"
+				},
+				{
+					"type": "patreon",
+					"url": "https://patreon.com/mdevils"
+				}
+			],
 			"peer": true
 		},
 		"node_modules/html-tags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-			"integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+			"integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -6548,9 +8263,9 @@
 			}
 		},
 		"node_modules/htmlparser2": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
-			"integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
+			"version": "8.0.2",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+			"integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
 			"dev": true,
 			"funding": [
 				"https://github.com/fb55/htmlparser2?sponsor=1",
@@ -6562,9 +8277,9 @@
 			"peer": true,
 			"dependencies": {
 				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
+				"domhandler": "^5.0.3",
 				"domutils": "^3.0.1",
-				"entities": "^4.3.0"
+				"entities": "^4.4.0"
 			}
 		},
 		"node_modules/http-deceiver": {
@@ -6669,10 +8384,9 @@
 			}
 		},
 		"node_modules/ical.js": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.5.0.tgz",
-			"integrity": "sha512-7ZxMkogUkkaCx810yp0ZGKvq1ZpRgJeornPttpoxe6nYZ3NLesZe1wWMXDdwTkj/b5NtXT+Y16Aakph/ao98ZQ==",
-			"peer": true
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/ical.js/-/ical.js-2.0.1.tgz",
+			"integrity": "sha512-uYYb1CwTXbd9NP/xTtgQZ5ivv6bpUjQu9VM98s3X78L3XRu00uJW5ZtmnLwyxhztpf5fSiRyDpFW7ZNCePlaPw=="
 		},
 		"node_modules/iconv-lite": {
 			"version": "0.4.24",
@@ -6722,9 +8436,9 @@
 			"peer": true
 		},
 		"node_modules/ignore": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -6732,9 +8446,9 @@
 			}
 		},
 		"node_modules/immutable": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-			"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+			"integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
 			"dev": true,
 			"peer": true
 		},
@@ -6766,9 +8480,9 @@
 			}
 		},
 		"node_modules/import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
@@ -6785,6 +8499,75 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/import-local/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/import-local/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/import-local/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/import-local/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/import-local/node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -6796,19 +8579,25 @@
 			}
 		},
 		"node_modules/indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+			"integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"once": "^1.3.0",
 				"wrappy": "1"
@@ -6817,7 +8606,9 @@
 		"node_modules/inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/ini": {
 			"version": "1.3.8",
@@ -6826,15 +8617,20 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/inline-style-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
+			"integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
+		},
 		"node_modules/internal-slot": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+			"integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"get-intrinsic": "^1.1.0",
-				"has": "^1.0.3",
+				"es-errors": "^1.3.0",
+				"hasown": "^2.0.0",
 				"side-channel": "^1.0.4"
 			},
 			"engines": {
@@ -6842,25 +8638,36 @@
 			}
 		},
 		"node_modules/interpret": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-			"integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=10.13.0"
 			}
 		},
 		"node_modules/ipaddr.js": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-			"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+			"integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">= 10"
 			}
 		},
+		"node_modules/is-absolute-url": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
+			"integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==",
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/is-arguments": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -6878,6 +8685,23 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/is-array-buffer": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+			"integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -6902,7 +8726,8 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
 			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"devOptional": true,
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"binary-extensions": "^2.0.0"
 			},
@@ -6932,10 +8757,26 @@
 			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
 			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
 		},
+		"node_modules/is-builtin-module": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"builtin-modules": "^3.3.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/is-callable": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
-			"integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -6946,24 +8787,45 @@
 			}
 		},
 		"node_modules/is-core-module": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-			"integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+			"version": "2.15.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
+			"integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"has": "^1.0.3"
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/is-date-object": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+		"node_modules/is-data-view": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+			"integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"has-tostringtag": "^1.0.0"
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-date-object": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -6992,7 +8854,8 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
 			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"devOptional": true,
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -7027,7 +8890,8 @@
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
 			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"devOptional": true,
+			"dev": true,
+			"peer": true,
 			"dependencies": {
 				"is-extglob": "^2.1.1"
 			},
@@ -7053,9 +8917,9 @@
 			}
 		},
 		"node_modules/is-negative-zero": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-			"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+			"integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -7069,7 +8933,8 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"devOptional": true,
+			"dev": true,
+			"peer": true,
 			"engines": {
 				"node": ">=0.12.0"
 			}
@@ -7090,6 +8955,16 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/is-plain-obj": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -7128,13 +9003,16 @@
 			}
 		},
 		"node_modules/is-shared-array-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+			"integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"call-bind": "^1.0.2"
+				"call-bind": "^1.0.7"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -7169,6 +9047,20 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/is-svg": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-5.1.0.tgz",
+			"integrity": "sha512-uVg5yifaTxHoefNf5Jcx+i9RZe2OBYd/UStp1umx+EERa4xGRa3LLGXjoEph43qUORC0qkafUgrXZ6zzK89yGA==",
+			"dependencies": {
+				"fast-xml-parser": "^4.4.1"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/is-symbol": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
@@ -7186,17 +9078,13 @@
 			}
 		},
 		"node_modules/is-typed-array": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-			"integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+			"integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-abstract": "^1.20.0",
-				"for-each": "^0.3.3",
-				"has-tostringtag": "^1.0.0"
+				"which-typed-array": "^1.1.14"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -7232,9 +9120,9 @@
 			}
 		},
 		"node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
 			"dev": true,
 			"peer": true
 		},
@@ -7259,6 +9147,7 @@
 			"version": "27.5.1",
 			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
 			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"@types/node": "*",
@@ -7273,6 +9162,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">=8"
@@ -7282,6 +9172,7 @@
 			"version": "8.1.1",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
@@ -7293,17 +9184,12 @@
 				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
-		"node_modules/js-sdsl": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-			"integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
@@ -7319,9 +9205,9 @@
 			}
 		},
 		"node_modules/jsdoc-type-pratt-parser": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
-			"integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+			"integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
 			"dev": true,
 			"peer": true,
 			"engines": {
@@ -7332,6 +9218,8 @@
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
 			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true,
+			"peer": true,
 			"bin": {
 				"jsesc": "bin/jsesc"
 			},
@@ -7339,16 +9227,25 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/json-buffer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+			"dev": true,
+			"peer": true
+		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
 			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true,
 			"peer": true
 		},
 		"node_modules/json-stable-stringify-without-jsonify": {
@@ -7359,9 +9256,11 @@
 			"peer": true
 		},
 		"node_modules/json5": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-			"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+			"dev": true,
+			"peer": true,
 			"bin": {
 				"json5": "lib/cli.js"
 			},
@@ -7369,23 +9268,49 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/klona": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-			"integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+		"node_modules/keyv": {
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"json-buffer": "3.0.1"
+			}
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">= 8"
+				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/known-css-properties": {
-			"version": "0.25.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz",
-			"integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==",
+			"version": "0.29.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz",
+			"integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==",
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/launch-editor": {
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.1.tgz",
+			"integrity": "sha512-elBx2l/tp9z99X5H/qev8uyDywVh0VXAwEbjk8kJhnc5grOFkGh7aW6q55me9xnYbss261XtnUrysZ+XvGbhQA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"picocolors": "^1.0.0",
+				"shell-quote": "^1.8.1"
+			}
+		},
+		"node_modules/layerr": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/layerr/-/layerr-3.0.0.tgz",
+			"integrity": "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA=="
+		},
 		"node_modules/levn": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -7407,42 +9332,65 @@
 			"dev": true,
 			"peer": true
 		},
+		"node_modules/linkify-it": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+			"integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+			"peer": true,
+			"dependencies": {
+				"uc.micro": "^2.0.0"
+			}
+		},
 		"node_modules/linkify-string": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-3.0.4.tgz",
-			"integrity": "sha512-OnNqqRjlYXaXipIAbBC8sDXsSumI1ftatzFg141Pw9HEXWjTVLFcMZoKbFupshqWRavtNJ6QHLa+u6AlxxgeRw==",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-4.1.3.tgz",
+			"integrity": "sha512-6dAgx4MiTcvEX87OS5aNpAioO7cSELUXp61k7azOvMYOLSmREx0w4yM1Uf0+O3JLC08YdkUyZhAX+YkasRt/mw==",
 			"peerDependencies": {
-				"linkifyjs": "^3.0.0"
+				"linkifyjs": "^4.0.0"
 			}
 		},
 		"node_modules/linkifyjs": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz",
-			"integrity": "sha512-1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg==",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.3.tgz",
+			"integrity": "sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg==",
 			"peer": true
 		},
 		"node_modules/loader-runner": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
 			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+			"dev": true,
 			"peer": true,
 			"engines": {
 				"node": ">=6.11.5"
 			}
 		},
 		"node_modules/loader-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-			"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
+				"json5": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=8.9.0"
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/loader-utils/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
 		"node_modules/locate-path": {
@@ -7464,12 +9412,16 @@
 		"node_modules/lodash": {
 			"version": "4.17.21",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/lodash.debounce": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+			"dev": true,
+			"peer": true
 		},
 		"node_modules/lodash.get": {
 			"version": "4.4.2",
@@ -7495,33 +9447,31 @@
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/lru-cache": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"pseudomap": "^1.0.2",
-				"yallist": "^2.1.2"
+		"node_modules/longest-streak": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+			"integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+		"node_modules/lru-cache": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"semver": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"yallist": "^3.0.2"
 			}
 		},
+		"node_modules/lunr": {
+			"version": "2.3.9",
+			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
+			"integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
+			"peer": true
+		},
 		"node_modules/map-obj": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
@@ -7535,6 +9485,32 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/markdown-it": {
+			"version": "14.1.0",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+			"integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+			"peer": true,
+			"dependencies": {
+				"argparse": "^2.0.1",
+				"entities": "^4.4.0",
+				"linkify-it": "^5.0.0",
+				"mdurl": "^2.0.0",
+				"punycode.js": "^2.3.1",
+				"uc.micro": "^2.1.0"
+			},
+			"bin": {
+				"markdown-it": "bin/markdown-it.mjs"
+			}
+		},
+		"node_modules/markdown-table": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz",
+			"integrity": "sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/material-colors": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -7573,10237 +9549,1149 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
-		"node_modules/media-typer": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/memfs": {
-			"version": "3.4.7",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-			"integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
-			"dev": true,
-			"peer": true,
+		"node_modules/mdast-util-find-and-replace": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.1.tgz",
+			"integrity": "sha512-SG21kZHGC3XRTSUhtofZkBzZTJNM5ecCi0SK2IMKmSXR8vO3peL+kb1O0z7Zl83jKtutG4k5Wv/W7V3/YHvzPA==",
 			"dependencies": {
-				"fs-monkey": "^1.0.3"
+				"@types/mdast": "^4.0.0",
+				"escape-string-regexp": "^5.0.0",
+				"unist-util-is": "^6.0.0",
+				"unist-util-visit-parents": "^6.0.0"
 			},
-			"engines": {
-				"node": ">= 4.0.0"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
+		"node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+			"integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
 			"engines": {
-				"node": ">=10"
+				"node": ">=12"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/meow/node_modules/type-fest": {
-			"version": "0.18.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=10"
+		"node_modules/mdast-util-from-markdown": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz",
+			"integrity": "sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"@types/unist": "^3.0.0",
+				"decode-named-character-reference": "^1.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-to-string": "^4.0.0",
+				"micromark": "^4.0.0",
+				"micromark-util-decode-numeric-character-reference": "^2.0.0",
+				"micromark-util-decode-string": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"unist-util-stringify-position": "^4.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/merge-source-map": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-			"integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-			"dev": true,
-			"peer": true,
+		"node_modules/mdast-util-gfm": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.0.0.tgz",
+			"integrity": "sha512-dgQEX5Amaq+DuUqf26jJqSK9qgixgd6rYDHAv4aTBuA92cTknZlKpPfa86Z/s8Dj8xsAQpFfBmPUHWJBWqS4Bw==",
 			"dependencies": {
-				"source-map": "^0.6.1"
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-gfm-autolink-literal": "^2.0.0",
+				"mdast-util-gfm-footnote": "^2.0.0",
+				"mdast-util-gfm-strikethrough": "^2.0.0",
+				"mdast-util-gfm-table": "^2.0.0",
+				"mdast-util-gfm-task-list-item": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"peer": true
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 8"
+		"node_modules/mdast-util-gfm-autolink-literal": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz",
+			"integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"ccount": "^2.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-find-and-replace": "^3.0.0",
+				"micromark-util-character": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/methods": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.6"
+		"node_modules/mdast-util-gfm-footnote": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.0.0.tgz",
+			"integrity": "sha512-5jOT2boTSVkMnQ7LTrd6n/18kqwjmuYqo7JUPe+tRCY6O7dAuTFMtTPauYYrMPpox9hlN0uOx/FL8XvEfG9/mQ==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.1.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-			"dev": true,
-			"peer": true,
+		"node_modules/mdast-util-gfm-strikethrough": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz",
+			"integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==",
 			"dependencies": {
-				"braces": "^3.0.2",
-				"picomatch": "^2.3.1"
+				"@types/mdast": "^4.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8.6"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/miller-rabin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-			"dev": true,
-			"peer": true,
+		"node_modules/mdast-util-gfm-table": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz",
+			"integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==",
 			"dependencies": {
-				"bn.js": "^4.0.0",
-				"brorand": "^1.0.1"
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"markdown-table": "^3.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
-			"bin": {
-				"miller-rabin": "bin/miller-rabin"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/miller-rabin/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true,
-			"peer": true
+		"node_modules/mdast-util-gfm-task-list-item": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz",
+			"integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"node_modules/mime": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-			"dev": true,
-			"peer": true,
-			"bin": {
-				"mime": "cli.js"
+		"node_modules/mdast-util-newline-to-break": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-newline-to-break/-/mdast-util-newline-to-break-2.0.0.tgz",
+			"integrity": "sha512-MbgeFca0hLYIEx/2zGsszCSEJJ1JSCdiY5xQxRcLDDGa8EPvlLPupJ4DSajbMPAnC0je8jfb9TiUATnxxrHUog==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-find-and-replace": "^3.0.0"
 			},
-			"engines": {
-				"node": ">=4"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"engines": {
-				"node": ">= 0.6"
+		"node_modules/mdast-util-phrasing": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz",
+			"integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"unist-util-is": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+		"node_modules/mdast-util-to-hast": {
+			"version": "13.2.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
+			"integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==",
 			"dependencies": {
-				"mime-db": "1.52.0"
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"@ungap/structured-clone": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"trim-lines": "^3.0.0",
+				"unist-util-position": "^5.0.0",
+				"unist-util-visit": "^5.0.0",
+				"vfile": "^6.0.0"
 			},
-			"engines": {
-				"node": ">= 0.6"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mimic-fn": {
+		"node_modules/mdast-util-to-markdown": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=6"
+			"resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.0.tgz",
+			"integrity": "sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"@types/unist": "^3.0.0",
+				"longest-streak": "^3.0.0",
+				"mdast-util-phrasing": "^4.0.0",
+				"mdast-util-to-string": "^4.0.0",
+				"micromark-util-decode-string": "^2.0.0",
+				"unist-util-visit": "^5.0.0",
+				"zwitch": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/min-indent": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=4"
+		"node_modules/mdast-util-to-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
+			"integrity": "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/minimalistic-assert": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+		"node_modules/mdn-data": {
+			"version": "2.0.30",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/minimalistic-crypto-utils": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-			"dev": true,
+		"node_modules/mdurl": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+			"integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
 			"peer": true
 		},
-		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
+		"node_modules/media-typer": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+			"dev": true,
+			"peer": true,
 			"engines": {
-				"node": "*"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/minimist": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+		"node_modules/memfs": {
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"dependencies": {
+				"fs-monkey": "^1.0.4"
+			},
+			"engines": {
+				"node": ">= 4.0.0"
+			}
 		},
-		"node_modules/minimist-options": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+		"node_modules/meow": {
+			"version": "10.1.5",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz",
+			"integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
+				"@types/minimist": "^1.2.2",
+				"camelcase-keys": "^7.0.0",
+				"decamelize": "^5.0.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.2",
+				"read-pkg-up": "^8.0.0",
+				"redent": "^4.0.0",
+				"trim-newlines": "^4.0.2",
+				"type-fest": "^1.2.2",
+				"yargs-parser": "^20.2.9"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/minimist-options/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+		"node_modules/meow/node_modules/type-fest": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+			"integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+		"node_modules/merge-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+			"dev": true,
+			"peer": true
 		},
-		"node_modules/multicast-dns": {
-			"version": "7.2.5",
-			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+		"node_modules/merge-source-map": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+			"integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"dns-packet": "^5.2.2",
-				"thunky": "^1.0.2"
-			},
-			"bin": {
-				"multicast-dns": "cli.js"
-			}
-		},
-		"node_modules/nanoid": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-			"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+				"source-map": "^0.6.1"
 			}
 		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
 			"dev": true,
 			"peer": true
 		},
-		"node_modules/negotiator": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">= 0.6"
+				"node": ">= 8"
 			}
 		},
-		"node_modules/neo-async": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-			"peer": true
-		},
-		"node_modules/node-forge": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+		"node_modules/methods": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
 			"dev": true,
 			"peer": true,
 			"engines": {
-				"node": ">= 6.13.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/node-gettext": {
+		"node_modules/micromark": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz",
+			"integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"@types/debug": "^4.0.0",
+				"debug": "^4.0.0",
+				"decode-named-character-reference": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-core-commonmark": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-combine-extensions": "^2.0.0",
+				"micromark-util-decode-numeric-character-reference": "^2.0.0",
+				"micromark-util-encode": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-resolve-all": "^2.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"micromark-util-subtokenize": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
+		},
+		"node_modules/micromark-core-commonmark": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.1.tgz",
+			"integrity": "sha512-CUQyKr1e///ZODyD1U3xit6zXwy1a8q2a1S1HKtIlmgvurrEpaw/Y9y6KSIbF8P59cn/NjzHyO+Q2fAyYLQrAA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"decode-named-character-reference": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-factory-destination": "^2.0.0",
+				"micromark-factory-label": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-factory-title": "^2.0.0",
+				"micromark-factory-whitespace": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-classify-character": "^2.0.0",
+				"micromark-util-html-tag-name": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-resolve-all": "^2.0.0",
+				"micromark-util-subtokenize": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
+		},
+		"node_modules/micromark-extension-gfm": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-3.0.0.tgz",
-			"integrity": "sha512-/VRYibXmVoN6tnSAY2JWhNRhWYJ8Cd844jrZU/DwLVoI4vBI6ceYbd8i42sYZ9uOgDH3S7vslIKOWV/ZrT2YBA==",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz",
+			"integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==",
 			"dependencies": {
-				"lodash.get": "^4.4.2"
+				"micromark-extension-gfm-autolink-literal": "^2.0.0",
+				"micromark-extension-gfm-footnote": "^2.0.0",
+				"micromark-extension-gfm-strikethrough": "^2.0.0",
+				"micromark-extension-gfm-table": "^2.0.0",
+				"micromark-extension-gfm-tagfilter": "^2.0.0",
+				"micromark-extension-gfm-task-list-item": "^2.0.0",
+				"micromark-util-combine-extensions": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/node-polyfill-webpack-plugin": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-2.0.1.tgz",
-			"integrity": "sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-extension-gfm-autolink-literal": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
+			"integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
 			"dependencies": {
-				"assert": "^2.0.0",
-				"browserify-zlib": "^0.2.0",
-				"buffer": "^6.0.3",
-				"console-browserify": "^1.2.0",
-				"constants-browserify": "^1.0.0",
-				"crypto-browserify": "^3.12.0",
-				"domain-browser": "^4.22.0",
-				"events": "^3.3.0",
-				"filter-obj": "^2.0.2",
-				"https-browserify": "^1.0.0",
-				"os-browserify": "^0.3.0",
-				"path-browserify": "^1.0.1",
-				"process": "^0.11.10",
-				"punycode": "^2.1.1",
-				"querystring-es3": "^0.2.1",
-				"readable-stream": "^4.0.0",
-				"stream-browserify": "^3.0.0",
-				"stream-http": "^3.2.0",
-				"string_decoder": "^1.3.0",
-				"timers-browserify": "^2.0.12",
-				"tty-browserify": "^0.0.1",
-				"type-fest": "^2.14.0",
-				"url": "^0.11.0",
-				"util": "^0.12.4",
-				"vm-browserify": "^1.1.2"
-			},
-			"engines": {
-				"node": ">=12"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"peerDependencies": {
-				"webpack": ">=5"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/node-releases": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-			"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
-		},
-		"node_modules/normalize-package-data": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-			"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-extension-gfm-footnote": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
+			"integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
 			"dependencies": {
-				"hosted-git-info": "^4.0.1",
-				"is-core-module": "^2.5.0",
-				"semver": "^7.3.4",
-				"validate-npm-package-license": "^3.0.1"
+				"devlop": "^1.0.0",
+				"micromark-core-commonmark": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=10"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/normalize-package-data/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-extension-gfm-strikethrough": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz",
+			"integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==",
 			"dependencies": {
-				"yallist": "^4.0.0"
+				"devlop": "^1.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-classify-character": "^2.0.0",
+				"micromark-util-resolve-all": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=10"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/normalize-package-data/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-extension-gfm-table": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.0.tgz",
+			"integrity": "sha512-Ub2ncQv+fwD70/l4ou27b4YzfNaCJOvyX4HxXU15m7mpYY+rjuWzsLIPZHJL253Z643RpbcP1oeIJlQ/SKW67g==",
 			"dependencies": {
-				"lru-cache": "^6.0.0"
+				"devlop": "^1.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/normalize-package-data/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"devOptional": true,
-			"engines": {
-				"node": ">=0.10.0"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-extension-gfm-tagfilter": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz",
+			"integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==",
 			"dependencies": {
-				"path-key": "^3.0.0"
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/nth-check": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-extension-gfm-task-list-item": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz",
+			"integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==",
 			"dependencies": {
-				"boolbase": "^1.0.0"
+				"devlop": "^1.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/fb55/nth-check?sponsor=1"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/object-inspect": {
-			"version": "1.12.2",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-			"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-			"dev": true,
-			"peer": true,
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+		"node_modules/micromark-factory-destination": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.0.tgz",
+			"integrity": "sha512-j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-factory-label": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.0.tgz",
+			"integrity": "sha512-RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"devlop": "^1.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"engines": {
-				"node": ">= 0.4"
+		"node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+		"node_modules/micromark-factory-title": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.0.tgz",
+			"integrity": "sha512-jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"has-symbols": "^1.0.3",
-				"object-keys": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/object.values": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-			"integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-factory-whitespace": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.0.tgz",
+			"integrity": "sha512-28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/obuf": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/on-finished": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"ee-first": "1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.8"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/on-headers": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8"
+		"node_modules/micromark-util-chunked": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.0.tgz",
+			"integrity": "sha512-anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+		"node_modules/micromark-util-classify-character": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.0.tgz",
+			"integrity": "sha512-S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"wrappy": "1"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-combine-extensions": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.0.tgz",
+			"integrity": "sha512-vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"mimic-fn": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/open": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-			"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-decode-numeric-character-reference": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.1.tgz",
+			"integrity": "sha512-bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"define-lazy-prop": "^2.0.0",
-				"is-docker": "^2.1.1",
-				"is-wsl": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/os-browserify": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"node_modules/p-retry": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-			"integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-decode-string": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.0.tgz",
+			"integrity": "sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"@types/retry": "0.12.0",
-				"retry": "^0.13.1"
-			},
-			"engines": {
-				"node": ">=8"
+				"decode-named-character-reference": "^1.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-decode-numeric-character-reference": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=6"
-			}
+		"node_modules/micromark-util-encode": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz",
+			"integrity": "sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/pako": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-			"dev": true,
-			"peer": true
+		"node_modules/micromark-util-html-tag-name": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.0.tgz",
+			"integrity": "sha512-xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-normalize-identifier": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.0.tgz",
+			"integrity": "sha512-2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"node_modules/parse-asn1": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-resolve-all": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.0.tgz",
+			"integrity": "sha512-6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-sanitize-uri": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz",
+			"integrity": "sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/parseurl": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/path-browserify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-		},
-		"node_modules/path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-encode": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"node_modules/pbkdf2": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-			"dev": true,
-			"peer": true,
+		"node_modules/micromark-util-subtokenize": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.1.tgz",
+			"integrity": "sha512-jZNtiFl/1aY73yS3UGQkutD0UbhTt68qnRpw2Pifmz5wV9h8gOVsN70v+Lq/f1rKaU/W8pxRe8y8Q9FX1AOe1Q==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"create-hash": "^1.1.2",
-				"create-hmac": "^1.1.4",
-				"ripemd160": "^2.0.1",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
-			},
-			"engines": {
-				"node": ">=0.12"
+				"devlop": "^1.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-		},
-		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"devOptional": true,
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/pify": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"find-up": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/popper.js": {
-			"version": "1.16.1",
-			"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-			"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-			"deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/popperjs"
-			}
-		},
-		"node_modules/postcss": {
-			"version": "8.4.16",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-			"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				}
-			],
-			"dependencies": {
-				"nanoid": "^3.3.4",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
-			}
-		},
-		"node_modules/postcss-html": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.5.0.tgz",
-			"integrity": "sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"htmlparser2": "^8.0.0",
-				"js-tokens": "^8.0.0",
-				"postcss": "^8.4.0",
-				"postcss-safe-parser": "^6.0.0"
-			},
-			"engines": {
-				"node": "^12 || >=14"
-			}
-		},
-		"node_modules/postcss-html/node_modules/js-tokens": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.0.tgz",
-			"integrity": "sha512-PC7MzqInq9OqKyTXfIvQNcjMkODJYC8A17kAaQgeW79yfhqTWSOfjHYQ2mDDcwJ96Iibtwkfh0C7R/OvqPlgVA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/postcss-media-query-parser": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-			"integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.4"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-values": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"icss-utils": "^5.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/postcss-safe-parser": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
-			},
-			"peerDependencies": {
-				"postcss": "^8.3.3"
-			}
-		},
-		"node_modules/postcss-scss": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.5.tgz",
-			"integrity": "sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==",
-			"dev": true,
+		"node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
 			"funding": [
 				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
 				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss-scss"
-				}
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=12.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.3.3"
-			}
-		},
-		"node_modules/postcss-selector-parser": {
-			"version": "6.0.10",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-			"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/prettier": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-			"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-			"dev": true,
-			"optional": true,
-			"peer": true,
-			"bin": {
-				"prettier": "bin-prettier.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
-		"node_modules/process": {
-			"version": "0.11.10",
-			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.6.0"
-			}
-		},
-		"node_modules/process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/proxy-addr": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"forwarded": "0.2.0",
-				"ipaddr.js": "1.9.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/proxy-addr/node_modules/ipaddr.js": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/pseudomap": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/public-encrypt": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"bn.js": "^4.1.0",
-				"browserify-rsa": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"parse-asn1": "^5.0.0",
-				"randombytes": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			}
-		},
-		"node_modules/public-encrypt/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"peer": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/qs": {
-			"version": "6.10.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-			"integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"side-channel": "^1.0.4"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/querystring": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-			"deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.4.x"
-			}
-		},
-		"node_modules/querystring-es3": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.4.x"
-			}
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"peer": true
-		},
-		"node_modules/quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/randombytes": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"peer": true,
-			"dependencies": {
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"node_modules/randomfill": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"randombytes": "^2.0.5",
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"node_modules/range-parser": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"bytes": "3.1.2",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"unpipe": "1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/raw-body/node_modules/bytes": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg-up/node_modules/type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-pkg/node_modules/hosted-git-info": {
-			"version": "2.8.9",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/read-pkg/node_modules/normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
-		"node_modules/read-pkg/node_modules/semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-			"dev": true,
-			"peer": true,
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/read-pkg/node_modules/type-fest": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/readable-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.1.0.tgz",
-			"integrity": "sha512-sVisi3+P2lJ2t0BPbpK629j8wRW06yKGJUcaLAGXPAUhyUxVJm7VsCTit1PFgT4JHUDMrGNR+ZjSKpzGaRF3zw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"abort-controller": "^3.0.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/readdirp": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"devOptional": true,
-			"dependencies": {
-				"picomatch": "^2.2.1"
-			},
-			"engines": {
-				"node": ">=8.10.0"
-			}
-		},
-		"node_modules/rechoir": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-			"integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"resolve": "^1.9.0"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/regenerate": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
-		},
-		"node_modules/regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-			"dependencies": {
-				"regenerate": "^1.4.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-		},
-		"node_modules/regenerator-transform": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-			"integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-			"dependencies": {
-				"@babel/runtime": "^7.8.4"
-			}
-		},
-		"node_modules/regexp.prototype.flags": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-			"integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"functions-have-names": "^1.2.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			}
-		},
-		"node_modules/regexpu-core": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-			"integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
-			"dependencies": {
-				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsgen": "^0.7.1",
-				"regjsparser": "^0.9.1",
-				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/regjsgen": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-			"integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
-		},
-		"node_modules/regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-			"dependencies": {
-				"jsesc": "~0.5.0"
-			},
-			"bin": {
-				"regjsparser": "bin/parser"
-			}
-		},
-		"node_modules/regjsparser/node_modules/jsesc": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			}
-		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/requireindex": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.5"
-			}
-		},
-		"node_modules/requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/resolve": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-			"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-			"dependencies": {
-				"is-core-module": "^2.9.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			},
-			"bin": {
-				"resolve": "bin/resolve"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-cwd/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/retry": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/rimraf/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/ripemd160": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"peer": true,
-			"dependencies": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"node_modules/safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/sass": {
-			"version": "1.54.9",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
-			"integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"chokidar": ">=3.0.0 <4.0.0",
-				"immutable": "^4.0.0",
-				"source-map-js": ">=0.6.2 <2.0.0"
-			},
-			"bin": {
-				"sass": "sass.js"
-			},
-			"engines": {
-				"node": ">=12.0.0"
-			}
-		},
-		"node_modules/sass-loader": {
-			"version": "13.0.2",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
-			"integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"klona": "^2.0.4",
-				"neo-async": "^2.6.2"
-			},
-			"engines": {
-				"node": ">= 14.15.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"fibers": ">= 3.1.0",
-				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
-				"sass": "^1.3.0",
-				"sass-embedded": "*",
-				"webpack": "^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"fibers": {
-					"optional": true
-				},
-				"node-sass": {
-					"optional": true
-				},
-				"sass": {
-					"optional": true
-				},
-				"sass-embedded": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/schema-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.5",
-				"ajv": "^6.12.4",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 8.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/scrollparent": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz",
-			"integrity": "sha512-HSdN78VMvFCSGCkh0oYX/tY4R3P1DW61f8+TeZZ4j2VLgfwvw0bpRSOv4PCVKisktIwbzHCfZsx+rLbbDBqIBA=="
-		},
-		"node_modules/select-hose": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/selfsigned": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"node-forge": "^1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"mime": "1.6.0",
-				"ms": "2.1.3",
-				"on-finished": "2.4.1",
-				"range-parser": "~1.2.1",
-				"statuses": "2.0.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/send/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/send/node_modules/debug/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/send/node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/serialize-javascript": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-			"peer": true,
-			"dependencies": {
-				"randombytes": "^2.1.0"
-			}
-		},
-		"node_modules/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"accepts": "~1.3.4",
-				"batch": "0.6.1",
-				"debug": "2.6.9",
-				"escape-html": "~1.0.3",
-				"http-errors": "~1.6.2",
-				"mime-types": "~2.1.17",
-				"parseurl": "~1.3.2"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/serve-index/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/serve-index/node_modules/depd": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serve-index/node_modules/http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serve-index/node_modules/inherits": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/serve-index/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/serve-index/node_modules/setprototypeof": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/serve-index/node_modules/statuses": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"parseurl": "~1.3.3",
-				"send": "0.18.0"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/setimmediate": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/setprototypeof": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/sha.js": {
-			"version": "2.4.11",
-			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			},
-			"bin": {
-				"sha.js": "bin.js"
-			}
-		},
-		"node_modules/shallow-clone": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"kind-of": "^6.0.2"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shallow-clone/node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/slice-ansi": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"astral-regex": "^2.0.0",
-				"is-fullwidth-code-point": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
-			}
-		},
-		"node_modules/slice-ansi/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/slice-ansi/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/slice-ansi/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/sockjs": {
-			"version": "0.3.24",
-			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"faye-websocket": "^0.11.3",
-				"uuid": "^8.3.2",
-				"websocket-driver": "^0.7.4"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"peer": true,
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"node_modules/spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"node_modules/spdx-license-ids": {
-			"version": "3.0.12",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-			"integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/spdy": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"debug": "^4.1.0",
-				"handle-thing": "^2.0.0",
-				"http-deceiver": "^1.2.7",
-				"select-hose": "^2.0.0",
-				"spdy-transport": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/spdy-transport": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"debug": "^4.1.0",
-				"detect-node": "^2.0.4",
-				"hpack.js": "^2.1.6",
-				"obuf": "^1.1.2",
-				"readable-stream": "^3.0.6",
-				"wbuf": "^1.7.3"
-			}
-		},
-		"node_modules/spdy-transport/node_modules/readable-stream": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/splitpanes": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/splitpanes/-/splitpanes-2.4.1.tgz",
-			"integrity": "sha512-kpEo1WuMXuc6QfdQdO2V/fl/trONlkUKp+pputsLTiW9RMtwEvjb4/aYGm2m3+KAzjmb+zLwr4A4SYZu74+pgQ=="
-		},
-		"node_modules/statuses": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/stream-browserify": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
-			"integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "~2.0.4",
-				"readable-stream": "^3.5.0"
-			}
-		},
-		"node_modules/stream-browserify/node_modules/readable-stream": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/stream-http": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
-			"integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"builtin-status-codes": "^3.0.0",
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"xtend": "^4.0.2"
-			}
-		},
-		"node_modules/stream-http/node_modules/readable-stream": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/string_decoder": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"safe-buffer": "~5.2.0"
-			}
-		},
-		"node_modules/string_decoder/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"peer": true
-		},
-		"node_modules/string-length": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-			"integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-			"dependencies": {
-				"char-regex": "^2.0.0",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12.20"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/string-length/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/string-length/node_modules/strip-ansi": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-			"integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/string.prototype.trimend": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-			"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/string.prototype.trimstart": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-			"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/strip-indent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"min-indent": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/striptags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-			"integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw=="
-		},
-		"node_modules/style-loader": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-			"integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/style-search": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/stylelint": {
-			"version": "14.12.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.12.0.tgz",
-			"integrity": "sha512-9Sa+IsT31PN9zf9q5ZVZNvhT6jMVu6YhpI38g3Akn7vONipGL0GNd9QCblwtJ3ysaoM80P/+9mOcFB1xnytiQQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@csstools/selector-specificity": "^2.0.2",
-				"balanced-match": "^2.0.0",
-				"colord": "^2.9.3",
-				"cosmiconfig": "^7.0.1",
-				"css-functions-list": "^3.1.0",
-				"debug": "^4.3.4",
-				"fast-glob": "^3.2.12",
-				"fastest-levenshtein": "^1.0.16",
-				"file-entry-cache": "^6.0.1",
-				"global-modules": "^2.0.0",
-				"globby": "^11.1.0",
-				"globjoin": "^0.1.4",
-				"html-tags": "^3.2.0",
-				"ignore": "^5.2.0",
-				"import-lazy": "^4.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.25.0",
-				"mathml-tag-names": "^2.1.3",
-				"meow": "^9.0.0",
-				"micromatch": "^4.0.5",
-				"normalize-path": "^3.0.0",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.4.16",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.10",
-				"postcss-value-parser": "^4.2.0",
-				"resolve-from": "^5.0.0",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1",
-				"style-search": "^0.1.0",
-				"supports-hyperlinks": "^2.3.0",
-				"svg-tags": "^1.0.0",
-				"table": "^6.8.0",
-				"v8-compile-cache": "^2.3.0",
-				"write-file-atomic": "^4.0.2"
-			},
-			"bin": {
-				"stylelint": "bin/stylelint.js"
-			},
-			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/stylelint"
-			}
-		},
-		"node_modules/stylelint-config-html": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz",
-			"integrity": "sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": "^12 || >=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ota-meshi"
-			},
-			"peerDependencies": {
-				"postcss-html": "^1.0.0",
-				"stylelint": ">=14.0.0"
-			}
-		},
-		"node_modules/stylelint-config-recommended": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-8.0.0.tgz",
-			"integrity": "sha512-IK6dWvE000+xBv9jbnHOnBq01gt6HGVB2ZTsot+QsMpe82doDQ9hvplxfv4YnpEuUwVGGd9y6nbaAnhrjcxhZQ==",
-			"dev": true,
-			"peer": true,
-			"peerDependencies": {
-				"stylelint": "^14.8.0"
-			}
-		},
-		"node_modules/stylelint-config-recommended-scss": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-7.0.0.tgz",
-			"integrity": "sha512-rGz1J4rMAyJkvoJW4hZasuQBB7y9KIrShb20l9DVEKKZSEi1HAy0vuNlR8HyCKy/jveb/BdaQFcoiYnmx4HoiA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"postcss-scss": "^4.0.2",
-				"stylelint-config-recommended": "^8.0.0",
-				"stylelint-scss": "^4.0.0"
-			},
-			"peerDependencies": {
-				"stylelint": "^14.4.0"
-			}
-		},
-		"node_modules/stylelint-config-recommended-vue": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz",
-			"integrity": "sha512-DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"semver": "^7.3.5",
-				"stylelint-config-html": ">=1.0.0",
-				"stylelint-config-recommended": ">=6.0.0"
-			},
-			"engines": {
-				"node": "^12 || >=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ota-meshi"
-			},
-			"peerDependencies": {
-				"postcss-html": "^1.0.0",
-				"stylelint": ">=14.0.0"
-			}
-		},
-		"node_modules/stylelint-config-recommended-vue/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/stylelint-config-recommended-vue/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/stylelint-config-recommended-vue/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/stylelint-scss": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
-			"integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"lodash": "^4.17.21",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-selector-parser": "^6.0.6",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"peerDependencies": {
-				"stylelint": "^14.5.1"
-			}
-		},
-		"node_modules/stylelint/node_modules/balanced-match": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/stylelint/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/supports-hyperlinks": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-			"integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-hyperlinks/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-hyperlinks/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/svg-tags": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/tabbable": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-			"integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
-		},
-		"node_modules/table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"ajv": "^8.0.1",
-				"lodash.truncate": "^4.4.2",
-				"slice-ansi": "^4.0.0",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/table/node_modules/ajv": {
-			"version": "8.11.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/table/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/tapable": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"peer": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/terser": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-			"integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
-			"peer": true,
-			"dependencies": {
-				"@jridgewell/source-map": "^0.3.2",
-				"acorn": "^8.5.0",
-				"commander": "^2.20.0",
-				"source-map-support": "~0.5.20"
-			},
-			"bin": {
-				"terser": "bin/terser"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.6",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-			"integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
-			"peer": true,
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.14",
-				"jest-worker": "^27.4.5",
-				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.0",
-				"terser": "^5.14.1"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.1.0"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				},
-				"uglify-js": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-			"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-			"peer": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/thunky": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/timers-browserify": {
-			"version": "2.0.12",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"setimmediate": "^1.0.4"
-			},
-			"engines": {
-				"node": ">=0.6.0"
-			}
-		},
-		"node_modules/tinycolor2": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
-			"integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"devOptional": true,
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/toastify-js": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz",
-			"integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ=="
-		},
-		"node_modules/toidentifier": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.6"
-			}
-		},
-		"node_modules/tributejs": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
-			"integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
-		},
-		"node_modules/trim-newlines": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/tsconfig-paths": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-			"integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/json5": "^0.0.29",
-				"json5": "^1.0.1",
-				"minimist": "^1.2.6",
-				"strip-bom": "^3.0.0"
-			}
-		},
-		"node_modules/tsconfig-paths/node_modules/json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"minimist": "^1.2.0"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
-			}
-		},
-		"node_modules/tslib": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-			"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-		},
-		"node_modules/tty-browserify": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-			"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/type-check": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"prelude-ls": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=12.20"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/type-is": {
-			"version": "1.6.18",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.24"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/unbox-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"call-bind": "^1.0.2",
-				"has-bigints": "^1.0.2",
-				"has-symbols": "^1.0.3",
-				"which-boxed-primitive": "^1.0.2"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/unicode-canonical-property-names-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unicode-match-property-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-			"dependencies": {
-				"unicode-canonical-property-names-ecmascript": "^2.0.0",
-				"unicode-property-aliases-ecmascript": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unicode-match-property-value-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unicode-property-aliases-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unpipe": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/update-browserslist-db": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-			"integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				}
-			],
-			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
-			},
-			"bin": {
-				"browserslist-lint": "cli.js"
-			},
-			"peerDependencies": {
-				"browserslist": ">= 4.21.0"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"peer": true,
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
-			}
-		},
-		"node_modules/url/node_modules/punycode": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-			"integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/util": {
-			"version": "0.12.4",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-			"integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"safe-buffer": "^5.1.2",
-				"which-typed-array": "^1.1.2"
-			}
-		},
-		"node_modules/util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.4.0"
-			}
-		},
-		"node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"peer": true,
-			"bin": {
-				"uuid": "dist/bin/uuid"
-			}
-		},
-		"node_modules/v-click-outside": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz",
-			"integrity": "sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/v-tooltip": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.1.3.tgz",
-			"integrity": "sha512-xXngyxLQTOx/yUEy50thb8te7Qo4XU6h4LZB6cvEfVd9mnysUxLEoYwGWDdqR+l69liKsy3IPkdYff3J1gAJ5w==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"lodash": "^4.17.21",
-				"popper.js": "^1.16.1",
-				"vue-resize": "^1.0.1"
-			}
-		},
-		"node_modules/v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
-			}
-		},
-		"node_modules/vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/vm-browserify": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/vue": {
-			"version": "2.7.10",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
-			"integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
-			"dependencies": {
-				"@vue/compiler-sfc": "2.7.10",
-				"csstype": "^3.1.0"
-			}
-		},
-		"node_modules/vue-color": {
-			"version": "2.8.1",
-			"resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz",
-			"integrity": "sha512-BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==",
-			"dependencies": {
-				"clamp": "^1.0.1",
-				"lodash.throttle": "^4.0.0",
-				"material-colors": "^1.0.0",
-				"tinycolor2": "^1.1.2"
-			}
-		},
-		"node_modules/vue-eslint-parser": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
-			"integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"debug": "^4.3.4",
-				"eslint-scope": "^7.1.1",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.3.1",
-				"esquery": "^1.4.0",
-				"lodash": "^4.17.21",
-				"semver": "^7.3.6"
-			},
-			"engines": {
-				"node": "^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			},
-			"peerDependencies": {
-				"eslint": ">=6.0.0"
-			}
-		},
-		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/vue-eslint-parser/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/vue-eslint-parser/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/vue-eslint-parser/node_modules/semver": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-			"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/vue-eslint-parser/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/vue-hot-reload-api": {
-			"version": "2.3.4",
-			"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-			"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/vue-loader": {
-			"version": "15.10.0",
-			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
-			"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@vue/component-compiler-utils": "^3.1.0",
-				"hash-sum": "^1.0.2",
-				"loader-utils": "^1.1.0",
-				"vue-hot-reload-api": "^2.3.0",
-				"vue-style-loader": "^4.1.0"
-			},
-			"peerDependencies": {
-				"css-loader": "*",
-				"webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
-			},
-			"peerDependenciesMeta": {
-				"cache-loader": {
-					"optional": true
-				},
-				"vue-template-compiler": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/vue-loader/node_modules/json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"minimist": "^1.2.0"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
-			}
-		},
-		"node_modules/vue-loader/node_modules/loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=4.0.0"
-			}
-		},
-		"node_modules/vue-material-design-icons": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.1.2.tgz",
-			"integrity": "sha512-nD1qFM2qAkMlVoe23EfNKIeMfYl6YjHZjSty9q0mwc2gXmPmvEhixywJQhM+VF5KVBI1zAkVTNLoUEERPY10pA=="
-		},
-		"node_modules/vue-multiselect": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
-			"integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w==",
-			"engines": {
-				"node": ">= 4.0.0",
-				"npm": ">= 3.0.0"
-			}
-		},
-		"node_modules/vue-observe-visibility": {
-			"version": "0.4.6",
-			"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
-			"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
-		},
-		"node_modules/vue-password-strength-meter": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/vue-password-strength-meter/-/vue-password-strength-meter-1.7.2.tgz",
-			"integrity": "sha512-S17DsEbXciTcI0fKq1PXia7i3COM/AJOT7os8AVyGxglc5ho1EBssE+ogDa5cFh6Rn8pPgqfVCt/KBcNpgPBiA==",
-			"engines": {
-				"node": ">= 4.0.0",
-				"npm": ">= 3.0.0"
-			},
-			"peerDependencies": {
-				"zxcvbn": "^4.4.2"
-			}
-		},
-		"node_modules/vue-resize": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
-			"integrity": "sha512-z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"vue": "^2.6.0"
-			}
-		},
-		"node_modules/vue-style-loader": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-			"integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"hash-sum": "^1.0.2",
-				"loader-utils": "^1.0.2"
-			}
-		},
-		"node_modules/vue-style-loader/node_modules/json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"minimist": "^1.2.0"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
-			}
-		},
-		"node_modules/vue-style-loader/node_modules/loader-utils": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=4.0.0"
-			}
-		},
-		"node_modules/vue-template-compiler": {
-			"version": "2.7.10",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
-			"integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"de-indent": "^1.0.2",
-				"he": "^1.2.0"
-			}
-		},
-		"node_modules/vue-template-es2015-compiler": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-			"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/vue-virtual-scroller": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz",
-			"integrity": "sha512-Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA==",
-			"dependencies": {
-				"scrollparent": "^2.0.1",
-				"vue-observe-visibility": "^0.4.4",
-				"vue-resize": "^0.4.5"
-			},
-			"peerDependencies": {
-				"vue": "^2.6.11"
-			}
-		},
-		"node_modules/vue-virtual-scroller/node_modules/vue-resize": {
-			"version": "0.4.5",
-			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
-			"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
-			"peerDependencies": {
-				"vue": "^2.3.0"
-			}
-		},
-		"node_modules/vue2-datepicker": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.11.0.tgz",
-			"integrity": "sha512-zbMkAjYwDTXZozZtkpSwqxq7nEeBt7zoHL+oQcdjEXAqzJHhmatE6sl6JSr58PMIx2WOK0c6QBXozSqT32iQAQ==",
-			"dependencies": {
-				"date-format-parse": "^0.2.7"
-			},
-			"peerDependencies": {
-				"vue": "^2.5.0"
-			}
-		},
-		"node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-			"peer": true,
-			"dependencies": {
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.1.2"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/wbuf": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"minimalistic-assert": "^1.0.0"
-			}
-		},
-		"node_modules/webpack": {
-			"version": "5.74.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-			"integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
-			"peer": true,
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^0.0.51",
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/wasm-edit": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
-				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.7.6",
-				"browserslist": "^4.14.5",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.10.0",
-				"es-module-lexer": "^0.9.0",
-				"eslint-scope": "5.1.1",
-				"events": "^3.2.0",
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
-				"json-parse-even-better-errors": "^2.3.1",
-				"loader-runner": "^4.2.0",
-				"mime-types": "^2.1.27",
-				"neo-async": "^2.6.2",
-				"schema-utils": "^3.1.0",
-				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.4.0",
-				"webpack-sources": "^3.2.3"
-			},
-			"bin": {
-				"webpack": "bin/webpack.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependenciesMeta": {
-				"webpack-cli": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-cli": {
-			"version": "4.10.0",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
-			"integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@discoveryjs/json-ext": "^0.5.0",
-				"@webpack-cli/configtest": "^1.2.0",
-				"@webpack-cli/info": "^1.5.0",
-				"@webpack-cli/serve": "^1.7.0",
-				"colorette": "^2.0.14",
-				"commander": "^7.0.0",
-				"cross-spawn": "^7.0.3",
-				"fastest-levenshtein": "^1.0.12",
-				"import-local": "^3.0.2",
-				"interpret": "^2.2.0",
-				"rechoir": "^0.7.0",
-				"webpack-merge": "^5.7.3"
-			},
-			"bin": {
-				"webpack-cli": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "4.x.x || 5.x.x"
-			},
-			"peerDependenciesMeta": {
-				"@webpack-cli/generators": {
-					"optional": true
-				},
-				"@webpack-cli/migrate": {
-					"optional": true
-				},
-				"webpack-bundle-analyzer": {
-					"optional": true
-				},
-				"webpack-dev-server": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-cli/node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 10"
-			}
-		},
-		"node_modules/webpack-dev-middleware": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"colorette": "^2.0.10",
-				"memfs": "^3.4.3",
-				"mime-types": "^2.1.31",
-				"range-parser": "^1.2.1",
-				"schema-utils": "^4.0.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.0.0 || ^5.0.0"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/ajv": {
-			"version": "8.11.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.8.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.0.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/webpack-dev-server": {
-			"version": "4.11.1",
-			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-			"integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/bonjour": "^3.5.9",
-				"@types/connect-history-api-fallback": "^1.3.5",
-				"@types/express": "^4.17.13",
-				"@types/serve-index": "^1.9.1",
-				"@types/serve-static": "^1.13.10",
-				"@types/sockjs": "^0.3.33",
-				"@types/ws": "^8.5.1",
-				"ansi-html-community": "^0.0.8",
-				"bonjour-service": "^1.0.11",
-				"chokidar": "^3.5.3",
-				"colorette": "^2.0.10",
-				"compression": "^1.7.4",
-				"connect-history-api-fallback": "^2.0.0",
-				"default-gateway": "^6.0.3",
-				"express": "^4.17.3",
-				"graceful-fs": "^4.2.6",
-				"html-entities": "^2.3.2",
-				"http-proxy-middleware": "^2.0.3",
-				"ipaddr.js": "^2.0.1",
-				"open": "^8.0.9",
-				"p-retry": "^4.5.0",
-				"rimraf": "^3.0.2",
-				"schema-utils": "^4.0.0",
-				"selfsigned": "^2.1.1",
-				"serve-index": "^1.9.1",
-				"sockjs": "^0.3.24",
-				"spdy": "^4.0.2",
-				"webpack-dev-middleware": "^5.3.1",
-				"ws": "^8.4.2"
-			},
-			"bin": {
-				"webpack-dev-server": "bin/webpack-dev-server.js"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.37.0 || ^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"webpack-cli": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/ajv": {
-			"version": "8.11.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/webpack-dev-server/node_modules/schema-utils": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.8.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.0.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/webpack-merge": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-			"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"clone-deep": "^4.0.1",
-				"wildcard": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/webpack-sources": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-			"peer": true,
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/webpack/node_modules/schema-utils": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-			"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-			"peer": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/websocket-driver": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"http-parser-js": ">=0.5.1",
-				"safe-buffer": ">=5.1.0",
-				"websocket-extensions": ">=0.1.1"
-			},
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/websocket-extensions": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/which-boxed-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"is-bigint": "^1.0.1",
-				"is-boolean-object": "^1.1.0",
-				"is-number-object": "^1.0.4",
-				"is-string": "^1.0.5",
-				"is-symbol": "^1.0.3"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/which-typed-array": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-			"integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-abstract": "^1.20.0",
-				"for-each": "^0.3.3",
-				"has-tostringtag": "^1.0.0",
-				"is-typed-array": "^1.1.9"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/wildcard": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-		},
-		"node_modules/write-file-atomic": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.7"
-			},
-			"engines": {
-				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-			}
-		},
-		"node_modules/ws": {
-			"version": "8.8.1",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-			"integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": "^5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/xml-name-validator": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.4"
-			}
-		},
-		"node_modules/yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-			"dev": true,
-			"peer": true
-		},
-		"node_modules/yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "20.2.9",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/zxcvbn": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-			"integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==",
-			"peer": true
-		}
-	},
-	"dependencies": {
-		"@ampproject/remapping": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-			"integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.1.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			}
-		},
-		"@babel/cli": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.18.10.tgz",
-			"integrity": "sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw==",
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.8",
-				"@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3",
-				"chokidar": "^3.4.0",
-				"commander": "^4.0.1",
-				"convert-source-map": "^1.1.0",
-				"fs-readdir-recursive": "^1.1.0",
-				"glob": "^7.2.0",
-				"make-dir": "^2.1.0",
-				"slash": "^2.0.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-					"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-					"requires": {
-						"pify": "^4.0.1",
-						"semver": "^5.6.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-				},
-				"slash": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-					"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
-				}
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-			"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-			"requires": {
-				"@babel/highlight": "^7.18.6"
-			}
-		},
-		"@babel/compat-data": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
-			"integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="
-		},
-		"@babel/core": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz",
-			"integrity": "sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==",
-			"requires": {
-				"@ampproject/remapping": "^2.1.0",
-				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.0",
-				"@babel/helper-compilation-targets": "^7.19.1",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helpers": "^7.19.0",
-				"@babel/parser": "^7.19.1",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.1",
-				"semver": "^6.3.0"
-			}
-		},
-		"@babel/eslint-parser": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-			"integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
-			}
-		},
-		"@babel/generator": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
-			"integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
-			"requires": {
-				"@babel/types": "^7.19.0",
-				"@jridgewell/gen-mapping": "^0.3.2",
-				"jsesc": "^2.5.1"
-			},
-			"dependencies": {
-				"@jridgewell/gen-mapping": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-					"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-					"requires": {
-						"@jridgewell/set-array": "^1.0.1",
-						"@jridgewell/sourcemap-codec": "^1.4.10",
-						"@jridgewell/trace-mapping": "^0.3.9"
-					}
-				}
-			}
-		},
-		"@babel/helper-annotate-as-pure": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-			"integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-			"integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
-			"requires": {
-				"@babel/helper-explode-assignable-expression": "^7.18.6",
-				"@babel/types": "^7.18.9"
-			}
-		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
-			"integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
-			"requires": {
-				"@babel/compat-data": "^7.19.1",
-				"@babel/helper-validator-option": "^7.18.6",
-				"browserslist": "^4.21.3",
-				"semver": "^6.3.0"
-			}
-		},
-		"@babel/helper-create-class-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.9",
-				"@babel/helper-split-export-declaration": "^7.18.6"
-			}
-		},
-		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"regexpu-core": "^5.1.0"
-			}
-		},
-		"@babel/helper-define-polyfill-provider": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-			"integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.17.7",
-				"@babel/helper-plugin-utils": "^7.16.7",
-				"debug": "^4.1.1",
-				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2",
-				"semver": "^6.1.2"
-			}
-		},
-		"@babel/helper-environment-visitor": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-			"integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
-		},
-		"@babel/helper-explode-assignable-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-			"integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-			"integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/types": "^7.19.0"
-			}
-		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-			"integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-			"integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
-			"requires": {
-				"@babel/types": "^7.18.9"
-			}
-		},
-		"@babel/helper-module-imports": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-			"integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-			"integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
-			}
-		},
-		"@babel/helper-optimise-call-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-			"integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-			"integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
-		},
-		"@babel/helper-remap-async-to-generator": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-			"integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-wrap-function": "^7.18.9",
-				"@babel/types": "^7.18.9"
-			}
-		},
-		"@babel/helper-replace-supers": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-			"integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0"
-			}
-		},
-		"@babel/helper-simple-access": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-			"integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-			"integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
-			"requires": {
-				"@babel/types": "^7.18.9"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-			"integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-			"requires": {
-				"@babel/types": "^7.18.6"
-			}
-		},
-		"@babel/helper-string-parser": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
-			"integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
-		},
-		"@babel/helper-validator-option": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-			"integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
-		},
-		"@babel/helper-wrap-function": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-			"integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
-			"requires": {
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
-			}
-		},
-		"@babel/helpers": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-			"integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
-			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-			"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			}
-		},
-		"@babel/parser": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
-			"integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
-		},
-		"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-			"integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-				"@babel/plugin-proposal-optional-chaining": "^7.18.9"
-			}
-		},
-		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-			"integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-remap-async-to-generator": "^7.18.9",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
-			}
-		},
-		"@babel/plugin-proposal-class-properties": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-			"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-proposal-class-static-block": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-			"integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5"
-			}
-		},
-		"@babel/plugin-proposal-dynamic-import": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-			"integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
-			}
-		},
-		"@babel/plugin-proposal-export-namespace-from": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-			"integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-			}
-		},
-		"@babel/plugin-proposal-json-strings": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-			"integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-json-strings": "^7.8.3"
-			}
-		},
-		"@babel/plugin-proposal-logical-assignment-operators": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-			"integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-			}
-		},
-		"@babel/plugin-proposal-nullish-coalescing-operator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-			"integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-			}
-		},
-		"@babel/plugin-proposal-numeric-separator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-			"integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
-			}
-		},
-		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
-			"integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
-			"requires": {
-				"@babel/compat-data": "^7.18.8",
-				"@babel/helper-compilation-targets": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.18.8"
-			}
-		},
-		"@babel/plugin-proposal-optional-catch-binding": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-			"integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-			}
-		},
-		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
-			}
-		},
-		"@babel/plugin-proposal-private-methods": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-			"integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-proposal-private-property-in-object": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-			"integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-			}
-		},
-		"@babel/plugin-proposal-unicode-property-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-			"integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			}
-		},
-		"@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-dynamic-import": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-export-namespace-from": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.3"
-			}
-		},
-		"@babel/plugin-syntax-import-assertions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
-			"integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-private-property-in-object": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-typescript": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
-			"integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-			"integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-			"integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
-			"requires": {
-				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-remap-async-to-generator": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-			"integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-block-scoping": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz",
-			"integrity": "sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-classes": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-			"integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-compilation-targets": "^7.19.0",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-replace-supers": "^7.18.9",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"globals": "^11.1.0"
-			}
-		},
-		"@babel/plugin-transform-computed-properties": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-			"integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-destructuring": {
-			"version": "7.18.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
-			"integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-dotall-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-			"integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-duplicate-keys": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-			"integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-			"integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
-			"requires": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-for-of": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-			"integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-function-name": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-			"integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.18.9",
-				"@babel/helper-function-name": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-literals": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-			"integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-member-expression-literals": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-			"integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-modules-amd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
-			"integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
-			}
-		},
-		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
-			"integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
-			}
-		},
-		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
-			"integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
-			"requires": {
-				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
-			}
-		},
-		"@babel/plugin-transform-modules-umd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-			"integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-			"integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0"
-			}
-		},
-		"@babel/plugin-transform-new-target": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-			"integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-object-super": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-			"integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-parameters": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-			"integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-property-literals": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-			"integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-regenerator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-			"integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"regenerator-transform": "^0.15.0"
-			}
-		},
-		"@babel/plugin-transform-reserved-words": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-			"integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-shorthand-properties": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-			"integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-spread": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-			"integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-sticky-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-			"integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-template-literals": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-			"integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-typeof-symbol": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-			"integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-typescript": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz",
-			"integrity": "sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/plugin-syntax-typescript": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-unicode-escapes": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-			"integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
-			}
-		},
-		"@babel/plugin-transform-unicode-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-			"integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/polyfill": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
-			"integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
-			"requires": {
-				"core-js": "^2.6.5",
-				"regenerator-runtime": "^0.13.4"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "2.6.12",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-					"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-				}
-			}
-		},
-		"@babel/preset-env": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
-			"integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
-			"requires": {
-				"@babel/compat-data": "^7.19.1",
-				"@babel/helper-compilation-targets": "^7.19.1",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-validator-option": "^7.18.6",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-				"@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-				"@babel/plugin-proposal-class-properties": "^7.18.6",
-				"@babel/plugin-proposal-class-static-block": "^7.18.6",
-				"@babel/plugin-proposal-dynamic-import": "^7.18.6",
-				"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-				"@babel/plugin-proposal-json-strings": "^7.18.6",
-				"@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-				"@babel/plugin-proposal-numeric-separator": "^7.18.6",
-				"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
-				"@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-				"@babel/plugin-proposal-optional-chaining": "^7.18.9",
-				"@babel/plugin-proposal-private-methods": "^7.18.6",
-				"@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.18.6",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5",
-				"@babel/plugin-transform-arrow-functions": "^7.18.6",
-				"@babel/plugin-transform-async-to-generator": "^7.18.6",
-				"@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-				"@babel/plugin-transform-block-scoping": "^7.18.9",
-				"@babel/plugin-transform-classes": "^7.19.0",
-				"@babel/plugin-transform-computed-properties": "^7.18.9",
-				"@babel/plugin-transform-destructuring": "^7.18.13",
-				"@babel/plugin-transform-dotall-regex": "^7.18.6",
-				"@babel/plugin-transform-duplicate-keys": "^7.18.9",
-				"@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-				"@babel/plugin-transform-for-of": "^7.18.8",
-				"@babel/plugin-transform-function-name": "^7.18.9",
-				"@babel/plugin-transform-literals": "^7.18.9",
-				"@babel/plugin-transform-member-expression-literals": "^7.18.6",
-				"@babel/plugin-transform-modules-amd": "^7.18.6",
-				"@babel/plugin-transform-modules-commonjs": "^7.18.6",
-				"@babel/plugin-transform-modules-systemjs": "^7.19.0",
-				"@babel/plugin-transform-modules-umd": "^7.18.6",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-				"@babel/plugin-transform-new-target": "^7.18.6",
-				"@babel/plugin-transform-object-super": "^7.18.6",
-				"@babel/plugin-transform-parameters": "^7.18.8",
-				"@babel/plugin-transform-property-literals": "^7.18.6",
-				"@babel/plugin-transform-regenerator": "^7.18.6",
-				"@babel/plugin-transform-reserved-words": "^7.18.6",
-				"@babel/plugin-transform-shorthand-properties": "^7.18.6",
-				"@babel/plugin-transform-spread": "^7.19.0",
-				"@babel/plugin-transform-sticky-regex": "^7.18.6",
-				"@babel/plugin-transform-template-literals": "^7.18.9",
-				"@babel/plugin-transform-typeof-symbol": "^7.18.9",
-				"@babel/plugin-transform-unicode-escapes": "^7.18.10",
-				"@babel/plugin-transform-unicode-regex": "^7.18.6",
-				"@babel/preset-modules": "^0.1.5",
-				"@babel/types": "^7.19.0",
-				"babel-plugin-polyfill-corejs2": "^0.3.3",
-				"babel-plugin-polyfill-corejs3": "^0.6.0",
-				"babel-plugin-polyfill-regenerator": "^0.4.1",
-				"core-js-compat": "^3.25.1",
-				"semver": "^6.3.0"
-			}
-		},
-		"@babel/preset-modules": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-			"integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-				"@babel/plugin-transform-dotall-regex": "^7.4.4",
-				"@babel/types": "^7.4.4",
-				"esutils": "^2.0.2"
-			}
-		},
-		"@babel/preset-typescript": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
-			"integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-validator-option": "^7.18.6",
-				"@babel/plugin-transform-typescript": "^7.18.6"
-			}
-		},
-		"@babel/runtime": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
-			"integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-			"requires": {
-				"regenerator-runtime": "^0.13.4"
-			}
-		},
-		"@babel/template": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-			"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
-			"requires": {
-				"@babel/code-frame": "^7.18.6",
-				"@babel/parser": "^7.18.10",
-				"@babel/types": "^7.18.10"
-			}
-		},
-		"@babel/traverse": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
-			"integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
-			"requires": {
-				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.0",
-				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/parser": "^7.19.1",
-				"@babel/types": "^7.19.0",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			}
-		},
-		"@babel/types": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
-			"integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
-			"requires": {
-				"@babel/helper-string-parser": "^7.18.10",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"to-fast-properties": "^2.0.0"
-			}
-		},
-		"@csstools/selector-specificity": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-			"integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"@discoveryjs/json-ext": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-			"dev": true,
-			"peer": true
-		},
-		"@es-joy/jsdoccomment": {
-			"version": "0.31.0",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz",
-			"integrity": "sha512-tc1/iuQcnaiSIUVad72PBierDFpsxdUHtEF/OrfqvM1CBAsIoMP51j52jTMb3dXriwhieTo289InzZj72jL3EQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"comment-parser": "1.3.1",
-				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~3.1.0"
-			}
-		},
-		"@eslint/eslintrc": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-			"integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.4.0",
-				"globals": "^13.15.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.1.2",
-				"strip-json-comments": "^3.1.1"
-			},
-			"dependencies": {
-				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"type-fest": "^0.20.2"
-					}
-				},
-				"type-fest": {
-					"version": "0.20.2",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-					"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"@hcaptcha/vue-hcaptcha": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz",
-			"integrity": "sha512-aUSWyhRucgFeBOBUC3nWBZuE0TkeoSH5QIVFwiTLnNsYpIaxD1tKBbI5Tdoy0TdpkuXKsB4KqyElbvoMZ9reGw==",
-			"requires": {}
-		},
-		"@humanwhocodes/config-array": {
-			"version": "0.10.4",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
-			"integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			}
-		},
-		"@humanwhocodes/gitignore-to-minimatch": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-			"integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-			"dev": true,
-			"peer": true
-		},
-		"@humanwhocodes/module-importer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-			"dev": true,
-			"peer": true
-		},
-		"@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true,
-			"peer": true
-		},
-		"@jridgewell/gen-mapping": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-			"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-			"requires": {
-				"@jridgewell/set-array": "^1.0.0",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
-		},
-		"@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-		},
-		"@jridgewell/source-map": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-			"integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-			"peer": true,
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			},
-			"dependencies": {
-				"@jridgewell/gen-mapping": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-					"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-					"peer": true,
-					"requires": {
-						"@jridgewell/set-array": "^1.0.1",
-						"@jridgewell/sourcemap-codec": "^1.4.10",
-						"@jridgewell/trace-mapping": "^0.3.9"
-					}
-				}
-			}
-		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
-			"integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
-			"requires": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
-		"@leichtgewicht/ip-codec": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-			"dev": true,
-			"peer": true
-		},
-		"@nextcloud/auth": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
-			"integrity": "sha512-v8K8tvjkOsGt1+gKydVeMiEwWLXlfPWSptXnMqP21Xd6pFAQxNuNNCY679XKU4MNaKzpZqLstCCxv/KrjeQv8A==",
-			"requires": {
-				"@nextcloud/event-bus": "^3.0.0"
-			}
-		},
-		"@nextcloud/axios": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-2.1.0.tgz",
-			"integrity": "sha512-fUwRQeYfdX0sP+DJnQiqlJfB7ngNHWu6Gbi0nYapkB7IFiLECeL2SWzDOFj+M04j4ApsblEMBqGOJ38WEgdeyA==",
-			"requires": {
-				"@nextcloud/auth": "^2.0.0",
-				"@nextcloud/router": "^2.0.0",
-				"axios": "^0.27.2",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@nextcloud/babel-config": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/babel-config/-/babel-config-1.0.0.tgz",
-			"integrity": "sha512-olz7sqPD7xMDP2KcYwODtitH37faR/C5jKX1oxXzdDf+s1FRy6OQTC5ZqZR2LHZA6jTUvmwM/xWBPoEB/HPFRw==",
-			"dev": true,
-			"requires": {}
-		},
-		"@nextcloud/browser-storage": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.1.1.tgz",
-			"integrity": "sha512-bWzs/A44rEK8b3CMOFw0ZhsenagrWdsB902LOEwmlMCcFysiFgWiOPbF4/0/ODlOYjvPrO02wf6RigWtb8P+gA==",
-			"requires": {
-				"core-js": "3.6.1"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "3.6.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz",
-					"integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="
-				}
-			}
-		},
-		"@nextcloud/browserslist-config": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-2.3.0.tgz",
-			"integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg==",
-			"dev": true
-		},
-		"@nextcloud/calendar-js": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-3.1.0.tgz",
-			"integrity": "sha512-tGjKfUKigyTFg3AUhW57MCMwP26rWv2EwU8QUYCJntHs8a1qzltgSJ5t3+zMsp2oDct3tHz04Q6vPR+O4T1n+Q==",
-			"requires": {}
-		},
-		"@nextcloud/capabilities": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz",
-			"integrity": "sha512-xsmwPPUJ8NN7YfLcq0gpDTibeb9lMBvY/bffMFnHcZi8hMGOouPiEY+CWAgJ5I9W6I2vNeacHUuTanEN5Ncb2A==",
-			"requires": {
-				"@nextcloud/initial-state": "^1.1.2",
-				"core-js": "^3.6.4"
-			},
-			"dependencies": {
-				"@nextcloud/initial-state": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.2.1.tgz",
-					"integrity": "sha512-2TH2DzJBolYHWfbSovTWkByAIg0gdsyuVfZpf5APnJu/9PixXKbnrVFnaEdxjeP262Gok7ARMFFQeSiuzKRQeQ==",
-					"requires": {
-						"core-js": "^3.6.4"
-					}
-				}
-			}
-		},
-		"@nextcloud/dialogs": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.2.0.tgz",
-			"integrity": "sha512-notaHF8LXPJINBbILCbRe+dgXnJPe7NQTIrN1vwfaGUSG9GUfEf+v367yyg2brCgV6ulE/HmNhYjTQwW5AqSJA==",
-			"requires": {
-				"@nextcloud/l10n": "^1.3.0",
-				"@nextcloud/typings": "^1.0.0",
-				"core-js": "^3.6.4",
-				"toastify-js": "^1.12.0"
-			}
-		},
-		"@nextcloud/eslint-config": {
-			"version": "8.1.2",
-			"resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.1.2.tgz",
-			"integrity": "sha512-uyYBSGQrbq7VZaqv0A4RBH5c80go07Xaebc00RxPhpG7IHkry92gTYlY8YarnlEFWaeAnXGPh3OhfXGDC40EyQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"@nextcloud/eslint-plugin": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/eslint-plugin/-/eslint-plugin-2.0.0.tgz",
-			"integrity": "sha512-j5WXTDTprr/cDilVJtC1mnrpkvD6jlEMShs72V5plllatHjO7kpZHzUfCX3dSvGwYc2ACa0XH+FbkPoZQ3+eWQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"requireindex": "^1.2.0"
-			}
-		},
-		"@nextcloud/event-bus": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-3.0.2.tgz",
-			"integrity": "sha512-svXCZa4UkoZKsBiGzTi0cVcbPFUOhCm7pMKjGumRwBvHywX+8by478IQ8Grw75PFHxajMJZ0KrOTTM8WnzzEAw==",
-			"requires": {
-				"semver": "^7.3.7"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-				}
-			}
-		},
-		"@nextcloud/initial-state": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.0.0.tgz",
-			"integrity": "sha512-xmNP30v/RnkJ2z1HcuEo7YfcLJJa+FdWTwgNldXHOlMeMbl/ESpsGkWL2sULrhYurz64L0JpfwEdi/cHcmyuZQ=="
-		},
-		"@nextcloud/l10n": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz",
-			"integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==",
-			"requires": {
-				"core-js": "^3.6.4",
-				"node-gettext": "^3.0.0"
-			}
-		},
-		"@nextcloud/logger": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.3.0.tgz",
-			"integrity": "sha512-Oa8DLJLuLY+MdpCc/xK+bbGsyiIX+ExmNnP2wsahOebVUuM7fSRA1oSLEsSBWT2IQIvjLvCo/xMw3q4vmTeVFQ==",
-			"requires": {
-				"@nextcloud/auth": "^1.2.2",
-				"core-js": "^3.6.4"
-			},
-			"dependencies": {
-				"@nextcloud/auth": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
-					"integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
-					"requires": {
-						"@nextcloud/event-bus": "^1.1.3",
-						"@nextcloud/typings": "^0.2.2",
-						"core-js": "^3.6.4"
-					}
-				},
-				"@nextcloud/event-bus": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
-					"integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
-					"requires": {
-						"@types/semver": "^7.3.5",
-						"core-js": "^3.11.2",
-						"semver": "^7.3.5"
-					}
-				},
-				"@nextcloud/typings": {
-					"version": "0.2.4",
-					"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.4.tgz",
-					"integrity": "sha512-49M8XUDQH27VIQE+13KrqSOYcyOsDUk6Yfw17jbBVtXFoDJ3YBSYYq8YaKeAM3Lz2JVbEpqQW9suAT+EyYSb6g==",
-					"requires": {
-						"@types/jquery": "2.0.54"
-					}
-				},
-				"@types/jquery": {
-					"version": "2.0.54",
-					"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.54.tgz",
-					"integrity": "sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg=="
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-				}
-			}
-		},
-		"@nextcloud/router": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
-			"integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
-			"requires": {
-				"core-js": "^3.6.4"
-			}
-		},
-		"@nextcloud/stylelint-config": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.2.0.tgz",
-			"integrity": "sha512-kH3pGAofdnDZJCTyYr2hc9Y63KVVrJ3845j3DOKJNW4uUVybiRZkMccwuJvT1mJ8Gn7lgETh4vceDXuwnJlJ3Q==",
-			"dev": true,
-			"requires": {}
-		},
-		"@nextcloud/typings": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.4.3.tgz",
-			"integrity": "sha512-9Yc40alExKpHwNKdpZzULwb+Fz5HgEFKZvywXYK5QbR96Z7V5iI3Greu8MhmZErfUJ6zES7PHpz3S3jM1kdnUw==",
-			"requires": {
-				"@types/jquery": "2.0.60"
-			}
-		},
-		"@nextcloud/vue": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.4.0.tgz",
-			"integrity": "sha512-YybOMuStBKtCwbssxMNEd0A8k/Qr5+zm9vnSOaLaMxeB8iaUU+PgBNiYGo8O24UJjSS6FqFwg02V4XzI1Sd6Lw==",
-			"requires": {
-				"@nextcloud/auth": "^1.2.3",
-				"@nextcloud/axios": "^1.3.2",
-				"@nextcloud/browser-storage": "^0.1.1",
-				"@nextcloud/calendar-js": "^3.0.0",
-				"@nextcloud/capabilities": "^1.0.2",
-				"@nextcloud/dialogs": "^3.0.0",
-				"@nextcloud/event-bus": "^2.0.0",
-				"@nextcloud/l10n": "^1.2.3",
-				"@nextcloud/logger": "^2.0.0",
-				"@nextcloud/router": "^2.0.0",
-				"debounce": "1.2.1",
-				"emoji-mart-vue-fast": "^10.2.1",
-				"escape-html": "^1.0.3",
-				"focus-trap": "^6.8.1",
-				"hammerjs": "^2.0.8",
-				"linkify-string": "^3.0.2",
-				"md5": "^2.2.1",
-				"splitpanes": "^2.3.6",
-				"string-length": "^5.0.0",
-				"striptags": "^3.1.1",
-				"style-loader": "^3.3.1",
-				"tributejs": "^5.1.3",
-				"v-click-outside": "^3.0.1",
-				"v-tooltip": "^2.0.3",
-				"vue": "^2.6.14",
-				"vue-color": "^2.7.1",
-				"vue-material-design-icons": "^5.0.0",
-				"vue-multiselect": "^2.1.6",
-				"vue2-datepicker": "^3.6.3"
-			},
-			"dependencies": {
-				"@nextcloud/auth": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
-					"integrity": "sha512-GfwRM9W7hat4psNdAt74UHEV+drEXQ53klCVp6JpON66ZLPeK5eJ1LQuiQDkpUxZpqNeaumXjiB98h5cug/uQw==",
-					"requires": {
-						"@nextcloud/event-bus": "^1.1.3",
-						"@nextcloud/typings": "^0.2.2",
-						"core-js": "^3.6.4"
-					},
-					"dependencies": {
-						"@nextcloud/event-bus": {
-							"version": "1.3.0",
-							"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.3.0.tgz",
-							"integrity": "sha512-+U5MnCvfnNWvf0lvdqJg8F+Nm8wN+s9ayuBjtiEQxTAcootv7lOnlMgfreqF3l2T0Wet2uZh4JbFVUWf8l3w7g==",
-							"requires": {
-								"@types/semver": "^7.3.5",
-								"core-js": "^3.11.2",
-								"semver": "^7.3.5"
-							}
-						}
-					}
-				},
-				"@nextcloud/axios": {
-					"version": "1.8.0",
-					"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-1.8.0.tgz",
-					"integrity": "sha512-ni29rhouV6aWIeVG5aSv89fS5UIBN3ZADhFsbFKLO+xKuukDQlIwlWWViS3ZuPW6TR5FlK2dF84xnYnfKnHa5w==",
-					"requires": {
-						"@babel/cli": "^7.8.4",
-						"@babel/core": "^7.9.0",
-						"@babel/preset-env": "^7.9.0",
-						"@babel/preset-typescript": "^7.9.0",
-						"@nextcloud/auth": "^1.2.2",
-						"axios": "^0.24.0",
-						"core-js": "^3.6.4"
-					}
-				},
-				"@nextcloud/event-bus": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-2.1.1.tgz",
-					"integrity": "sha512-YEui6N+23uyjBSIUZhf8rEjG9vol7UGgxcgxMddEbO0HS7M/sh1cocRqtn+ZVi/yPybeToGmt68SDPCgwHQHKw==",
-					"requires": {
-						"@types/semver": "^7.1.0",
-						"core-js": "^3.6.2",
-						"semver": "^7.3.2"
-					}
-				},
-				"@nextcloud/typings": {
-					"version": "0.2.4",
-					"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.4.tgz",
-					"integrity": "sha512-49M8XUDQH27VIQE+13KrqSOYcyOsDUk6Yfw17jbBVtXFoDJ3YBSYYq8YaKeAM3Lz2JVbEpqQW9suAT+EyYSb6g==",
-					"requires": {
-						"@types/jquery": "2.0.54"
-					}
-				},
-				"@types/jquery": {
-					"version": "2.0.54",
-					"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.54.tgz",
-					"integrity": "sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg=="
-				},
-				"axios": {
-					"version": "0.24.0",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-					"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
-					"requires": {
-						"follow-redirects": "^1.14.4"
-					}
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-				}
-			}
-		},
-		"@nextcloud/webpack-vue-config": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.3.0.tgz",
-			"integrity": "sha512-qkrFUakFS6vGQlM1oXHh2+JQhmACZtSt7bt5W3iwpCirrVarBdyxG0ZRw1PK4jOVTdAEju0fYlIoieo7X+GLIg==",
-			"dev": true,
-			"requires": {}
-		},
-		"@nicolo-ribaudo/chokidar-2": {
-			"version": "2.1.8-no-fsevents.3",
-			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
-			"integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
-			"optional": true
-		},
-		"@nicolo-ribaudo/eslint-scope-5-internals": {
-			"version": "5.1.1-v1",
-			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-			"integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"eslint-scope": "5.1.1"
-			}
-		},
-		"@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true,
-			"peer": true
-		},
-		"@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
-			}
-		},
-		"@types/body-parser": {
-			"version": "1.19.2",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/connect": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/bonjour": {
-			"version": "3.5.10",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-			"integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/connect-history-api-fallback": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-			"integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/express-serve-static-core": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/eslint": {
-			"version": "8.4.6",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
-			"integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
-			"peer": true,
-			"requires": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-			"peer": true,
-			"requires": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
-			}
-		},
-		"@types/estree": {
-			"version": "0.0.51",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-			"peer": true
-		},
-		"@types/express": {
-			"version": "4.17.14",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-			"integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/body-parser": "*",
-				"@types/express-serve-static-core": "^4.17.18",
-				"@types/qs": "*",
-				"@types/serve-static": "*"
-			}
-		},
-		"@types/express-serve-static-core": {
-			"version": "4.17.31",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-			"integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/qs": "*",
-				"@types/range-parser": "*"
-			}
-		},
-		"@types/http-proxy": {
-			"version": "1.17.9",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-			"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/jquery": {
-			"version": "2.0.60",
-			"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.60.tgz",
-			"integrity": "sha512-izi6OBEVrAwaHiqWITjOPBbVtcKZKAXTocJqPZsAKA2lvmbpFEyPSAxgcqmisbiMYj9EvrooUEPLHQeQqVMWAg=="
-		},
-		"@types/json-schema": {
-			"version": "7.0.11",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-			"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-			"peer": true
-		},
-		"@types/json5": {
-			"version": "0.0.29",
-			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/mime": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-			"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/minimist": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-			"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/node": {
-			"version": "18.7.18",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
-			"integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==",
-			"peer": true
-		},
-		"@types/normalize-package-data": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/qs": {
-			"version": "6.9.7",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/range-parser": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/retry": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-			"dev": true,
-			"peer": true
-		},
-		"@types/semver": {
-			"version": "7.3.12",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz",
-			"integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A=="
-		},
-		"@types/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/express": "*"
-			}
-		},
-		"@types/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/mime": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/sockjs": {
-			"version": "0.3.33",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/ws": {
-			"version": "8.5.3",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-			"integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@vue/compiler-sfc": {
-			"version": "2.7.10",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
-			"integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
-			"requires": {
-				"@babel/parser": "^7.18.4",
-				"postcss": "^8.4.14",
-				"source-map": "^0.6.1"
-			}
-		},
-		"@vue/component-compiler-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-			"integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"consolidate": "^0.15.1",
-				"hash-sum": "^1.0.2",
-				"lru-cache": "^4.1.2",
-				"merge-source-map": "^1.1.0",
-				"postcss": "^7.0.36",
-				"postcss-selector-parser": "^6.0.2",
-				"prettier": "^1.18.2 || ^2.0.0",
-				"source-map": "~0.6.1",
-				"vue-template-es2015-compiler": "^1.9.0"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true,
-					"peer": true
-				},
-				"postcss": {
-					"version": "7.0.39",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-					"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"picocolors": "^0.2.1",
-						"source-map": "^0.6.1"
-					}
-				}
-			}
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/helper-numbers": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-			}
-		},
-		"@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-			"peer": true
-		},
-		"@webassemblyjs/helper-api-error": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-			"peer": true
-		},
-		"@webassemblyjs/helper-buffer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-			"peer": true
-		},
-		"@webassemblyjs/helper-numbers": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-			"peer": true
-		},
-		"@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1"
-			}
-		},
-		"@webassemblyjs/ieee754": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-			"peer": true,
-			"requires": {
-				"@xtuc/ieee754": "^1.2.0"
-			}
-		},
-		"@webassemblyjs/leb128": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-			"peer": true,
-			"requires": {
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webassemblyjs/utf8": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-			"peer": true
-		},
-		"@webassemblyjs/wasm-edit": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/helper-wasm-section": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-opt": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
-				"@webassemblyjs/wast-printer": "1.11.1"
-			}
-		},
-		"@webassemblyjs/wasm-gen": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
-			}
-		},
-		"@webassemblyjs/wasm-opt": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1"
-			}
-		},
-		"@webassemblyjs/wasm-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
-			}
-		},
-		"@webassemblyjs/wast-printer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-			"peer": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webpack-cli/configtest": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-			"integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"@webpack-cli/info": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-			"integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"envinfo": "^7.7.3"
-			}
-		},
-		"@webpack-cli/serve": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-			"integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"@xtuc/ieee754": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"peer": true
-		},
-		"@xtuc/long": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"peer": true
-		},
-		"abort-controller": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-			"integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"event-target-shim": "^5.0.0"
-			}
-		},
-		"accepts": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"mime-types": "~2.1.34",
-				"negotiator": "0.6.3"
-			}
-		},
-		"acorn": {
-			"version": "8.8.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-			"integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-			"peer": true
-		},
-		"acorn-import-assertions": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-			"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-			"peer": true,
-			"requires": {}
-		},
-		"acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"peer": true,
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			}
-		},
-		"ajv-formats": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"ajv": "^8.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"peer": true,
-			"requires": {}
-		},
-		"ansi-html-community": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-			"dev": true,
-			"peer": true
-		},
-		"ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"peer": true
-		},
-		"ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"requires": {
-				"color-convert": "^1.9.0"
-			}
-		},
-		"anymatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-			"devOptional": true,
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			}
-		},
-		"argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true,
-			"peer": true
-		},
-		"array-flatten": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-			"dev": true,
-			"peer": true
-		},
-		"array-includes": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-			"integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5",
-				"get-intrinsic": "^1.1.1",
-				"is-string": "^1.0.7"
-			}
-		},
-		"array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true,
-			"peer": true
-		},
-		"array.prototype.flat": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-			"integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
-				"es-shim-unscopables": "^1.0.0"
-			}
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-			"dev": true,
-			"peer": true
-		},
-		"asn1.js": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bn.js": "^4.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"assert": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-			"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"es6-object-assign": "^1.1.0",
-				"is-nan": "^1.2.1",
-				"object-is": "^1.0.1",
-				"util": "^0.12.0"
-			}
-		},
-		"astral-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-			"dev": true,
-			"peer": true
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-		},
-		"available-typed-arrays": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-			"dev": true,
-			"peer": true
-		},
-		"axios": {
-			"version": "0.27.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-			"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-			"requires": {
-				"follow-redirects": "^1.14.9",
-				"form-data": "^4.0.0"
-			}
-		},
-		"babel-loader": {
-			"version": "8.2.5",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-			"integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
-			}
-		},
-		"babel-plugin-dynamic-import-node": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-			"requires": {
-				"object.assign": "^4.1.0"
-			}
-		},
-		"babel-plugin-polyfill-corejs2": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
-			"requires": {
-				"@babel/compat-data": "^7.17.7",
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"semver": "^6.1.1"
-			}
-		},
-		"babel-plugin-polyfill-corejs3": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-			"integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"core-js-compat": "^3.25.1"
-			}
-		},
-		"babel-plugin-polyfill-regenerator": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-			"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3"
-			}
-		},
-		"balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-		},
-		"base64-js": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-			"dev": true,
-			"peer": true
-		},
-		"batch": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-			"dev": true,
-			"peer": true
-		},
-		"big.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-			"dev": true,
-			"peer": true
-		},
-		"binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-			"devOptional": true
-		},
-		"bluebird": {
-			"version": "3.7.2",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-			"dev": true,
-			"peer": true
-		},
-		"bn.js": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-			"dev": true,
-			"peer": true
-		},
-		"body-parser": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-			"integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"on-finished": "2.4.1",
-				"qs": "6.10.3",
-				"raw-body": "2.5.1",
-				"type-is": "~1.6.18",
-				"unpipe": "1.0.0"
-			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true,
-					"peer": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"bonjour-service": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-			"integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
-				"fast-deep-equal": "^3.1.3",
-				"multicast-dns": "^7.2.5"
-			}
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-			"dev": true,
-			"peer": true
-		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"devOptional": true,
-			"requires": {
-				"fill-range": "^7.0.1"
-			}
-		},
-		"brorand": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-			"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-			"dev": true,
-			"peer": true
-		},
-		"browserify-aes": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"buffer-xor": "^1.0.3",
-				"cipher-base": "^1.0.0",
-				"create-hash": "^1.1.0",
-				"evp_bytestokey": "^1.0.3",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"browserify-cipher": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"browserify-aes": "^1.0.4",
-				"browserify-des": "^1.0.0",
-				"evp_bytestokey": "^1.0.0"
-			}
-		},
-		"browserify-des": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"des.js": "^1.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			}
-		},
-		"browserify-rsa": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bn.js": "^5.0.0",
-				"randombytes": "^2.0.1"
-			}
-		},
-		"browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
-				"create-hash": "^1.2.0",
-				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
-				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"browserify-zlib": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"pako": "~1.0.5"
-			}
-		},
-		"browserslist": {
-			"version": "4.21.4",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-			"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-			"requires": {
-				"caniuse-lite": "^1.0.30001400",
-				"electron-to-chromium": "^1.4.251",
-				"node-releases": "^2.0.6",
-				"update-browserslist-db": "^1.0.9"
-			}
-		},
-		"buffer": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"base64-js": "^1.3.1",
-				"ieee754": "^1.2.1"
-			}
-		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"peer": true
-		},
-		"buffer-xor": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-			"integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-			"dev": true,
-			"peer": true
-		},
-		"builtin-status-codes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-			"dev": true,
-			"peer": true
-		},
-		"builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"semver": "^7.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"bytes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-			"dev": true,
-			"peer": true
-		},
-		"call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
-			}
-		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true,
-			"peer": true
-		},
-		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-			"dev": true,
-			"peer": true
-		},
-		"camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30001409",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001409.tgz",
-			"integrity": "sha512-V0mnJ5dwarmhYv8/MzhJ//aW68UpvnQBXv8lJ2QUsvn2pHcmAuNtu8hQEDz37XnA1iE+lRR9CIfGWWpgJ5QedQ=="
-		},
-		"chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"requires": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			}
-		},
-		"char-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-			"integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="
-		},
-		"charenc": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
-		},
-		"chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"devOptional": true,
-			"requires": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"devOptional": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				}
-			}
-		},
-		"chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-			"peer": true
-		},
-		"cipher-base": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"clamp": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
-			"integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
-		},
-		"clone-deep": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"is-plain-object": "^2.0.4",
-				"kind-of": "^6.0.2",
-				"shallow-clone": "^3.0.0"
-			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"requires": {
-				"color-name": "1.1.3"
-			}
-		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-		},
-		"colord": {
-			"version": "2.9.3",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-			"dev": true,
-			"peer": true
-		},
-		"colorette": {
-			"version": "2.0.19",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-			"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-			"dev": true,
-			"peer": true
-		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"peer": true
-		},
-		"comment-parser": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
-			"integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
-			"dev": true,
-			"peer": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-			"dev": true,
-			"peer": true
-		},
-		"compressible": {
-			"version": "2.0.18",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"mime-db": ">= 1.43.0 < 2"
-			}
-		},
-		"compression": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.2",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-		},
-		"connect-history-api-fallback": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-			"dev": true,
-			"peer": true
-		},
-		"console-browserify": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-			"dev": true,
-			"peer": true
-		},
-		"consolidate": {
-			"version": "0.15.1",
-			"resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-			"integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bluebird": "^3.1.1"
-			}
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-			"dev": true,
-			"peer": true
-		},
-		"content-disposition": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"safe-buffer": "5.2.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-			"dev": true,
-			"peer": true
-		},
-		"convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"requires": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
-		"cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-			"dev": true,
-			"peer": true
-		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-			"dev": true,
-			"peer": true
-		},
-		"core-js": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
-			"integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A=="
-		},
-		"core-js-compat": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
-			"integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
-			"requires": {
-				"browserslist": "^4.21.4"
-			}
-		},
-		"core-util-is": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-			"dev": true,
-			"peer": true
-		},
-		"cosmiconfig": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-			"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
-			}
-		},
-		"create-ecdh": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"elliptic": "^6.5.3"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"create-hash": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"inherits": "^2.0.1",
-				"md5.js": "^1.3.4",
-				"ripemd160": "^2.0.1",
-				"sha.js": "^2.4.0"
-			}
-		},
-		"create-hmac": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"cipher-base": "^1.0.3",
-				"create-hash": "^1.1.0",
-				"inherits": "^2.0.1",
-				"ripemd160": "^2.0.0",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
-			}
-		},
-		"cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			}
-		},
-		"crypt": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
-		},
-		"crypto-browserify": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"browserify-cipher": "^1.0.0",
-				"browserify-sign": "^4.0.0",
-				"create-ecdh": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"create-hmac": "^1.1.0",
-				"diffie-hellman": "^5.0.0",
-				"inherits": "^2.0.1",
-				"pbkdf2": "^3.0.3",
-				"public-encrypt": "^4.0.0",
-				"randombytes": "^2.0.0",
-				"randomfill": "^1.0.3"
-			}
-		},
-		"css-functions-list": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-			"integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
-			"dev": true,
-			"peer": true
-		},
-		"css-loader": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-			"integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.7",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.0",
-				"postcss-modules-scope": "^3.0.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.5"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true,
-			"peer": true
-		},
-		"csstype": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-			"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
-		},
-		"date-format-parse": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.7.tgz",
-			"integrity": "sha512-/+lyMUKoRogMuTeOVii6lUwjbVlesN9YRYLzZT/g3TEZ3uD9QnpjResujeEqUW+OSNbT7T1+SYdyEkTcRv+KDQ=="
-		},
-		"de-indent": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-			"dev": true,
-			"peer": true
-		},
-		"debounce": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-			"integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
-		},
-		"debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"requires": {
-				"ms": "2.1.2"
-			}
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-			"dev": true,
-			"peer": true
-		},
-		"decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
-			},
-			"dependencies": {
-				"map-obj": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-					"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true,
-			"peer": true
-		},
-		"default-gateway": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"execa": "^5.0.0"
-			}
-		},
-		"define-lazy-prop": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-			"dev": true,
-			"peer": true
-		},
-		"define-properties": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-			"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-			"requires": {
-				"has-property-descriptors": "^1.0.0",
-				"object-keys": "^1.1.1"
-			}
-		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-		},
-		"depd": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-			"dev": true,
-			"peer": true
-		},
-		"des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0"
-			}
-		},
-		"destroy": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-			"dev": true,
-			"peer": true
-		},
-		"detect-node": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-			"dev": true,
-			"peer": true
-		},
-		"diffie-hellman": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"miller-rabin": "^4.0.0",
-				"randombytes": "^2.0.0"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"path-type": "^4.0.0"
-			}
-		},
-		"dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-			"dev": true,
-			"peer": true
-		},
-		"dns-packet": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-			"integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@leichtgewicht/ip-codec": "^2.0.1"
-			}
-		},
-		"doctrine": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"esutils": "^2.0.2"
-			}
-		},
-		"dom-serializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"entities": "^4.2.0"
-			}
-		},
-		"domain-browser": {
-			"version": "4.22.0",
-			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.22.0.tgz",
-			"integrity": "sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==",
-			"dev": true,
-			"peer": true
-		},
-		"domelementtype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-			"dev": true,
-			"peer": true
-		},
-		"domhandler": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"domelementtype": "^2.3.0"
-			}
-		},
-		"domutils": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-			"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"dom-serializer": "^2.0.0",
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.1"
-			}
-		},
-		"ee-first": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-			"dev": true,
-			"peer": true
-		},
-		"electron-to-chromium": {
-			"version": "1.4.256",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.256.tgz",
-			"integrity": "sha512-x+JnqyluoJv8I0U9gVe+Sk2st8vF0CzMt78SXxuoWCooLLY2k5VerIBdpvG7ql6GKI4dzNnPjmqgDJ76EdaAKw=="
-		},
-		"elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"bn.js": "^4.11.9",
-				"brorand": "^1.1.0",
-				"hash.js": "^1.0.0",
-				"hmac-drbg": "^1.0.1",
-				"inherits": "^2.0.4",
-				"minimalistic-assert": "^1.0.1",
-				"minimalistic-crypto-utils": "^1.0.1"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"emoji-mart-vue-fast": {
-			"version": "10.2.2",
-			"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-10.2.2.tgz",
-			"integrity": "sha512-SO37LI60Oksog3RhNpEUoQjfceBXfZ3yW9ALhlQgyut7hE6MghHsBJrGPeI6KKK8bQfTMBYlci/RWKsUsmbkPw==",
-			"requires": {
-				"@babel/polyfill": "^7.12.1",
-				"@babel/runtime": "^7.16.3",
-				"vue-virtual-scroller": "^1.0.10"
-			}
-		},
-		"emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"peer": true
-		},
-		"emojis-list": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-			"dev": true,
-			"peer": true
-		},
-		"encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-			"dev": true,
-			"peer": true
-		},
-		"enhanced-resolve": {
-			"version": "5.10.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-			"integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
-			"peer": true,
-			"requires": {
-				"graceful-fs": "^4.2.4",
-				"tapable": "^2.2.0"
-			}
-		},
-		"entities": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-			"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-			"dev": true,
-			"peer": true
-		},
-		"envinfo": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-			"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-			"dev": true,
-			"peer": true
-		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"es-abstract": {
-			"version": "1.20.2",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-			"integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"es-to-primitive": "^1.2.1",
-				"function-bind": "^1.1.1",
-				"function.prototype.name": "^1.1.5",
-				"get-intrinsic": "^1.1.2",
-				"get-symbol-description": "^1.0.0",
-				"has": "^1.0.3",
-				"has-property-descriptors": "^1.0.0",
-				"has-symbols": "^1.0.3",
-				"internal-slot": "^1.0.3",
-				"is-callable": "^1.2.4",
-				"is-negative-zero": "^2.0.2",
-				"is-regex": "^1.1.4",
-				"is-shared-array-buffer": "^1.0.2",
-				"is-string": "^1.0.7",
-				"is-weakref": "^1.0.2",
-				"object-inspect": "^1.12.2",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.4",
-				"regexp.prototype.flags": "^1.4.3",
-				"string.prototype.trimend": "^1.0.5",
-				"string.prototype.trimstart": "^1.0.5",
-				"unbox-primitive": "^1.0.2"
-			}
-		},
-		"es-module-lexer": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-			"peer": true
-		},
-		"es-shim-unscopables": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-			"integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"es-to-primitive": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"is-callable": "^1.1.4",
-				"is-date-object": "^1.0.1",
-				"is-symbol": "^1.0.2"
-			}
-		},
-		"es6-object-assign": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-			"dev": true,
-			"peer": true
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-		},
-		"escape-html": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-		},
-		"eslint": {
-			"version": "8.23.1",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
-			"integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@eslint/eslintrc": "^1.3.2",
-				"@humanwhocodes/config-array": "^0.10.4",
-				"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
-				"@humanwhocodes/module-importer": "^1.0.1",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.4.0",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.15.0",
-				"globby": "^11.1.0",
-				"grapheme-splitter": "^1.0.4",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-sdsl": "^4.1.4",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.1.2",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true,
-					"peer": true
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true,
-					"peer": true
-				},
-				"eslint-scope": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-					"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-					"dev": true,
-					"peer": true
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true,
-					"peer": true
-				},
-				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"type-fest": "^0.20.2"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true,
-					"peer": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"type-fest": {
-					"version": "0.20.2",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-					"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"eslint-config-standard": {
-			"version": "17.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-			"integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"eslint-import-resolver-node": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-			"integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"debug": "^3.2.7",
-				"resolve": "^1.20.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
-			}
-		},
-		"eslint-module-utils": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-			"integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"debug": "^3.2.7"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
-			}
-		},
-		"eslint-plugin-es": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-			"integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"eslint-utils": "^2.0.0",
-				"regexpp": "^3.0.0"
-			},
-			"dependencies": {
-				"eslint-utils": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-					"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"eslint-visitor-keys": "^1.1.0"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"eslint-plugin-import": {
-			"version": "2.26.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-			"integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"array-includes": "^3.1.4",
-				"array.prototype.flat": "^1.2.5",
-				"debug": "^2.6.9",
-				"doctrine": "^2.1.0",
-				"eslint-import-resolver-node": "^0.3.6",
-				"eslint-module-utils": "^2.7.3",
-				"has": "^1.0.3",
-				"is-core-module": "^2.8.1",
-				"is-glob": "^4.0.3",
-				"minimatch": "^3.1.2",
-				"object.values": "^1.1.5",
-				"resolve": "^1.22.0",
-				"tsconfig-paths": "^3.14.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"doctrine": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-					"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"esutils": "^2.0.2"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"eslint-plugin-jsdoc": {
-			"version": "39.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz",
-			"integrity": "sha512-R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@es-joy/jsdoccomment": "~0.31.0",
-				"comment-parser": "1.3.1",
-				"debug": "^4.3.4",
-				"escape-string-regexp": "^4.0.0",
-				"esquery": "^1.4.0",
-				"semver": "^7.3.7",
-				"spdx-expression-parse": "^3.0.1"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true,
-					"peer": true
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"eslint-plugin-n": {
-			"version": "15.2.5",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz",
-			"integrity": "sha512-8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"builtins": "^5.0.1",
-				"eslint-plugin-es": "^4.1.0",
-				"eslint-utils": "^3.0.0",
-				"ignore": "^5.1.1",
-				"is-core-module": "^2.10.0",
-				"minimatch": "^3.1.2",
-				"resolve": "^1.22.1",
-				"semver": "^7.3.7"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"eslint-plugin-promise": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz",
-			"integrity": "sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"eslint-plugin-vue": {
-			"version": "9.5.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.5.1.tgz",
-			"integrity": "sha512-Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"eslint-utils": "^3.0.0",
-				"natural-compare": "^1.4.0",
-				"nth-check": "^2.0.1",
-				"postcss-selector-parser": "^6.0.9",
-				"semver": "^7.3.5",
-				"vue-eslint-parser": "^9.0.1",
-				"xml-name-validator": "^4.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"peer": true,
-			"requires": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			}
-		},
-		"eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"eslint-visitor-keys": "^2.0.0"
-			}
-		},
-		"eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true,
-			"peer": true
-		},
-		"espree": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-			"integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"acorn": "^8.8.0",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^3.3.0"
-			},
-			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"estraverse": "^5.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"peer": true,
-			"requires": {
-				"estraverse": "^5.2.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"peer": true
-				}
-			}
-		},
-		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"peer": true
-		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-		},
-		"etag": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-			"dev": true,
-			"peer": true
-		},
-		"event-target-shim": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-			"integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-			"dev": true,
-			"peer": true
-		},
-		"eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-			"dev": true,
-			"peer": true
-		},
-		"events": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"peer": true
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			}
-		},
-		"express": {
-			"version": "4.18.1",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-			"integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"accepts": "~1.3.8",
-				"array-flatten": "1.1.1",
-				"body-parser": "1.20.0",
-				"content-disposition": "0.5.4",
-				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
-				"cookie-signature": "1.0.6",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
-				"methods": "~1.1.2",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
-				"proxy-addr": "~2.0.7",
-				"qs": "6.10.3",
-				"range-parser": "~1.2.1",
-				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"type-is": "~1.6.18",
-				"utils-merge": "1.0.1",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-					"dev": true,
-					"peer": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true,
-					"peer": true
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"peer": true
-		},
-		"fast-glob": {
-			"version": "3.2.12",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-			"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				}
-			}
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"peer": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true,
-			"peer": true
-		},
-		"fastest-levenshtein": {
-			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-			"dev": true,
-			"peer": true
-		},
-		"fastq": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"faye-websocket": {
-			"version": "0.11.4",
-			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"websocket-driver": ">=0.5.1"
-			}
-		},
-		"file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"flat-cache": "^3.0.4"
-			}
-		},
-		"fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"devOptional": true,
-			"requires": {
-				"to-regex-range": "^5.0.1"
-			}
-		},
-		"filter-obj": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz",
-			"integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==",
-			"dev": true,
-			"peer": true
-		},
-		"finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"statuses": "2.0.1",
-				"unpipe": "~1.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
-			}
-		},
-		"find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			}
-		},
-		"flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
-			}
-		},
-		"flatted": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-			"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-			"dev": true,
-			"peer": true
-		},
-		"focus-trap": {
-			"version": "6.9.4",
-			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
-			"integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
-			"requires": {
-				"tabbable": "^5.3.3"
-			}
-		},
-		"follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-		},
-		"for-each": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"is-callable": "^1.1.3"
-			}
-		},
-		"form-data": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.8",
-				"mime-types": "^2.1.12"
-			}
-		},
-		"forwarded": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-			"dev": true,
-			"peer": true
-		},
-		"fresh": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-			"dev": true,
-			"peer": true
-		},
-		"fs-monkey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-			"integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-			"dev": true,
-			"peer": true
-		},
-		"fs-readdir-recursive": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
-			"integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-		},
-		"fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-			"dev": true,
-			"optional": true,
-			"peer": true
-		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-		},
-		"function.prototype.name": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"functions-have-names": "^1.2.2"
-			}
-		},
-		"functions-have-names": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-			"dev": true,
-			"peer": true
-		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-		},
-		"get-intrinsic": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-			"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
-			}
-		},
-		"get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
-			"peer": true
-		},
-		"get-symbol-description": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
-			}
-		},
-		"glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"is-glob": "^4.0.3"
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"peer": true
-		},
-		"global-modules": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"global-prefix": "^3.0.0"
-			}
-		},
-		"global-prefix": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"ini": "^1.3.5",
-				"kind-of": "^6.0.2",
-				"which": "^1.3.1"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true,
-					"peer": true
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-		},
-		"globby": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
-				"ignore": "^5.2.0",
-				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
-			}
-		},
-		"globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-			"dev": true,
-			"peer": true
-		},
-		"graceful-fs": {
-			"version": "4.2.10",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-			"peer": true
-		},
-		"grapheme-splitter": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-			"dev": true,
-			"peer": true
-		},
-		"hammerjs": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
-			"integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ=="
-		},
-		"handle-thing": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-			"dev": true,
-			"peer": true
-		},
-		"hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true,
-			"peer": true
-		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"requires": {
-				"function-bind": "^1.1.1"
-			}
-		},
-		"has-bigints": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-			"dev": true,
-			"peer": true
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-		},
-		"has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-			"requires": {
-				"get-intrinsic": "^1.1.1"
-			}
-		},
-		"has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-		},
-		"has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-symbols": "^1.0.2"
-			}
-		},
-		"hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"hash-sum": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-			"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-			"dev": true,
-			"peer": true
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"he": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-			"dev": true,
-			"peer": true
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hosted-git-info": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-			"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"lru-cache": "^6.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.7",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"safe-buffer": "~5.1.0"
-					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-			"integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
-			"dev": true,
-			"peer": true
-		},
-		"html-tags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-			"integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-			"dev": true,
-			"peer": true
-		},
-		"htmlparser2": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
-			"integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"domutils": "^3.0.1",
-				"entities": "^4.3.0"
-			}
-		},
-		"http-deceiver": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-			"dev": true,
-			"peer": true
-		},
-		"http-errors": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"depd": "2.0.0",
-				"inherits": "2.0.4",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"toidentifier": "1.0.1"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.8",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-			"integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-			"dev": true,
-			"peer": true
-		},
-		"http-proxy": {
-			"version": "1.18.1",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"eventemitter3": "^4.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-middleware": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/http-proxy": "^1.17.8",
-				"http-proxy": "^1.18.1",
-				"is-glob": "^4.0.1",
-				"is-plain-obj": "^3.0.0",
-				"micromatch": "^4.0.2"
-			},
-			"dependencies": {
-				"is-plain-obj": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-					"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"https-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-			"integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-			"dev": true,
-			"peer": true
-		},
-		"human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
-			"peer": true
-		},
-		"ical.js": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.5.0.tgz",
-			"integrity": "sha512-7ZxMkogUkkaCx810yp0ZGKvq1ZpRgJeornPttpoxe6nYZ3NLesZe1wWMXDdwTkj/b5NtXT+Y16Aakph/ao98ZQ==",
-			"peer": true
-		},
-		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			}
-		},
-		"icss-utils": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-			"dev": true,
-			"peer": true,
-			"requires": {}
-		},
-		"ieee754": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-			"dev": true,
-			"peer": true
-		},
-		"ignore": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-			"dev": true,
-			"peer": true
-		},
-		"immutable": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-			"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-			"dev": true,
-			"peer": true
-		},
-		"import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			}
-		},
-		"import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true,
-			"peer": true
-		},
-		"import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			}
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-			"dev": true,
-			"peer": true
-		},
-		"indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true,
-			"peer": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true,
-			"peer": true
-		},
-		"internal-slot": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"get-intrinsic": "^1.1.0",
-				"has": "^1.0.3",
-				"side-channel": "^1.0.4"
-			}
-		},
-		"interpret": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-			"integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-			"dev": true,
-			"peer": true
-		},
-		"ipaddr.js": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-			"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-			"dev": true,
-			"peer": true
-		},
-		"is-arguments": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-			"dev": true,
-			"peer": true
-		},
-		"is-bigint": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-bigints": "^1.0.1"
-			}
-		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"devOptional": true,
-			"requires": {
-				"binary-extensions": "^2.0.0"
-			}
-		},
-		"is-boolean-object": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-		},
-		"is-callable": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
-			"integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
-			"dev": true,
-			"peer": true
-		},
-		"is-core-module": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-			"integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"is-date-object": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-docker": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-			"dev": true,
-			"peer": true
-		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"devOptional": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"peer": true
-		},
-		"is-generator-function": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"devOptional": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
-			}
-		},
-		"is-nan": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-			"integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3"
-			}
-		},
-		"is-negative-zero": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-			"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-			"dev": true,
-			"peer": true
-		},
-		"is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"devOptional": true
-		},
-		"is-number-object": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-			"dev": true,
-			"peer": true
-		},
-		"is-plain-object": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-			"dev": true,
-			"peer": true
-		},
-		"is-regex": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-shared-array-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2"
-			}
-		},
-		"is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
-			"peer": true
-		},
-		"is-string": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-symbol": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"has-symbols": "^1.0.2"
-			}
-		},
-		"is-typed-array": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-			"integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-abstract": "^1.20.0",
-				"for-each": "^0.3.3",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-weakref": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2"
-			}
-		},
-		"is-wsl": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"is-docker": "^2.0.0"
-			}
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-			"dev": true,
-			"peer": true
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true,
-			"peer": true
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-			"dev": true,
-			"peer": true
-		},
-		"jest-worker": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-			"peer": true,
-			"requires": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"peer": true
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"peer": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"js-sdsl": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-			"integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-			"dev": true,
-			"peer": true
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-		},
-		"js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"argparse": "^2.0.1"
-			}
-		},
-		"jsdoc-type-pratt-parser": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
-			"integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
-			"dev": true,
-			"peer": true
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-		},
-		"json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"peer": true
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"peer": true
-		},
-		"json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true,
-			"peer": true
-		},
-		"json5": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-			"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
-		},
-		"klona": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-			"integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-			"dev": true,
-			"peer": true
-		},
-		"known-css-properties": {
-			"version": "0.25.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz",
-			"integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==",
-			"dev": true,
-			"peer": true
-		},
-		"levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			}
-		},
-		"lines-and-columns": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-			"dev": true,
-			"peer": true
-		},
-		"linkify-string": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/linkify-string/-/linkify-string-3.0.4.tgz",
-			"integrity": "sha512-OnNqqRjlYXaXipIAbBC8sDXsSumI1ftatzFg141Pw9HEXWjTVLFcMZoKbFupshqWRavtNJ6QHLa+u6AlxxgeRw==",
-			"requires": {}
-		},
-		"linkifyjs": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz",
-			"integrity": "sha512-1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg==",
-			"peer": true
-		},
-		"loader-runner": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-			"peer": true
-		},
-		"loader-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-			"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
-			}
-		},
-		"locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"p-locate": "^5.0.0"
-			}
-		},
-		"lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-		},
-		"lodash.debounce": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-		},
-		"lodash.get": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
-		},
-		"lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true,
-			"peer": true
-		},
-		"lodash.throttle": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-			"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
-		},
-		"lodash.truncate": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-			"dev": true,
-			"peer": true
-		},
-		"lru-cache": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"pseudomap": "^1.0.2",
-				"yallist": "^2.1.2"
-			}
-		},
-		"make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"semver": "^6.0.0"
-			}
-		},
-		"map-obj": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-			"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-			"dev": true,
-			"peer": true
-		},
-		"material-colors": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
-			"integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
-		},
-		"mathml-tag-names": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-			"dev": true,
-			"peer": true
-		},
-		"md5": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-			"requires": {
-				"charenc": "0.0.2",
-				"crypt": "0.0.2",
-				"is-buffer": "~1.1.6"
-			}
-		},
-		"md5.js": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			}
-		},
-		"media-typer": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"dev": true,
-			"peer": true
-		},
-		"memfs": {
-			"version": "3.4.7",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-			"integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"fs-monkey": "^1.0.3"
-			}
-		},
-		"meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.18.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
-		"merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-			"dev": true,
-			"peer": true
-		},
-		"merge-source-map": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-			"integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"source-map": "^0.6.1"
-			}
-		},
-		"merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"peer": true
-		},
-		"merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"peer": true
-		},
-		"methods": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"dev": true,
-			"peer": true
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+		"node_modules/micromark-util-types": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz",
+			"integrity": "sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+			"integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"braces": "^3.0.2",
+			"dependencies": {
+				"braces": "^3.0.3",
 				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"miller-rabin": {
+		"node_modules/miller-rabin": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
 			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"bn.js": "^4.0.0",
 				"brorand": "^1.0.1"
 			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true,
-					"peer": true
-				}
+			"bin": {
+				"miller-rabin": "bin/miller-rabin"
 			}
 		},
-		"mime": {
+		"node_modules/miller-rabin/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/mime": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
 			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"mime-db": {
+		"node_modules/mime-db": {
 			"version": "1.52.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"mime-types": {
+		"node_modules/mime-types": {
 			"version": "2.1.35",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
 			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"requires": {
+			"dependencies": {
 				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"mimic-fn": {
+		"node_modules/mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"min-indent": {
+		"node_modules/min-indent": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
 			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"minimalistic-assert": {
+		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
 			"dev": true,
 			"peer": true
 		},
-		"minimalistic-crypto-utils": {
+		"node_modules/minimalistic-crypto-utils": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
 			"dev": true,
 			"peer": true
 		},
-		"minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"requires": {
-				"brace-expansion": "^1.1.7"
+		"node_modules/minimatch": {
+			"version": "9.0.3",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"minimist": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+		"node_modules/minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"minimist-options": {
+		"node_modules/minimist-options": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
 			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"arrify": "^1.0.1",
 				"is-plain-obj": "^1.1.0",
 				"kind-of": "^6.0.3"
 			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"ms": {
+		"node_modules/ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
 			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
 		},
-		"multicast-dns": {
+		"node_modules/multicast-dns": {
 			"version": "7.2.5",
 			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
 			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"dns-packet": "^5.2.2",
 				"thunky": "^1.0.2"
+			},
+			"bin": {
+				"multicast-dns": "cli.js"
 			}
 		},
-		"nanoid": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-			"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+		"node_modules/nanoid": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
 		},
-		"natural-compare": {
+		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
 			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
 			"dev": true,
 			"peer": true
 		},
-		"negotiator": {
+		"node_modules/negotiator": {
 			"version": "0.6.3",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
 			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"neo-async": {
+		"node_modules/neo-async": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+			"dev": true,
 			"peer": true
 		},
-		"node-forge": {
+		"node_modules/nested-property": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/nested-property/-/nested-property-4.0.0.tgz",
+			"integrity": "sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA=="
+		},
+		"node_modules/node-domexception": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+			"integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "github",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"engines": {
+				"node": ">=10.5.0"
+			}
+		},
+		"node_modules/node-fetch": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+			"integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+			"dependencies": {
+				"data-uri-to-buffer": "^4.0.0",
+				"fetch-blob": "^3.1.4",
+				"formdata-polyfill": "^4.0.10"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/node-fetch"
+			}
+		},
+		"node_modules/node-forge": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
 			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 6.13.0"
+			}
 		},
-		"node-gettext": {
+		"node_modules/node-gettext": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-3.0.0.tgz",
 			"integrity": "sha512-/VRYibXmVoN6tnSAY2JWhNRhWYJ8Cd844jrZU/DwLVoI4vBI6ceYbd8i42sYZ9uOgDH3S7vslIKOWV/ZrT2YBA==",
-			"requires": {
+			"dependencies": {
 				"lodash.get": "^4.4.2"
 			}
 		},
-		"node-polyfill-webpack-plugin": {
+		"node_modules/node-polyfill-webpack-plugin": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-2.0.1.tgz",
 			"integrity": "sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"assert": "^2.0.0",
 				"browserify-zlib": "^0.2.0",
 				"buffer": "^6.0.3",
@@ -17829,1147 +10717,1890 @@
 				"url": "^0.11.0",
 				"util": "^0.12.4",
 				"vm-browserify": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"webpack": ">=5"
 			}
 		},
-		"node-releases": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-			"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
+		"node_modules/node-releases": {
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+			"dev": true,
+			"peer": true
 		},
-		"normalize-package-data": {
+		"node_modules/normalize-package-data": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
 			"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"hosted-git-info": "^4.0.1",
 				"is-core-module": "^2.5.0",
 				"semver": "^7.3.4",
 				"validate-npm-package-license": "^3.0.1"
 			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/normalize-package-data/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"normalize-path": {
+		"node_modules/normalize-path": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
 			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"devOptional": true
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"npm-run-path": {
+		"node_modules/npm-run-path": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
 			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"nth-check": {
+		"node_modules/nth-check": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
 			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/object-inspect": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+			"integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-is": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+			"integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/object.assign": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+			"integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"define-properties": "^1.2.1",
+				"has-symbols": "^1.0.3",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object.fromentries": {
+			"version": "2.0.8",
+			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+			"integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"object-inspect": {
-			"version": "1.12.2",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-			"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-			"dev": true,
-			"peer": true
-		},
-		"object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+		"node_modules/object.groupby": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+			"integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
-			}
-		},
-		"object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-		},
-		"object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"has-symbols": "^1.0.3",
-				"object-keys": "^1.1.1"
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"object.values": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-			"integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+		"node_modules/object.values": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+			"integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"obuf": {
+		"node_modules/obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
 			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
 			"dev": true,
 			"peer": true
 		},
-		"on-finished": {
+		"node_modules/on-finished": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"ee-first": "1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"on-headers": {
+		"node_modules/on-headers": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
 			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"once": {
+		"node_modules/once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"requires": {
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"wrappy": "1"
 			}
 		},
-		"onetime": {
+		"node_modules/onetime": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"open": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-			"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+		"node_modules/open": {
+			"version": "8.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"define-lazy-prop": "^2.0.0",
 				"is-docker": "^2.1.1",
 				"is-wsl": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+		"node_modules/optionator": {
+			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"deep-is": "^0.1.3",
 				"fast-levenshtein": "^2.0.6",
 				"levn": "^0.4.1",
 				"prelude-ls": "^1.2.1",
 				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
+				"word-wrap": "^1.2.5"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"os-browserify": {
+		"node_modules/os-browserify": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
 			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
 			"dev": true,
 			"peer": true
 		},
-		"p-limit": {
+		"node_modules/p-limit": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
 			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"p-locate": {
+		"node_modules/p-locate": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
 			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"p-retry": {
+		"node_modules/p-retry": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
 			"integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@types/retry": "0.12.0",
 				"retry": "^0.13.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"p-try": {
+		"node_modules/p-try": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"pako": {
+		"node_modules/pako": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
 			"dev": true,
 			"peer": true
 		},
-		"parent-module": {
+		"node_modules/parent-module": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"parse-asn1": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+		"node_modules/parse-asn1": {
+			"version": "5.1.7",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+			"integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
+			"dependencies": {
+				"asn1.js": "^4.10.1",
+				"browserify-aes": "^1.2.0",
+				"evp_bytestokey": "^1.0.3",
+				"hash-base": "~3.0",
+				"pbkdf2": "^3.1.2",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"parse-json": {
+		"node_modules/parse-json": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
 			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@babel/code-frame": "^7.0.0",
 				"error-ex": "^1.3.1",
 				"json-parse-even-better-errors": "^2.3.0",
 				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"parseurl": {
+		"node_modules/parseurl": {
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
 			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"path-browserify": {
+		"node_modules/path-browserify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
 			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
 			"dev": true,
 			"peer": true
 		},
-		"path-exists": {
+		"node_modules/path-exists": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"path-is-absolute": {
+		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"path-key": {
+		"node_modules/path-key": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"path-parse": {
+		"node_modules/path-parse": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/path-posix": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
+			"integrity": "sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA=="
 		},
-		"path-to-regexp": {
+		"node_modules/path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
 			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
 			"dev": true,
 			"peer": true
 		},
-		"path-type": {
+		"node_modules/path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pbkdf2": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"create-hash": "^1.1.2",
+				"create-hmac": "^1.1.4",
+				"ripemd160": "^2.0.1",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
+			},
+			"engines": {
+				"node": ">=0.12"
+			}
+		},
+		"node_modules/picocolors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+			"integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+			"integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"find-up": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/find-up": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+			"integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"locate-path": "^7.1.0",
+				"path-exists": "^5.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/locate-path": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+			"integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"p-locate": "^6.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/p-limit": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+			"integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"yocto-queue": "^1.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/p-locate": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+			"integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"p-limit": "^4.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/path-exists": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+			"integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			}
 		},
-		"pbkdf2": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+		"node_modules/pkg-dir/node_modules/yocto-queue": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
+			"integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"create-hash": "^1.1.2",
-				"create-hmac": "^1.1.4",
-				"ripemd160": "^2.0.1",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"picocolors": {
+		"node_modules/possible-typed-array-names": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-		},
-		"picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"devOptional": true
-		},
-		"pify": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+			"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"find-up": "^4.0.0"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/postcss": {
+			"version": "8.4.41",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+			"integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
 				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
 				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
+			],
+			"dependencies": {
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.0.1",
+				"source-map-js": "^1.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
 			}
 		},
-		"popper.js": {
-			"version": "1.16.1",
-			"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-			"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
-		},
-		"postcss": {
-			"version": "8.4.16",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-			"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
-			"requires": {
-				"nanoid": "^3.3.4",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
-			}
-		},
-		"postcss-html": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.5.0.tgz",
-			"integrity": "sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA==",
+		"node_modules/postcss-html": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.7.0.tgz",
+			"integrity": "sha512-MfcMpSUIaR/nNgeVS8AyvyDugXlADjN9AcV7e5rDfrF1wduIAGSkL4q2+wgrZgA3sHVAHLDO9FuauHhZYW2nBw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"htmlparser2": "^8.0.0",
-				"js-tokens": "^8.0.0",
+				"js-tokens": "^9.0.0",
 				"postcss": "^8.4.0",
 				"postcss-safe-parser": "^6.0.0"
 			},
-			"dependencies": {
-				"js-tokens": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.0.tgz",
-					"integrity": "sha512-PC7MzqInq9OqKyTXfIvQNcjMkODJYC8A17kAaQgeW79yfhqTWSOfjHYQ2mDDcwJ96Iibtwkfh0C7R/OvqPlgVA==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": "^12 || >=14"
 			}
 		},
-		"postcss-media-query-parser": {
+		"node_modules/postcss-html/node_modules/js-tokens": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
+			"integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/postcss-media-query-parser": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
 			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
 			"dev": true,
 			"peer": true
 		},
-		"postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+		"node_modules/postcss-modules-extract-imports": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
 		},
-		"postcss-modules-local-by-default": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-			"integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+		"node_modules/postcss-modules-local-by-default": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+			"integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"icss-utils": "^5.0.0",
 				"postcss-selector-parser": "^6.0.2",
 				"postcss-value-parser": "^4.1.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+		"node_modules/postcss-modules-scope": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+			"integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-modules-values": {
+		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
 			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"icss-utils": "^5.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
+		"node_modules/postcss-resolve-nested-selector": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
+			"integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==",
 			"dev": true,
 			"peer": true
 		},
-		"postcss-safe-parser": {
+		"node_modules/postcss-safe-parser": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
 			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {}
+			"engines": {
+				"node": ">=12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
+			},
+			"peerDependencies": {
+				"postcss": "^8.3.3"
+			}
 		},
-		"postcss-scss": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.5.tgz",
-			"integrity": "sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==",
+		"node_modules/postcss-scss": {
+			"version": "4.0.9",
+			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+			"integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss-scss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
 			"peer": true,
-			"requires": {}
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.4.29"
+			}
 		},
-		"postcss-selector-parser": {
-			"version": "6.0.10",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-			"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+		"node_modules/postcss-selector-parser": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+			"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"postcss-value-parser": {
+		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 			"dev": true,
 			"peer": true
 		},
-		"prelude-ls": {
+		"node_modules/prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
 		},
-		"prettier": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-			"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-			"dev": true,
+		"node_modules/prettier": {
+			"version": "2.8.8",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+			"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
 			"optional": true,
-			"peer": true
+			"bin": {
+				"prettier": "bin-prettier.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
 		},
-		"process": {
+		"node_modules/process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
 			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.6.0"
+			}
 		},
-		"process-nextick-args": {
+		"node_modules/process-nextick-args": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
 			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
 			"dev": true,
 			"peer": true
 		},
-		"proxy-addr": {
+		"node_modules/property-information": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+			"integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/proxy-addr": {
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
 			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"forwarded": "0.2.0",
 				"ipaddr.js": "1.9.1"
 			},
-			"dependencies": {
-				"ipaddr.js": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-					"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/proxy-addr/node_modules/ipaddr.js": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"pseudomap": {
+		"node_modules/proxy-from-env": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+		},
+		"node_modules/pseudomap": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
 			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
 			"dev": true,
 			"peer": true
 		},
-		"public-encrypt": {
+		"node_modules/public-encrypt": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
 			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"bn.js": "^4.1.0",
 				"browserify-rsa": "^4.0.0",
 				"create-hash": "^1.1.0",
 				"parse-asn1": "^5.0.0",
 				"randombytes": "^2.0.1",
 				"safe-buffer": "^5.1.2"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true,
-					"peer": true
-				}
 			}
 		},
-		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+		"node_modules/public-encrypt/node_modules/bn.js": {
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true,
 			"peer": true
 		},
-		"qs": {
-			"version": "6.10.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-			"integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+		"node_modules/punycode": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"side-channel": "^1.0.4"
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"querystring": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+		"node_modules/punycode.js": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+			"integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/qs": {
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"dependencies": {
+				"side-channel": "^1.0.6"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"querystring-es3": {
+		"node_modules/querystring-es3": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
 			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.4.x"
+			}
+		},
+		"node_modules/querystringify": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
 		},
-		"queue-microtask": {
+		"node_modules/queue-microtask": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
 			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
 			"peer": true
 		},
-		"quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+		"node_modules/quick-lru": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+			"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"randombytes": {
+		"node_modules/randombytes": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"randomfill": {
+		"node_modules/randomfill": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
 			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"randombytes": "^2.0.5",
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"range-parser": {
+		"node_modules/range-parser": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
 			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+		"node_modules/raw-body": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"unpipe": "1.0.0"
 			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+		"node_modules/raw-body/node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/read-pkg": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",
+			"integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
+				"normalize-package-data": "^3.0.2",
+				"parse-json": "^5.2.0",
+				"type-fest": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=12"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz",
+			"integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"hosted-git-info": {
-					"version": "2.8.9",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-					"dev": true,
-					"peer": true
-				},
-				"normalize-package-data": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-					"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"resolve": "^1.10.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true,
-					"peer": true
-				},
-				"type-fest": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-					"dev": true,
-					"peer": true
-				}
+				"find-up": "^5.0.0",
+				"read-pkg": "^6.0.0",
+				"type-fest": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+			"integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+			"integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"type-fest": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-					"dev": true,
-					"peer": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"readable-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.1.0.tgz",
-			"integrity": "sha512-sVisi3+P2lJ2t0BPbpK629j8wRW06yKGJUcaLAGXPAUhyUxVJm7VsCTit1PFgT4JHUDMrGNR+ZjSKpzGaRF3zw==",
+		"node_modules/readable-stream": {
+			"version": "4.5.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+			"integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"abort-controller": "^3.0.0"
+			"dependencies": {
+				"abort-controller": "^3.0.0",
+				"buffer": "^6.0.3",
+				"events": "^3.3.0",
+				"process": "^0.11.10",
+				"string_decoder": "^1.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"readdirp": {
+		"node_modules/readdirp": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
 			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"devOptional": true,
-			"requires": {
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
 			}
 		},
-		"rechoir": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-			"integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+		"node_modules/rechoir": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"resolve": "^1.9.0"
+			"dependencies": {
+				"resolve": "^1.20.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
 			}
 		},
-		"redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+		"node_modules/redent": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",
+			"integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
+			"dependencies": {
+				"indent-string": "^5.0.0",
+				"strip-indent": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"regenerate": {
+		"node_modules/regenerate": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+			"dev": true,
+			"peer": true
 		},
-		"regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-			"requires": {
+		"node_modules/regenerate-unicode-properties": {
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+			"integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"regenerate": "^1.4.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-		},
-		"regenerator-transform": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-			"integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-			"requires": {
+		"node_modules/regenerator-transform": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"@babel/runtime": "^7.8.4"
 			}
 		},
-		"regexp.prototype.flags": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-			"integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+		"node_modules/regexp.prototype.flags": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+			"integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"functions-have-names": "^1.2.2"
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"define-properties": "^1.2.1",
+				"es-errors": "^1.3.0",
+				"set-function-name": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+		"node_modules/regexpu-core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"dependencies": {
+				"@babel/regjsgen": "^0.8.0",
+				"regenerate": "^1.4.2",
+				"regenerate-unicode-properties": "^10.1.0",
+				"regjsparser": "^0.9.1",
+				"unicode-match-property-ecmascript": "^2.0.0",
+				"unicode-match-property-value-ecmascript": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/regjsparser": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"jsesc": "~0.5.0"
+			},
+			"bin": {
+				"regjsparser": "bin/parser"
+			}
+		},
+		"node_modules/regjsparser/node_modules/jsesc": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			}
+		},
+		"node_modules/rehype-external-links": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
+			"integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@ungap/structured-clone": "^1.0.0",
+				"hast-util-is-element": "^3.0.0",
+				"is-absolute-url": "^4.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"unist-util-visit": "^5.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-react": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-7.2.0.tgz",
+			"integrity": "sha512-MHYyCHka+3TtzBMKtcuvVOBAbI1HrfoYA+XH9m7/rlrQQATCPwtJnPdkxKKcIGF8vc9mxqQja9r9f+FHItQeWg==",
+			"dependencies": {
+				"@mapbox/hast-util-table-cell-style": "^0.2.0",
+				"@types/hast": "^2.0.0",
+				"hast-to-hyperscript": "^10.0.0",
+				"hast-util-whitespace": "^2.0.0",
+				"unified": "^10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			},
+			"peerDependencies": {
+				"@types/react": ">=17"
+			}
+		},
+		"node_modules/rehype-react/node_modules/@types/hast": {
+			"version": "2.3.10",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
+			"integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
+			"dependencies": {
+				"@types/unist": "^2"
+			}
+		},
+		"node_modules/rehype-react/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="
+		},
+		"node_modules/rehype-react/node_modules/is-buffer": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+			"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/rehype-react/node_modules/is-plain-obj": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+			"integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/rehype-react/node_modules/unified": {
+			"version": "10.1.2",
+			"resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
+			"integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"bail": "^2.0.0",
+				"extend": "^3.0.0",
+				"is-buffer": "^2.0.0",
+				"is-plain-obj": "^4.0.0",
+				"trough": "^2.0.0",
+				"vfile": "^5.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-react/node_modules/unist-util-stringify-position": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
+			"integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+			"dependencies": {
+				"@types/unist": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-react/node_modules/vfile": {
+			"version": "5.3.7",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
+			"integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"is-buffer": "^2.0.0",
+				"unist-util-stringify-position": "^3.0.0",
+				"vfile-message": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/rehype-react/node_modules/vfile-message": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
+			"integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"unist-util-stringify-position": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/remark-breaks": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-4.0.0.tgz",
+			"integrity": "sha512-IjEjJOkH4FuJvHZVIW0QCDWxcG96kCq7An/KVH2NfJe6rKZU2AsHeB3OEjPNRxi4QC34Xdx7I2KGYn6IpT7gxQ==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-newline-to-break": "^2.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"regexpu-core": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-			"integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
-			"requires": {
-				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsgen": "^0.7.1",
-				"regjsparser": "^0.9.1",
-				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.0.0"
+		"node_modules/remark-gfm": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.0.tgz",
+			"integrity": "sha512-U92vJgBPkbw4Zfu/IiW2oTZLSL3Zpv+uI7My2eq8JxKgqraFdU8YUGicEJCEgSbeaG+QDFqIcwwfMTOEelPxuA==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-gfm": "^3.0.0",
+				"micromark-extension-gfm": "^3.0.0",
+				"remark-parse": "^11.0.0",
+				"remark-stringify": "^11.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"regjsgen": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-			"integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
+		"node_modules/remark-parse": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
+			"integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-			"requires": {
-				"jsesc": "~0.5.0"
+		"node_modules/remark-rehype": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-11.1.0.tgz",
+			"integrity": "sha512-z3tJrAs2kIs1AqIIy6pzHmAHlF1hWQ+OdY4/hv+Wxe35EhyLKcajL33iUEn3ScxtFox9nUvRufR/Zre8Q08H/g==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"mdast-util-to-hast": "^13.0.0",
+				"unified": "^11.0.0",
+				"vfile": "^6.0.0"
 			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/remark-stringify": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
+			"integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
 			"dependencies": {
-				"jsesc": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-					"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
-				}
+				"@types/mdast": "^4.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"require-from-string": {
+		"node_modules/require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"requireindex": {
+		"node_modules/requireindex": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
 			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.10.5"
+			}
 		},
-		"requires-port": {
+		"node_modules/requires-port": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-			"dev": true,
-			"peer": true
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
 		},
-		"resolve": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-			"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-			"requires": {
-				"is-core-module": "^2.9.0",
+		"node_modules/resolve": {
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
 				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"resolve-cwd": {
+		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
 			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"resolve-from": "^5.0.0"
 			},
-			"dependencies": {
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-cwd/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"resolve-from": {
+		"node_modules/resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
 			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve-pkg-maps": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+			"integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+			"dev": true,
+			"peer": true,
+			"funding": {
+				"url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+			}
+		},
+		"node_modules/resolve.exports": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+			"integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"retry": {
+		"node_modules/retry": {
 			"version": "0.13.1",
 			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
 			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 4"
+			}
 		},
-		"reusify": {
+		"node_modules/reusify": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
 			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
 		},
-		"rimraf": {
+		"node_modules/rimraf": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
 			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"glob": "^7.1.3"
 			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"ripemd160": {
+		"node_modules/ripemd160": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1"
 			}
 		},
-		"run-parallel": {
+		"node_modules/run-parallel": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
 			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"queue-microtask": "^1.2.2"
 			}
 		},
-		"safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		"node_modules/safe-array-concat": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+			"integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"get-intrinsic": "^1.2.4",
+				"has-symbols": "^1.0.3",
+				"isarray": "^2.0.5"
+			},
+			"engines": {
+				"node": ">=0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"peer": true
+		},
+		"node_modules/safe-regex-test": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+			"integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.6",
+				"es-errors": "^1.3.0",
+				"is-regex": "^1.1.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"safer-buffer": {
+		"node_modules/safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 			"dev": true,
 			"peer": true
 		},
-		"sass": {
-			"version": "1.54.9",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
-			"integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
+		"node_modules/sass": {
+			"version": "1.77.8",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz",
+			"integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"chokidar": ">=3.0.0 <4.0.0",
 				"immutable": "^4.0.0",
 				"source-map-js": ">=0.6.2 <2.0.0"
+			},
+			"bin": {
+				"sass": "sass.js"
+			},
+			"engines": {
+				"node": ">=14.0.0"
 			}
 		},
-		"sass-loader": {
-			"version": "13.0.2",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
-			"integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
+		"node_modules/sass-loader": {
+			"version": "13.3.3",
+			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
+			"integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"klona": "^2.0.4",
+			"dependencies": {
 				"neo-async": "^2.6.2"
+			},
+			"engines": {
+				"node": ">= 14.15.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"fibers": ">= 3.1.0",
+				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+				"sass": "^1.3.0",
+				"sass-embedded": "*",
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"fibers": {
+					"optional": true
+				},
+				"node-sass": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				}
 			}
 		},
-		"schema-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+		"node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"@types/json-schema": "^7.0.5",
-				"ajv": "^6.12.4",
-				"ajv-keywords": "^3.5.2"
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"scrollparent": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz",
-			"integrity": "sha512-HSdN78VMvFCSGCkh0oYX/tY4R3P1DW61f8+TeZZ4j2VLgfwvw0bpRSOv4PCVKisktIwbzHCfZsx+rLbbDBqIBA=="
+		"node_modules/schema-utils/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/schema-utils/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/schema-utils/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true,
+			"peer": true
 		},
-		"select-hose": {
+		"node_modules/select-hose": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
 			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
 			"dev": true,
 			"peer": true
 		},
-		"selfsigned": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+		"node_modules/selfsigned": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+			"integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
+				"@types/node-forge": "^1.3.0",
 				"node-forge": "^1"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+		"node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
 		},
-		"send": {
+		"node_modules/send": {
 			"version": "0.18.0",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
 			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
 				"destroy": "1.2.0",
@@ -18984,51 +12615,51 @@
 				"range-parser": "~1.2.1",
 				"statuses": "2.0.1"
 			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/send/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-							"dev": true,
-							"peer": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-					"dev": true,
-					"peer": true
-				}
+				"ms": "2.0.0"
 			}
 		},
-		"serialize-javascript": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+		"node_modules/send/node_modules/debug/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/send/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
 		},
-		"serve-index": {
+		"node_modules/serve-index": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
 			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"accepts": "~1.3.4",
 				"batch": "0.6.1",
 				"debug": "2.6.9",
@@ -19037,1126 +12668,1856 @@
 				"mime-types": "~2.1.17",
 				"parseurl": "~1.3.2"
 			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-					"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-					"dev": true,
-					"peer": true
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-					"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-					"dev": true,
-					"peer": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true,
-					"peer": true
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-					"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-					"dev": true,
-					"peer": true
-				},
-				"statuses": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-					"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-					"dev": true,
-					"peer": true
-				}
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/depd": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/serve-index/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/serve-index/node_modules/setprototypeof": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/serve-index/node_modules/statuses": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"serve-static": {
+		"node_modules/serve-static": {
 			"version": "1.15.0",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
 			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
 				"parseurl": "~1.3.3",
 				"send": "0.18.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/set-function-length": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"setimmediate": {
+		"node_modules/set-function-name": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+			"integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"functions-have-names": "^1.2.3",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
 			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
 			"dev": true,
 			"peer": true
 		},
-		"setprototypeof": {
+		"node_modules/setprototypeof": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
 			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
 			"dev": true,
 			"peer": true
 		},
-		"sha.js": {
+		"node_modules/sha.js": {
 			"version": "2.4.11",
 			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"inherits": "^2.0.1",
 				"safe-buffer": "^5.0.1"
+			},
+			"bin": {
+				"sha.js": "bin.js"
 			}
 		},
-		"shallow-clone": {
+		"node_modules/shallow-clone": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
 			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"kind-of": "^6.0.2"
 			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true,
-					"peer": true
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"shebang-command": {
+		"node_modules/shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"shebang-regex": {
+		"node_modules/shebang-regex": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+		"node_modules/shell-quote": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/shiki": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/shiki/-/shiki-1.14.1.tgz",
+			"integrity": "sha512-FujAN40NEejeXdzPt+3sZ3F2dx1U24BY2XTY01+MG8mbxCiA2XukXdcbyMyLAHJ/1AUUnQd1tZlvIjefWWEJeA==",
+			"peer": true,
+			"dependencies": {
+				"@shikijs/core": "1.14.1",
+				"@types/hast": "^3.0.4"
+			}
+		},
+		"node_modules/side-channel": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4",
+				"object-inspect": "^1.13.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"signal-exit": {
+		"node_modules/signal-exit": {
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
 			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
 			"dev": true,
 			"peer": true
 		},
-		"slash": {
+		"node_modules/slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
 			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"slice-ansi": {
+		"node_modules/slice-ansi": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
 			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"astral-regex": "^2.0.0",
 				"is-fullwidth-code-point": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true,
-					"peer": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"sockjs": {
+		"node_modules/slice-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/sockjs": {
 			"version": "0.3.24",
 			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
 			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"faye-websocket": "^0.11.3",
 				"uuid": "^8.3.2",
 				"websocket-driver": "^0.7.4"
 			}
 		},
-		"source-map": {
+		"node_modules/source-map": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+		"node_modules/source-map-js": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+			"integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"source-map-support": {
+		"node_modules/source-map-support": {
 			"version": "0.5.21",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
 			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
 			}
 		},
-		"spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+		"node_modules/space-separated-tokens": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+			"integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/spdx-correct": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+			"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"spdx-expression-parse": "^3.0.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true,
-			"peer": true
-		},
-		"spdx-expression-parse": {
+		"node_modules/spdx-correct/node_modules/spdx-expression-parse": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
 			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-exceptions": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+			"integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/spdx-expression-parse": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+			"integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.12",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-			"integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.20",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+			"integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
 			"dev": true,
 			"peer": true
 		},
-		"spdy": {
+		"node_modules/spdy": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
 			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"debug": "^4.1.0",
 				"handle-thing": "^2.0.0",
 				"http-deceiver": "^1.2.7",
 				"select-hose": "^2.0.0",
 				"spdy-transport": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"spdy-transport": {
+		"node_modules/spdy-transport": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
 			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"debug": "^4.1.0",
 				"detect-node": "^2.0.4",
 				"hpack.js": "^2.1.6",
 				"obuf": "^1.1.2",
 				"readable-stream": "^3.0.6",
 				"wbuf": "^1.7.3"
-			},
+			}
+		},
+		"node_modules/spdy-transport/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"splitpanes": {
+		"node_modules/splitpanes": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/splitpanes/-/splitpanes-2.4.1.tgz",
 			"integrity": "sha512-kpEo1WuMXuc6QfdQdO2V/fl/trONlkUKp+pputsLTiW9RMtwEvjb4/aYGm2m3+KAzjmb+zLwr4A4SYZu74+pgQ=="
 		},
-		"statuses": {
+		"node_modules/statuses": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
 			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"stream-browserify": {
+		"node_modules/stream-browserify": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
 			"integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"inherits": "~2.0.4",
 				"readable-stream": "^3.5.0"
-			},
+			}
+		},
+		"node_modules/stream-browserify/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"stream-http": {
+		"node_modules/stream-http": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
 			"integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"builtin-status-codes": "^3.0.0",
 				"inherits": "^2.0.4",
 				"readable-stream": "^3.6.0",
 				"xtend": "^4.0.2"
-			},
+			}
+		},
+		"node_modules/stream-http/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"string_decoder": {
+		"node_modules/string_decoder": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
 			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"safe-buffer": "~5.2.0"
-			},
 			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true,
-					"peer": true
-				}
+				"safe-buffer": "~5.2.0"
 			}
 		},
-		"string-length": {
+		"node_modules/string-length": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
 			"integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-			"requires": {
+			"dependencies": {
 				"char-regex": "^2.0.0",
 				"strip-ansi": "^7.0.1"
 			},
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/string-length/node_modules/ansi-regex": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
+			}
+		},
+		"node_modules/string-length/node_modules/strip-ansi": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-				},
-				"strip-ansi": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-					"integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-					"requires": {
-						"ansi-regex": "^6.0.1"
-					}
-				}
+				"ansi-regex": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
 			}
 		},
-		"string-width": {
+		"node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
 				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"string.prototype.trimend": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-			"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+		"node_modules/string.prototype.trim": {
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+			"integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.0",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"string.prototype.trimstart": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-			"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+		"node_modules/string.prototype.trimend": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+			"integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/string.prototype.trimstart": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+			"integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"strip-ansi": {
+		"node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"strip-bom": {
+		"node_modules/strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
 			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"strip-final-newline": {
+		"node_modules/strip-final-newline": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
 			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"strip-indent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+		"node_modules/strip-indent": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
+			"integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"min-indent": "^1.0.0"
+			"dependencies": {
+				"min-indent": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"strip-json-comments": {
+		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"striptags": {
+		"node_modules/striptags": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
 			"integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw=="
 		},
-		"style-loader": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-			"integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-			"requires": {}
+		"node_modules/strnum": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+			"integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+		},
+		"node_modules/style-loader": {
+			"version": "3.3.4",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+			"integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
 		},
-		"style-search": {
+		"node_modules/style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
 			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
 			"dev": true,
 			"peer": true
 		},
-		"stylelint": {
-			"version": "14.12.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.12.0.tgz",
-			"integrity": "sha512-9Sa+IsT31PN9zf9q5ZVZNvhT6jMVu6YhpI38g3Akn7vONipGL0GNd9QCblwtJ3ysaoM80P/+9mOcFB1xnytiQQ==",
+		"node_modules/style-to-object": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.4.tgz",
+			"integrity": "sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==",
+			"dependencies": {
+				"inline-style-parser": "0.1.1"
+			}
+		},
+		"node_modules/stylelint": {
+			"version": "15.11.0",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz",
+			"integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"@csstools/selector-specificity": "^2.0.2",
+			"dependencies": {
+				"@csstools/css-parser-algorithms": "^2.3.1",
+				"@csstools/css-tokenizer": "^2.2.0",
+				"@csstools/media-query-list-parser": "^2.1.4",
+				"@csstools/selector-specificity": "^3.0.0",
 				"balanced-match": "^2.0.0",
 				"colord": "^2.9.3",
-				"cosmiconfig": "^7.0.1",
-				"css-functions-list": "^3.1.0",
+				"cosmiconfig": "^8.2.0",
+				"css-functions-list": "^3.2.1",
+				"css-tree": "^2.3.1",
 				"debug": "^4.3.4",
-				"fast-glob": "^3.2.12",
+				"fast-glob": "^3.3.1",
 				"fastest-levenshtein": "^1.0.16",
-				"file-entry-cache": "^6.0.1",
+				"file-entry-cache": "^7.0.0",
 				"global-modules": "^2.0.0",
 				"globby": "^11.1.0",
 				"globjoin": "^0.1.4",
-				"html-tags": "^3.2.0",
-				"ignore": "^5.2.0",
+				"html-tags": "^3.3.1",
+				"ignore": "^5.2.4",
 				"import-lazy": "^4.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.25.0",
+				"known-css-properties": "^0.29.0",
 				"mathml-tag-names": "^2.1.3",
-				"meow": "^9.0.0",
+				"meow": "^10.1.5",
 				"micromatch": "^4.0.5",
 				"normalize-path": "^3.0.0",
 				"picocolors": "^1.0.0",
-				"postcss": "^8.4.16",
-				"postcss-media-query-parser": "^0.2.3",
+				"postcss": "^8.4.28",
 				"postcss-resolve-nested-selector": "^0.1.1",
 				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.10",
+				"postcss-selector-parser": "^6.0.13",
 				"postcss-value-parser": "^4.2.0",
 				"resolve-from": "^5.0.0",
 				"string-width": "^4.2.3",
 				"strip-ansi": "^6.0.1",
 				"style-search": "^0.1.0",
-				"supports-hyperlinks": "^2.3.0",
+				"supports-hyperlinks": "^3.0.0",
 				"svg-tags": "^1.0.0",
-				"table": "^6.8.0",
-				"v8-compile-cache": "^2.3.0",
-				"write-file-atomic": "^4.0.2"
+				"table": "^6.8.1",
+				"write-file-atomic": "^5.0.1"
+			},
+			"bin": {
+				"stylelint": "bin/stylelint.mjs"
+			},
+			"engines": {
+				"node": "^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/stylelint"
+			}
+		},
+		"node_modules/stylelint-config-html": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz",
+			"integrity": "sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": "^12 || >=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ota-meshi"
+			},
+			"peerDependencies": {
+				"postcss-html": "^1.0.0",
+				"stylelint": ">=14.0.0"
+			}
+		},
+		"node_modules/stylelint-config-recommended": {
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz",
+			"integrity": "sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": "^14.13.1 || >=16.0.0"
 			},
+			"peerDependencies": {
+				"stylelint": "^15.10.0"
+			}
+		},
+		"node_modules/stylelint-config-recommended-scss": {
+			"version": "13.1.0",
+			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.1.0.tgz",
+			"integrity": "sha512-8L5nDfd+YH6AOoBGKmhH8pLWF1dpfY816JtGMePcBqqSsLU+Ysawx44fQSlMOJ2xTfI9yTGpup5JU77c17w1Ww==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"balanced-match": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-					"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-					"dev": true,
-					"peer": true
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true,
-					"peer": true
+				"postcss-scss": "^4.0.9",
+				"stylelint-config-recommended": "^13.0.0",
+				"stylelint-scss": "^5.3.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.3.3",
+				"stylelint": "^15.10.0"
+			},
+			"peerDependenciesMeta": {
+				"postcss": {
+					"optional": true
 				}
 			}
 		},
-		"stylelint-config-html": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz",
-			"integrity": "sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==",
+		"node_modules/stylelint-config-recommended-vue": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.5.0.tgz",
+			"integrity": "sha512-65TAK/clUqkNtkZLcuytoxU0URQYlml+30Nhop7sRkCZ/mtWdXt7T+spPSB3KMKlb+82aEVJ4OrcstyDBdbosg==",
 			"dev": true,
 			"peer": true,
-			"requires": {}
+			"dependencies": {
+				"semver": "^7.3.5",
+				"stylelint-config-html": ">=1.0.0",
+				"stylelint-config-recommended": ">=6.0.0"
+			},
+			"engines": {
+				"node": "^12 || >=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ota-meshi"
+			},
+			"peerDependencies": {
+				"postcss-html": "^1.0.0",
+				"stylelint": ">=14.0.0"
+			}
 		},
-		"stylelint-config-recommended": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-8.0.0.tgz",
-			"integrity": "sha512-IK6dWvE000+xBv9jbnHOnBq01gt6HGVB2ZTsot+QsMpe82doDQ9hvplxfv4YnpEuUwVGGd9y6nbaAnhrjcxhZQ==",
+		"node_modules/stylelint-config-recommended-vue/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
 			"peer": true,
-			"requires": {}
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"stylelint-config-recommended-scss": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-7.0.0.tgz",
-			"integrity": "sha512-rGz1J4rMAyJkvoJW4hZasuQBB7y9KIrShb20l9DVEKKZSEi1HAy0vuNlR8HyCKy/jveb/BdaQFcoiYnmx4HoiA==",
+		"node_modules/stylelint-scss": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.3.2.tgz",
+			"integrity": "sha512-4LzLaayFhFyneJwLo0IUa8knuIvj+zF0vBFueQs4e3tEaAMIQX8q5th8ziKkgOavr6y/y9yoBe+RXN/edwLzsQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"postcss-scss": "^4.0.2",
-				"stylelint-config-recommended": "^8.0.0",
-				"stylelint-scss": "^4.0.0"
+			"dependencies": {
+				"known-css-properties": "^0.29.0",
+				"postcss-media-query-parser": "^0.2.3",
+				"postcss-resolve-nested-selector": "^0.1.1",
+				"postcss-selector-parser": "^6.0.13",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"peerDependencies": {
+				"stylelint": "^14.5.1 || ^15.0.0"
 			}
 		},
-		"stylelint-config-recommended-vue": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz",
-			"integrity": "sha512-DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q==",
+		"node_modules/stylelint/node_modules/balanced-match": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/stylelint/node_modules/file-entry-cache": {
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.2.tgz",
+			"integrity": "sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"semver": "^7.3.5",
-				"stylelint-config-html": ">=1.0.0",
-				"stylelint-config-recommended": ">=6.0.0"
-			},
 			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
+				"flat-cache": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=12.0.0"
 			}
 		},
-		"stylelint-scss": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
-			"integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
+		"node_modules/stylelint/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"lodash": "^4.17.21",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-selector-parser": "^6.0.6",
-				"postcss-value-parser": "^4.1.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"supports-color": {
+		"node_modules/supports-color": {
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"requires": {
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"supports-hyperlinks": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-			"integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+		"node_modules/supports-hyperlinks": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
+			"integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"has-flag": "^4.0.0",
 				"supports-color": "^7.0.0"
 			},
+			"engines": {
+				"node": ">=14.18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-hyperlinks/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-hyperlinks/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true,
-					"peer": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"supports-preserve-symlinks-flag": {
+		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"svg-tags": {
+		"node_modules/svg-tags": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
 			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
 			"dev": true,
 			"peer": true
 		},
-		"tabbable": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-			"integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
+		"node_modules/tabbable": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+			"integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
 		},
-		"table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+		"node_modules/table": {
+			"version": "6.8.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+			"integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"ajv": "^8.0.1",
 				"lodash.truncate": "^4.4.2",
 				"slice-ansi": "^4.0.0",
 				"string-width": "^4.2.3",
 				"strip-ansi": "^6.0.1"
 			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/table/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true,
-					"peer": true
-				}
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"tapable": {
+		"node_modules/table/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/tapable": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
 			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"peer": true
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"terser": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-			"integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
+		"node_modules/terser": {
+			"version": "5.31.6",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+			"integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+			"dev": true,
 			"peer": true,
-			"requires": {
-				"@jridgewell/source-map": "^0.3.2",
-				"acorn": "^8.5.0",
+			"dependencies": {
+				"@jridgewell/source-map": "^0.3.3",
+				"acorn": "^8.8.2",
 				"commander": "^2.20.0",
 				"source-map-support": "~0.5.20"
+			},
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"terser-webpack-plugin": {
-			"version": "5.3.6",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-			"integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+		"node_modules/terser-webpack-plugin": {
+			"version": "5.3.10",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+			"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+			"dev": true,
 			"peer": true,
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.14",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.20",
 				"jest-worker": "^27.4.5",
 				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.0",
-				"terser": "^5.14.1"
-			},
-			"dependencies": {
-				"schema-utils": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-					"peer": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
+				"serialize-javascript": "^6.0.1",
+				"terser": "^5.26.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				},
+				"uglify-js": {
+					"optional": true
 				}
 			}
 		},
-		"text-table": {
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
 			"dev": true,
 			"peer": true
 		},
-		"thunky": {
+		"node_modules/thunky": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
 			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
 			"dev": true,
 			"peer": true
 		},
-		"timers-browserify": {
+		"node_modules/timers-browserify": {
 			"version": "2.0.12",
 			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
 			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"setimmediate": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"tinycolor2": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
-			"integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="
+		"node_modules/tinycolor2": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
+			"integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="
 		},
-		"to-fast-properties": {
+		"node_modules/to-fast-properties": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"to-regex-range": {
+		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"devOptional": true,
-			"requires": {
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"toastify-js": {
+		"node_modules/toastify-js": {
 			"version": "1.12.0",
 			"resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz",
 			"integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ=="
 		},
-		"toidentifier": {
+		"node_modules/toidentifier": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
 			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/tributejs": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
+			"integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
+		},
+		"node_modules/trim-lines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+			"integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/trim-newlines": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz",
+			"integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"tributejs": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
-			"integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
+		"node_modules/trough": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+			"integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
-		"trim-newlines": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+		"node_modules/ts-api-utils": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+			"integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=16"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.2.0"
+			}
 		},
-		"tsconfig-paths": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-			"integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+		"node_modules/tsconfig-paths": {
+			"version": "3.15.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+			"integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@types/json5": "^0.0.29",
-				"json5": "^1.0.1",
+				"json5": "^1.0.2",
 				"minimist": "^1.2.6",
 				"strip-bom": "^3.0.0"
-			},
-			"dependencies": {
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				}
 			}
 		},
-		"tslib": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-			"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+		"node_modules/tsconfig-paths/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
 		},
-		"tty-browserify": {
+		"node_modules/tty-browserify": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
 			"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
 			"dev": true,
 			"peer": true
 		},
-		"type-check": {
+		"node_modules/type-check": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
 			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"type-fest": {
+		"node_modules/type-fest": {
 			"version": "2.19.0",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
 			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"type-is": {
+		"node_modules/type-is": {
 			"version": "1.6.18",
 			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
 			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"media-typer": "0.3.0",
 				"mime-types": "~2.1.24"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/typed-array-buffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+			"integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/typed-array-byte-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+			"integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-proto": "^1.0.3",
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typed-array-byte-offset": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+			"integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-proto": "^1.0.3",
+				"is-typed-array": "^1.1.13"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typed-array-length": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+			"integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-proto": "^1.0.3",
+				"is-typed-array": "^1.1.13",
+				"possible-typed-array-names": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typedoc": {
+			"version": "0.26.6",
+			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.6.tgz",
+			"integrity": "sha512-SfEU3SH3wHNaxhFPjaZE2kNl/NFtLNW5c1oHsg7mti7GjmUj1Roq6osBQeMd+F4kL0BoRBBr8gQAuqBlfFu8LA==",
+			"peer": true,
+			"dependencies": {
+				"lunr": "^2.3.9",
+				"markdown-it": "^14.1.0",
+				"minimatch": "^9.0.5",
+				"shiki": "^1.9.1",
+				"yaml": "^2.4.5"
+			},
+			"bin": {
+				"typedoc": "bin/typedoc"
+			},
+			"engines": {
+				"node": ">= 18"
+			},
+			"peerDependencies": {
+				"typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x"
+			}
+		},
+		"node_modules/typedoc-plugin-missing-exports": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/typedoc-plugin-missing-exports/-/typedoc-plugin-missing-exports-3.0.0.tgz",
+			"integrity": "sha512-R7D8fYrK34mBFZSlF1EqJxfqiUSlQSmyrCiQgTQD52nNm6+kUtqwiaqaNkuJ2rA2wBgWFecUA8JzHT7x2r7ePg==",
+			"peerDependencies": {
+				"typedoc": "0.26.x"
+			}
+		},
+		"node_modules/typedoc/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"peer": true,
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "5.5.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+			"integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+			"peer": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=14.17"
 			}
 		},
-		"unbox-primitive": {
+		"node_modules/typescript-event-target": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/typescript-event-target/-/typescript-event-target-1.1.1.tgz",
+			"integrity": "sha512-dFSOFBKV6uwaloBCCUhxlD3Pr/P1a/tJdcmPrTXCHlEFD3faj0mztjcGn6VBAhQ0/Bdy8K3VWrrqwbt/ffsYsg=="
+		},
+		"node_modules/uc.micro": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+			"integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+			"peer": true
+		},
+		"node_modules/unbox-primitive": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
 			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-bigints": "^1.0.2",
 				"has-symbols": "^1.0.3",
 				"which-boxed-primitive": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"unicode-canonical-property-names-ecmascript": {
+		"node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+		},
+		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
+			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unicode-match-property-ecmascript": {
+		"node_modules/unicode-match-property-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
 			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-			"requires": {
+			"dev": true,
+			"peer": true,
+			"dependencies": {
 				"unicode-canonical-property-names-ecmascript": "^2.0.0",
 				"unicode-property-aliases-ecmascript": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"unicode-match-property-value-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+		"node_modules/unicode-match-property-value-ecmascript": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unicode-property-aliases-ecmascript": {
+		"node_modules/unicode-property-aliases-ecmascript": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
+			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unified": {
+			"version": "11.0.5",
+			"resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz",
+			"integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"bail": "^2.0.0",
+				"devlop": "^1.0.0",
+				"extend": "^3.0.0",
+				"is-plain-obj": "^4.0.0",
+				"trough": "^2.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unified/node_modules/is-plain-obj": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+			"integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/unist-builder": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-4.0.0.tgz",
+			"integrity": "sha512-wmRFnH+BLpZnTKpc5L7O67Kac89s9HMrtELpnNaE6TAobq5DTZZs5YaTQfAZBA9bFPECx2uVAPO31c+GVug8mg==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unist-util-is": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+			"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unist-util-position": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+			"integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unist-util-stringify-position": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+			"integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unist-util-visit": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+			"integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-is": "^6.0.0",
+				"unist-util-visit-parents": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unist-util-visit-parents": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+			"integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-is": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"unpipe": {
+		"node_modules/unpipe": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
 			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"update-browserslist-db": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-			"integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
-			"requires": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+		"node_modules/update-browserslist-db": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+			"integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"peer": true,
+			"dependencies": {
+				"escalade": "^3.1.2",
+				"picocolors": "^1.0.1"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
 			}
 		},
-		"uri-js": {
+		"node_modules/uri-js": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
 			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"punycode": "^2.1.0"
 			}
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+		"node_modules/url": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
+			"dependencies": {
+				"punycode": "^1.4.1",
+				"qs": "^6.12.3"
 			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/url-join": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz",
+			"integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==",
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			}
+		},
+		"node_modules/url-parse": {
+			"version": "1.5.10",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-					"dev": true,
-					"peer": true
-				}
+				"querystringify": "^2.1.1",
+				"requires-port": "^1.0.0"
 			}
 		},
-		"util": {
-			"version": "0.12.4",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-			"integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+		"node_modules/url/node_modules/punycode": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+			"dev": true,
+			"peer": true
+		},
+		"node_modules/util": {
+			"version": "0.12.5",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"inherits": "^2.0.3",
 				"is-arguments": "^1.0.4",
 				"is-generator-function": "^1.0.7",
 				"is-typed-array": "^1.1.3",
-				"safe-buffer": "^5.1.2",
 				"which-typed-array": "^1.1.2"
 			}
 		},
-		"util-deprecate": {
+		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
 			"dev": true,
 			"peer": true
 		},
-		"utils-merge": {
+		"node_modules/utils-merge": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
 			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.4.0"
+			}
 		},
-		"uuid": {
+		"node_modules/uuid": {
 			"version": "8.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
 			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"peer": true
-		},
-		"v-click-outside": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz",
-			"integrity": "sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w=="
-		},
-		"v-tooltip": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.1.3.tgz",
-			"integrity": "sha512-xXngyxLQTOx/yUEy50thb8te7Qo4XU6h4LZB6cvEfVd9mnysUxLEoYwGWDdqR+l69liKsy3IPkdYff3J1gAJ5w==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"lodash": "^4.17.21",
-				"popper.js": "^1.16.1",
-				"vue-resize": "^1.0.1"
-			}
-		},
-		"v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
 		},
-		"validate-npm-package-license": {
+		"node_modules/validate-npm-package-license": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"spdx-correct": "^3.0.0",
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"vary": {
+		"node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/vary": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
 			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/vfile": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.2.tgz",
+			"integrity": "sha512-zND7NlS8rJYb/sPqkb13ZvbbUoExdbi4w3SfRrMq6R3FvnLQmmfpajJNITuuYm6AZ5uao9vy4BAos3EXBPf2rg==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-stringify-position": "^4.0.0",
+				"vfile-message": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/vfile-message": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+			"integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-stringify-position": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"vm-browserify": {
+		"node_modules/vm-browserify": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
 			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
 			"dev": true,
 			"peer": true
 		},
-		"vue": {
-			"version": "2.7.10",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
-			"integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
-			"requires": {
-				"@vue/compiler-sfc": "2.7.10",
+		"node_modules/vue": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+			"integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+			"deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+			"dependencies": {
+				"@vue/compiler-sfc": "2.7.16",
 				"csstype": "^3.1.0"
 			}
 		},
-		"vue-color": {
+		"node_modules/vue-color": {
 			"version": "2.8.1",
 			"resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz",
 			"integrity": "sha512-BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==",
-			"requires": {
+			"dependencies": {
 				"clamp": "^1.0.1",
 				"lodash.throttle": "^4.0.0",
 				"material-colors": "^1.0.0",
 				"tinycolor2": "^1.1.2"
 			}
 		},
-		"vue-eslint-parser": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
-			"integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
+		"node_modules/vue-eslint-parser": {
+			"version": "9.4.3",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",
+			"integrity": "sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"debug": "^4.3.4",
 				"eslint-scope": "^7.1.1",
 				"eslint-visitor-keys": "^3.3.0",
@@ -20165,382 +14526,416 @@
 				"lodash": "^4.17.21",
 				"semver": "^7.3.6"
 			},
+			"engines": {
+				"node": "^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=6.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+			"dev": true,
+			"peer": true,
 			"dependencies": {
-				"eslint-scope": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-					"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-					"dev": true,
-					"peer": true
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true,
-					"peer": true
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true,
-					"peer": true
-				}
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"dev": true,
+			"peer": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/vue-frag": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/vue-frag/-/vue-frag-1.4.3.tgz",
+			"integrity": "sha512-pQZj03f/j9LRhzz9vKaXTCXUHVYHuAXicshFv76VFqwz4MG3bcb+sPZMAbd0wmw7THjkrTPuoM0EG9TbG8CgMQ==",
+			"funding": {
+				"url": "https://github.com/privatenumber/vue-frag?sponsor=1"
+			},
+			"peerDependencies": {
+				"vue": "^2.6.0"
 			}
 		},
-		"vue-hot-reload-api": {
+		"node_modules/vue-hot-reload-api": {
 			"version": "2.3.4",
 			"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
 			"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
 			"dev": true,
 			"peer": true
 		},
-		"vue-loader": {
-			"version": "15.10.0",
-			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
-			"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+		"node_modules/vue-loader": {
+			"version": "15.11.1",
+			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
+			"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@vue/component-compiler-utils": "^3.1.0",
 				"hash-sum": "^1.0.2",
 				"loader-utils": "^1.1.0",
 				"vue-hot-reload-api": "^2.3.0",
 				"vue-style-loader": "^4.1.0"
 			},
-			"dependencies": {
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
+			"peerDependencies": {
+				"css-loader": "*",
+				"webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
+			},
+			"peerDependenciesMeta": {
+				"cache-loader": {
+					"optional": true
+				},
+				"prettier": {
+					"optional": true
 				},
-				"loader-utils": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-					"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
-					}
+				"vue-template-compiler": {
+					"optional": true
 				}
 			}
 		},
-		"vue-material-design-icons": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.1.2.tgz",
-			"integrity": "sha512-nD1qFM2qAkMlVoe23EfNKIeMfYl6YjHZjSty9q0mwc2gXmPmvEhixywJQhM+VF5KVBI1zAkVTNLoUEERPY10pA=="
-		},
-		"vue-multiselect": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
-			"integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w=="
-		},
-		"vue-observe-visibility": {
-			"version": "0.4.6",
-			"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
-			"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
-		},
-		"vue-password-strength-meter": {
+		"node_modules/vue-password-strength-meter": {
 			"version": "1.7.2",
 			"resolved": "https://registry.npmjs.org/vue-password-strength-meter/-/vue-password-strength-meter-1.7.2.tgz",
 			"integrity": "sha512-S17DsEbXciTcI0fKq1PXia7i3COM/AJOT7os8AVyGxglc5ho1EBssE+ogDa5cFh6Rn8pPgqfVCt/KBcNpgPBiA==",
-			"requires": {}
+			"engines": {
+				"node": ">= 4.0.0",
+				"npm": ">= 3.0.0"
+			},
+			"peerDependencies": {
+				"zxcvbn": "^4.4.2"
+			}
 		},
-		"vue-resize": {
+		"node_modules/vue-resize": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
 			"integrity": "sha512-z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w==",
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.13.10"
+			},
+			"peerDependencies": {
+				"vue": "^2.6.0"
 			}
 		},
-		"vue-style-loader": {
+		"node_modules/vue-router": {
+			"version": "3.6.5",
+			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
+			"integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
+		},
+		"node_modules/vue-style-loader": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
 			"integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"hash-sum": "^1.0.2",
 				"loader-utils": "^1.0.2"
-			},
-			"dependencies": {
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				},
-				"loader-utils": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-					"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
-					}
-				}
 			}
 		},
-		"vue-template-compiler": {
-			"version": "2.7.10",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
-			"integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
+		"node_modules/vue-template-compiler": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+			"integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"de-indent": "^1.0.2",
 				"he": "^1.2.0"
 			}
 		},
-		"vue-template-es2015-compiler": {
+		"node_modules/vue-template-es2015-compiler": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
 			"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
 			"dev": true,
 			"peer": true
 		},
-		"vue-virtual-scroller": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz",
-			"integrity": "sha512-Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA==",
-			"requires": {
-				"scrollparent": "^2.0.1",
-				"vue-observe-visibility": "^0.4.4",
-				"vue-resize": "^0.4.5"
-			},
-			"dependencies": {
-				"vue-resize": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
-					"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
-					"requires": {}
-				}
+		"node_modules/vue2-datepicker": {
+			"version": "3.11.1",
+			"resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.11.1.tgz",
+			"integrity": "sha512-6PU/+pnp2mgZAfnSXmbdwj9516XsEvTiw61Q5SNrvvdy8W/FCxk1GAe9UZn/m9YfS5A47yK6XkcjMHbp7aFApA==",
+			"dependencies": {
+				"date-format-parse": "^0.2.7"
+			},
+			"peerDependencies": {
+				"vue": "^2.5.0"
 			}
 		},
-		"vue2-datepicker": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.11.0.tgz",
-			"integrity": "sha512-zbMkAjYwDTXZozZtkpSwqxq7nEeBt7zoHL+oQcdjEXAqzJHhmatE6sl6JSr58PMIx2WOK0c6QBXozSqT32iQAQ==",
-			"requires": {
-				"date-format-parse": "^0.2.7"
+		"node_modules/watchpack": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/wbuf": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"minimalistic-assert": "^1.0.0"
+			}
+		},
+		"node_modules/web-namespaces": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+			"integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/web-streams-polyfill": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+			"integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/webdav": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/webdav/-/webdav-5.7.1.tgz",
+			"integrity": "sha512-JVPn3nLxXJfHSRvennHsOrDYjFLkilZ1Qlw8Ff6hpqp6AvkgF7a//aOh5wA4rMp+sLZ1Km0V+iv0LyO1FIwtXg==",
+			"dependencies": {
+				"@buttercup/fetch": "^0.2.1",
+				"base-64": "^1.0.0",
+				"byte-length": "^1.0.2",
+				"entities": "^5.0.0",
+				"fast-xml-parser": "^4.4.1",
+				"hot-patcher": "^2.0.1",
+				"layerr": "^3.0.0",
+				"md5": "^2.3.0",
+				"minimatch": "^9.0.5",
+				"nested-property": "^4.0.0",
+				"node-fetch": "^3.3.2",
+				"path-posix": "^1.0.0",
+				"url-join": "^5.0.0",
+				"url-parse": "^1.5.10"
+			},
+			"engines": {
+				"node": ">=16"
+			}
+		},
+		"node_modules/webdav/node_modules/entities": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-5.0.0.tgz",
+			"integrity": "sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==",
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
-		"watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-			"peer": true,
-			"requires": {
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.1.2"
+		"node_modules/webdav/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"wbuf": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+		"node_modules/webpack": {
+			"version": "5.93.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz",
+			"integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"minimalistic-assert": "^1.0.0"
-			}
-		},
-		"webpack": {
-			"version": "5.74.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-			"integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
-			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^0.0.51",
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/wasm-edit": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
+				"@types/estree": "^1.0.5",
+				"@webassemblyjs/ast": "^1.12.1",
+				"@webassemblyjs/wasm-edit": "^1.12.1",
+				"@webassemblyjs/wasm-parser": "^1.12.1",
 				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.7.6",
-				"browserslist": "^4.14.5",
+				"acorn-import-attributes": "^1.9.5",
+				"browserslist": "^4.21.10",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.10.0",
-				"es-module-lexer": "^0.9.0",
+				"enhanced-resolve": "^5.17.0",
+				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
+				"graceful-fs": "^4.2.11",
 				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
-				"schema-utils": "^3.1.0",
+				"schema-utils": "^3.2.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.4.0",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
 				"webpack-sources": "^3.2.3"
 			},
-			"dependencies": {
-				"schema-utils": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-					"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-					"peer": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-cli": {
-			"version": "4.10.0",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
-			"integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
+		"node_modules/webpack-cli": {
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+			"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@discoveryjs/json-ext": "^0.5.0",
-				"@webpack-cli/configtest": "^1.2.0",
-				"@webpack-cli/info": "^1.5.0",
-				"@webpack-cli/serve": "^1.7.0",
+				"@webpack-cli/configtest": "^2.1.1",
+				"@webpack-cli/info": "^2.0.2",
+				"@webpack-cli/serve": "^2.0.5",
 				"colorette": "^2.0.14",
-				"commander": "^7.0.0",
+				"commander": "^10.0.1",
 				"cross-spawn": "^7.0.3",
+				"envinfo": "^7.7.3",
 				"fastest-levenshtein": "^1.0.12",
 				"import-local": "^3.0.2",
-				"interpret": "^2.2.0",
-				"rechoir": "^0.7.0",
+				"interpret": "^3.1.1",
+				"rechoir": "^0.8.0",
 				"webpack-merge": "^5.7.3"
 			},
-			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true,
-					"peer": true
+			"bin": {
+				"webpack-cli": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=14.15.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "5.x.x"
+			},
+			"peerDependenciesMeta": {
+				"@webpack-cli/generators": {
+					"optional": true
+				},
+				"webpack-bundle-analyzer": {
+					"optional": true
+				},
+				"webpack-dev-server": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-dev-middleware": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+		"node_modules/webpack-cli/node_modules/commander": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+			"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/webpack-dev-middleware": {
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+			"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"colorette": "^2.0.10",
 				"memfs": "^3.4.3",
 				"mime-types": "^2.1.31",
 				"range-parser": "^1.2.1",
 				"schema-utils": "^4.0.0"
 			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true,
-					"peer": true
-				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
-				}
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
 			}
 		},
-		"webpack-dev-server": {
-			"version": "4.11.1",
-			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-			"integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
+		"node_modules/webpack-dev-server": {
+			"version": "4.15.2",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+			"integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"@types/bonjour": "^3.5.9",
 				"@types/connect-history-api-fallback": "^1.3.5",
 				"@types/express": "^4.17.13",
 				"@types/serve-index": "^1.9.1",
 				"@types/serve-static": "^1.13.10",
 				"@types/sockjs": "^0.3.33",
-				"@types/ws": "^8.5.1",
+				"@types/ws": "^8.5.5",
 				"ansi-html-community": "^0.0.8",
 				"bonjour-service": "^1.0.11",
 				"chokidar": "^3.5.3",
@@ -20553,6 +14948,7 @@
 				"html-entities": "^2.3.2",
 				"http-proxy-middleware": "^2.0.3",
 				"ipaddr.js": "^2.0.1",
+				"launch-editor": "^2.6.0",
 				"open": "^8.0.9",
 				"p-retry": "^4.5.0",
 				"rimraf": "^3.0.2",
@@ -20561,211 +14957,298 @@
 				"serve-index": "^1.9.1",
 				"sockjs": "^0.3.24",
 				"spdy": "^4.0.2",
-				"webpack-dev-middleware": "^5.3.1",
-				"ws": "^8.4.2"
+				"webpack-dev-middleware": "^5.3.4",
+				"ws": "^8.13.0"
 			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true,
-					"peer": true
+			"bin": {
+				"webpack-dev-server": "bin/webpack-dev-server.js"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.37.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack": {
+					"optional": true
 				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
+				"webpack-cli": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-merge": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-			"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+		"node_modules/webpack-merge": {
+			"version": "5.10.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+			"integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"clone-deep": "^4.0.1",
+				"flat": "^5.0.2",
 				"wildcard": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.0.0"
 			}
 		},
-		"webpack-sources": {
+		"node_modules/webpack-sources": {
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
 			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-			"peer": true
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
 		},
-		"websocket-driver": {
+		"node_modules/websocket-driver": {
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
 			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"http-parser-js": ">=0.5.1",
 				"safe-buffer": ">=5.1.0",
 				"websocket-extensions": ">=0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"websocket-extensions": {
+		"node_modules/websocket-extensions": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
 			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
 		},
-		"which": {
+		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"which-boxed-primitive": {
+		"node_modules/which-boxed-primitive": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
 			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"is-bigint": "^1.0.1",
 				"is-boolean-object": "^1.1.0",
 				"is-number-object": "^1.0.4",
 				"is-string": "^1.0.5",
 				"is-symbol": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"which-typed-array": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-			"integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
+		"node_modules/which-typed-array": {
+			"version": "1.1.15",
+			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+			"integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
 			"dev": true,
 			"peer": true,
-			"requires": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-abstract": "^1.20.0",
+			"dependencies": {
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
 				"for-each": "^0.3.3",
-				"has-tostringtag": "^1.0.0",
-				"is-typed-array": "^1.1.9"
+				"gopd": "^1.0.1",
+				"has-tostringtag": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"wildcard": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+		"node_modules/wildcard": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
 			"dev": true,
 			"peer": true
 		},
-		"word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+		"node_modules/word-wrap": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"wrappy": {
+		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+			"dev": true,
+			"peer": true
 		},
-		"write-file-atomic": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+		"node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
 			"dev": true,
 			"peer": true,
-			"requires": {
+			"dependencies": {
 				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.7"
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/write-file-atomic/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"ws": {
-			"version": "8.8.1",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-			"integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+		"node_modules/ws": {
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
 			"dev": true,
 			"peer": true,
-			"requires": {}
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
 		},
-		"xml-name-validator": {
+		"node_modules/xml-name-validator": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
 			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=12"
+			}
 		},
-		"xtend": {
+		"node_modules/xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
 			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=0.4"
+			}
 		},
-		"yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+		"node_modules/yallist": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true,
 			"peer": true
 		},
-		"yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-			"dev": true,
-			"peer": true
+		"node_modules/yaml": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
+			"integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
+			"peer": true,
+			"bin": {
+				"yaml": "bin.mjs"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
 		},
-		"yargs-parser": {
+		"node_modules/yargs-parser": {
 			"version": "20.2.9",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
 			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"yocto-queue": {
+		"node_modules/yocto-queue": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
 			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
-			"peer": true
+			"peer": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/zwitch": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+			"integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
-		"zxcvbn": {
+		"node_modules/zxcvbn": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
 			"integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==",
diff --git a/package.json b/package.json
index 7d599379..58337c9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ecloud-accounts",
-	"version": "6.1.1",
+	"version": "8.0.0",
 	"description": "App for ecloud account management.",
 	"repository": {
 		"type": "git",
@@ -19,12 +19,12 @@
 	},
 	"dependencies": {
 		"@hcaptcha/vue-hcaptcha": "^1.3.0",
-		"@nextcloud/axios": "^2.1.0",
-		"@nextcloud/dialogs": "^3.2.0",
-		"@nextcloud/initial-state": "^2.0.0",
-		"@nextcloud/l10n": "^1.6.0",
-		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^5.4.0",
+		"@nextcloud/axios": "^2.5.0",
+		"@nextcloud/dialogs": "^5.3.6",
+		"@nextcloud/initial-state": "^2.2.0",
+		"@nextcloud/l10n": "^3.1.0",
+		"@nextcloud/router": "^3.0.1",
+		"@nextcloud/vue": "^8.16.0",
 		"vue": "^2.7.0",
 		"vue-password-strength-meter": "^1.7.2"
 	},
diff --git a/src/BecomeBetaUser.vue b/src/BecomeBetaUser.vue
index e798e33c..02640bc9 100644
--- a/src/BecomeBetaUser.vue
+++ b/src/BecomeBetaUser.vue
@@ -96,7 +96,7 @@
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
-import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
+import SettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showSuccess, showError } from '@nextcloud/dialogs'
@@ -126,7 +126,7 @@ export default {
 		async becomeBetaUser() {
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/beta/add`
+					`/apps/${this.appName}/beta/add`,
 				)
 				await Axios.post(url, {})
 				this.isBetaUser = true
@@ -138,7 +138,7 @@ export default {
 		async optOutFromBetaUser() {
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/beta/remove`
+					`/apps/${this.appName}/beta/remove`,
 				)
 				await Axios.delete(url)
 				this.isBetaUser = false
@@ -151,7 +151,7 @@ export default {
 			e.preventDefault()
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/issue/submit`
+					`/apps/${this.appName}/issue/submit`,
 				)
 				await Axios.post(url, { title: this.title, description: this.description })
 				showSuccess(t(this.appName, 'Issue submitted successfully.'))
diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 03c7d4fa..7ca5afb1 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -62,11 +62,11 @@
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
-import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'
+import SettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
 import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
-import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch.js'
+import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 const APPLICATION_NAME = 'ecloud-accounts'
 
@@ -132,7 +132,7 @@ export default {
 						params: {
 							shopEmailPostDelete: this.shopEmailPostDelete,
 						},
-					}
+					},
 				)
 				return status
 			} catch (err) {
@@ -158,7 +158,7 @@ export default {
 		async getShopUsers() {
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/shop-accounts/users`
+					`/apps/${this.appName}/shop-accounts/users`,
 				)
 				const { data } = await Axios.get(url)
 				this.shopUsers = data
@@ -167,7 +167,7 @@ export default {
 				if (e.response.status !== 404) {
 					this.disableDeleteAccountEvent()
 					showError(
-						t(APPLICATION_NAME, 'Temporary error contacting murena.com; please try again later!')
+						t(APPLICATION_NAME, 'Temporary error contacting murena.com; please try again later!'),
 					)
 					this.allowDelete = false
 				}
@@ -178,26 +178,26 @@ export default {
 			await this.disableOrEnableDeleteAccount()
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/shop-accounts/set_shop_delete_preference`
+					`/apps/${this.appName}/shop-accounts/set_shop_delete_preference`,
 				)
 				const { status } = await Axios.post(url, {
 					deleteShopAccount: this.deleteShopAccount,
 				})
 				if (status !== 200) {
 					showError(
-						t(APPLICATION_NAME, 'Error while setting shop delete preference')
+						t(APPLICATION_NAME, 'Error while setting shop delete preference'),
 					)
 				}
 			} catch (e) {
 				showError(
-					t(APPLICATION_NAME, 'Error while setting shop delete preference')
+					t(APPLICATION_NAME, 'Error while setting shop delete preference'),
 				)
 			}
 		},
 		async callAPIToUpdateEmail() {
 			try {
 				const url = generateUrl(
-					`/apps/${this.appName}/shop-accounts/set_shop_email_post_delete`
+					`/apps/${this.appName}/shop-accounts/set_shop_email_post_delete`,
 				)
 				const { status, data } = await Axios.post(url, {
 					shopEmailPostDelete: this.shopEmailPostDelete,
@@ -215,8 +215,8 @@ export default {
 				showError(
 					t(
 						APPLICATION_NAME,
-						"Murena.com email cannot be same as this account's email."
-					)
+						"Murena.com email cannot be same as this account's email.",
+					),
 				)
 			} else {
 				const { status, data } = await this.callAPIToUpdateEmail()
@@ -225,8 +225,8 @@ export default {
 					showError(
 						t(
 							APPLICATION_NAME,
-							data.message
-						)
+							data.message,
+						),
 					)
 				} else {
 					this.enableDeleteAccountEvent()
diff --git a/src/common.js b/src/common.js
index 1d5ec3a6..710b80e7 100644
--- a/src/common.js
+++ b/src/common.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { translate, translatePlural } from '@nextcloud/l10n'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/style.css'
 
 Vue.prototype.OC = window.OC
 Vue.prototype.OCP = window.OCP
-- 
GitLab


From 32ffeb14072c694f4a6fa048e67740d62ecb4edd Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 27 Aug 2024 15:20:37 +0000
Subject: [PATCH 107/185] Unhide delete section only when shop decisions are
 resolved

---
 src/DeleteShopAccountSetting.vue | 2 +-
 src/delete-account-listeners.js  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 7ca5afb1..6c1f1ebb 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,5 +1,5 @@
 <template>
-	<SettingsSection v-if="shopUsers.length > 0" :title="t(appName, 'Options')">
+	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
 		<div>
 			<p>
 				{{
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index 4b786556..f5461b73 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -3,6 +3,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	const buttonSelector = '#delete-account-settings .delete-button-wrapper .button-vue'
 	const checkboxSpanSelector = '#delete-account-settings span.checkbox-radio-switch'
 	const disabledClass = 'checkbox-radio-switch--disabled'
+	const deleteAccountSectionId = '#delete-account-settings-section'
 	// Disable initially
 	document.querySelector(checkboxSelector).disabled = true
 	document.querySelector(buttonSelector).disabled = true
@@ -13,6 +14,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
 	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
+	  document.querySelector(deleteAccountSectionId).style.visibility = 'hidden'
 	})
 
 	elem.addEventListener('enable-delete-account', function() {
@@ -20,5 +22,6 @@ document.addEventListener('DOMContentLoaded', function() {
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
+	  document.querySelector(deleteAccountSectionId).style.visibility = 'visible'
 	})
 })
-- 
GitLab


From eb22d613a4bf00c1d967975f7ed550058bda49ac Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Tue, 3 Sep 2024 16:10:20 +0000
Subject: [PATCH 108/185] Google authenticator msg

---
 l10n/de.js                                    |  3 +-
 l10n/de.json                                  |  3 +-
 l10n/de_DE.js                                 | 87 +++++++++++++++++++
 l10n/de_DE.json                               | 86 ++++++++++++++++++
 l10n/en.js                                    |  3 +-
 l10n/en.json                                  |  3 +-
 l10n/es.js                                    |  3 +-
 l10n/es.json                                  |  3 +-
 l10n/fr.js                                    |  3 +-
 l10n/fr.json                                  |  3 +-
 l10n/it.js                                    |  3 +-
 l10n/it.json                                  |  3 +-
 .../BeforeTemplateRenderedListener.php        |  3 +
 src/settings-user-migration.js                | 11 +++
 webpack.config.js                             |  1 +
 15 files changed, 208 insertions(+), 10 deletions(-)
 create mode 100644 l10n/de_DE.js
 create mode 100644 l10n/de_DE.json
 create mode 100644 src/settings-user-migration.js

diff --git a/l10n/de.js b/l10n/de.js
index 92cbe4ee..cc5a45d0 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -81,6 +81,7 @@ OC.L10N.register(
 		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
-		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" klicken. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 8d5e2d08..a026300f 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -79,7 +79,8 @@
 		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
-		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" tippen. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
new file mode 100644
index 00000000..4a2393cd
--- /dev/null
+++ b/l10n/de_DE.js
@@ -0,0 +1,87 @@
+OC.L10N.register(
+	"ecloud-accounts",
+	{
+		"Email Address": "E-Mail Adresse",
+		"Options": "Optionen",
+		"We are going to proceed with your cloud account suppression.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Aktivieren Sie das folgende Kontrollkästchen, wenn Sie auch das/die zugehörige(n) Shop-Konto/Konten löschen möchten",
+		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s' target='_blank'>Ihrem Konto</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Zu Ihrer Information: Sie haben %d Auftrag(e) in Ihre Konten: ",
+		"I also want to delete my shop account": "Ich möchte auch mein Shop-Konto löschen",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein.",
+		"Error while setting shop delete preference": "Fehler beim Einstellen der Shop-Löschpräferenz",
+		"Shop email cannot be same as this account's email.": "Die E-Mail von Murena.com kann nicht mit der E-Mail dieses Kontos übereinstimmen.",
+		"Invalid Email Format.": "Ungültiges E-Mail-Format.",
+		"A Murena.com account already uses this e-mail address.": "Ein Murena.com-Konto verwendet bereits diese E-Mail-Adresse.",
+		"You are part of the beta users.": "Sie sind Teil der Beta-Nutzer.",
+		"Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.": "Hinweis: Da die Funktionen noch nicht freigegeben sind, können Sie auf einige Fehler stoßen. Bitte melden Sie diese und Ihr Feedback über das unten stehende Formular.",
+		"Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!": "Möchten Sie eine Pause von den Beta-Funktionen einlegen? Klicken Sie einfach auf die Schaltfläche unten. Sie können jederzeit wieder ein Beta-Benutzer werden!",
+		"Do you want to become a beta user?": "Möchten Sie Beta-Nutzer werden?",
+		"You want to experiment new features ahead of the others and provide feedback on them before and if they're released? This section is made for you!": "Sie möchten neue Funktionen vor allen anderen ausprobieren und Feedback dazu geben, bevor oder falls sie veröffentlicht werden? Dann ist dieser Bereich wie geschaffen für Sie!",
+		"To get a preview of our new features you need to become part of our beta users. To do so, simply click on the button below. You can opt out of beta features at anytime.": "Um eine Vorschau auf unsere neuen Funktionen zu erhalten, müssen Sie Teil unserer Beta-Benutzer werden. Klicken Sie dazu einfach auf die Schaltfläche unten. Sie können sich jederzeit von den Beta-Funktionen abmelden.",
+		"Opt out of beta features": "Abmeldung von Beta-Funktionen",
+		"Become a beta user": "Beta-Benutzer werden",
+		"Are you sure you want to opt out of beta features?": "Sind Sie sicher, dass Sie die Beta-Funktionen nicht nutzen möchten?", 
+		"You no longer have access to experimental features.": "Sie haben keinen Zugang mehr zu experimentellen Funktionen.",
+		"Congratulations! You've successfully been added to the beta users.": "Herzlichen Glückwunsch! Du wurdest erfolgreich zu den Beta-Benutzern hinzugefügt.",
+		"Beta program is not available at the moment.": "Beta programma is momenteel niet beschikbaar.",
+		"Something went wrong.": "Etwas ist schief gelaufen.",
+		"Title": "Titel",
+		"required": "benötigt",
+		"Description": "Beschreibung",
+		"Summary of your feedback": "Zusammenfassung Ihres Feedbacks",
+		"Please give us as many details as possible": "Bitte geben Sie uns so viele Details wie möglich",
+		"Submit": "Einreichen",
+		"Experimental": "Experimentelle",
+		"Title is mandatory.": "Der Titel ist obligatorisch.",
+		"Description is mandatory.": "Die Beschreibung ist obligatorisch.",
+		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:",
+		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",
+		"Loading...": "Laden...",
+		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!",
+		"Create Murena Account": "Murena-Konto erstellen",
+		"Captcha Verification": "Captcha-Prüfung",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Aus Sicherheitsgründen müssen Sie eine Wiederherstellungsadresse für Ihr Murena Cloud-Konto festlegen.",
+		"As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.",
+		"Create My Account": "Mein Konto erstellen",
+		"Verify": "Überprüfen Sie",
+		"Later": "Später",
+		"Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen",
+		"Display name": "Name anzeigen",
+		"Username": "Benutzername",
+		"Enter Password": "Passwort eingeben",
+		"I want to receive news about Murena products and promotions.": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten.",
+		"I want to receive news about /e/OS.": "Ich möchte Nachrichten über /e/OS erhalten.",
+		"Your name as shown to others": "Ihr Name, wie er für andere sichtbar ist",
+		"Password": "Passwort",
+		"Confirm": "Bestätigen Sie",
+		"Human Verification": "Menschliche Verifizierung",
+		"Recovery Email": "Wiederherstellung E-Mail",
+		"Display name is required.": "Anzeigename ist erforderlich.",
+		"Username is required.": "Der Benutzername ist erforderlich.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
+		"Username is already taken.": "Benutzername ist bereits vergeben.",
+		"Password is required.": "Passwort ist erforderlich.",
+		"Confirm password is required.": "Passwortbestätigung ist erforderlich.",
+		"The confirm password does not match the password.": "Das Bestätigungskennwort stimmt nicht mit dem Kennwort überein.",
+		"Human Verification is required.": "Eine menschliche Verifizierung ist erforderlich.",
+		"Human Verification code is not correct.": "Der Human Verification Code ist nicht korrekt.",
+		"Recovery Email is required.": "Eine Wiederherstellungs-E-Mail ist erforderlich.",
+		"You must read and accept the Terms of Service to create your account.": "Sie müssen die Allgemeinen Geschäftsbedingungen lesen und akzeptieren, um Ihr Konto zu erstellen.",
+		"Use My Account Now": "Mein Konto jetzt verwenden",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ich habe die <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Nutzungsbedingungen</a> gelesen und akzeptiere diese.",
+		"Success!": "Erfolgreich!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='https://doc.e.foundation/support-topics/configure-email'>diese Seite</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32",
+		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
+		"Important:": "Das ist wichtig:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
+		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
+		"Captcha is not verified!": "Captcha wird nicht überprüft!",
+		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" klickst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen."
+	},
+	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
new file mode 100644
index 00000000..fffb2d93
--- /dev/null
+++ b/l10n/de_DE.json
@@ -0,0 +1,86 @@
+{
+	"translations": {
+		"Email Address": "E-Mail Adresse",
+		"Options": "Optionen",
+		"We are going to proceed with your cloud account suppression.": "Wir werden mit der Löschung Ihres Cloud-Kontos fortfahren.",
+		"Check the box below if you also want to delete the associated shop account(s).": "Aktivieren Sie das folgende Kontrollkästchen, wenn Sie auch das/die zugehörige(n) Shop-Konto/Konten löschen möchten",
+		"For your information you have %d order(s) in <a class='text-color-active' href='%s' target='_blank'>your account</a>.": "Zu Ihrer Information: Sie haben %d Auftrag(e) in <a class='text-color-active' href='%s' target='_blank'>Ihrem Konto</a>.",
+		"For your information you have %d order(s) in your accounts: ": "Zu Ihrer Information: Sie haben %d Auftrag(e) in Ihre Konten: ",
+		"I also want to delete my shop account": "Ich möchte auch mein Shop-Konto löschen",
+		"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop.": "Wenn Sie Ihr Shop-Konto behalten möchten, bestätigen oder ändern Sie bitte die E-Mail-Adresse unten. Diese E-Mail-Adresse wird Ihr neues Login für den Shop sein.",
+		"Error while setting shop delete preference": "Fehler beim Einstellen der Shop-Löschpräferenz",
+		"Shop email cannot be same as this account's email.": "Die E-Mail von Murena.com kann nicht mit der E-Mail dieses Kontos übereinstimmen.",
+		"Invalid Email Format.": "Ungültiges E-Mail-Format.",
+		"A Murena.com account already uses this e-mail address.": "Ein Murena.com-Konto verwendet bereits diese E-Mail-Adresse.",
+		"You are part of the beta users.": "Sie sind Teil der Beta-Nutzer.",
+		"Note : as the features are not released yet, you may encounter some bugs. Please report them or give your feedback using the form below.": "Hinweis: Da die Funktionen noch nicht freigegeben sind, können Sie auf einige Fehler stoßen. Bitte melden Sie diese und Ihr Feedback über das unten stehende Formular.",
+		"Want to take a break from beta features? Just click on the button below. You can become a beta user again anytime!": "Möchten Sie eine Pause von den Beta-Funktionen einlegen? Klicken Sie einfach auf die Schaltfläche unten. Sie können jederzeit wieder ein Beta-Benutzer werden!",
+		"Do you want to become a beta user?": "Möchten Sie Beta-Nutzer werden?",
+		"You want to experiment new features ahead of the others and provide feedback on them before and if they're released? This section is made for you!": "Sie möchten neue Funktionen vor allen anderen ausprobieren und Feedback dazu geben, bevor oder falls sie veröffentlicht werden? Dann ist dieser Bereich wie geschaffen für Sie!",
+		"To get a preview of our new features you need to become part of our beta users. To do so, simply click on the button below. You can opt out of beta features at anytime.": "Um eine Vorschau auf unsere neuen Funktionen zu erhalten, müssen Sie Teil unserer Beta-Benutzer werden. Klicken Sie dazu einfach auf die Schaltfläche unten. Sie können sich jederzeit von den Beta-Funktionen abmelden.",
+		"Opt out of beta features": "Abmeldung von Beta-Funktionen",
+		"Become a beta user": "Beta-Benutzer werden",
+		"Are you sure you want to opt out of beta features?": "Sind Sie sicher, dass Sie die Beta-Funktionen nicht nutzen möchten?", 
+		"You no longer have access to experimental features.": "Sie haben keinen Zugang mehr zu experimentellen Funktionen.",
+		"Congratulations! You've successfully been added to the beta users.": "Herzlichen Glückwunsch! Du wurdest erfolgreich zu den Beta-Benutzern hinzugefügt.",
+		"Beta program is not available at the moment.": "Beta programma is momenteel niet beschikbaar.",
+		"Something went wrong.": "Etwas ist schief gelaufen.",
+		"Title": "Titel",
+		"required": "benötigt",
+		"Description": "Beschreibung",
+		"Summary of your feedback": "Zusammenfassung Ihres Feedbacks",
+		"Please give us as many details as possible": "Bitte geben Sie uns so viele Details wie möglich",
+		"Submit": "Einreichen",
+		"Experimental": "Experimentelle",
+		"Title is mandatory.": "Der Titel ist obligatorisch.",
+		"Description is mandatory.": "Die Beschreibung ist obligatorisch.",
+		"Here is the list of currently available beta features:": "Hier ist die Liste der derzeit verfügbaren Beta-Funktionen:",
+		"A subscription is active in this account. Please cancel it or let it expire before deleting your account.": "Für dieses Konto ist ein Abonnement aktiv. Bitte kündigen Sie es oder lassen Sie es auslaufen, bevor Sie Ihr Konto löschen.",
+		"Loading...": "Laden...",
+		"Temporary error contacting murena.com; please try again later!": "Vorübergehender Fehler bei der Kontaktaufnahme mit murena.com; bitte versuchen Sie es später noch einmal!",
+		"Create Murena Account": "Murena-Konto erstellen",
+		"Captcha Verification": "Captcha-Prüfung",
+		"For security reasons you need to set a recovery address for your Murena Cloud account.": "Aus Sicherheitsgründen müssen Sie eine Wiederherstellungsadresse für Ihr Murena Cloud-Konto festlegen.",
+		"As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.",
+		"Create My Account": "Mein Konto erstellen",
+		"Verify": "Überprüfen Sie",
+		"Later": "Später",
+		"Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen",
+		"Display name": "Name anzeigen",
+		"Username": "Benutzername",
+		"Enter Password": "Passwort eingeben",
+		"I want to receive news about Murena products and promotions.": "Ich möchte Neuigkeiten über Murena-Produkte und Werbeaktionen erhalten.",
+		"I want to receive news about /e/OS.": "Ich möchte Nachrichten über /e/OS erhalten.",
+		"Your name as shown to others": "Ihr Name, wie er für andere sichtbar ist",
+		"Password": "Passwort",
+		"Confirm": "Bestätigen Sie",
+		"Human Verification": "Menschliche Verifizierung",
+		"Recovery Email": "Wiederherstellung E-Mail",
+		"Display name is required.": "Anzeigename ist erforderlich.",
+		"Username is required.": "Der Benutzername ist erforderlich.",
+		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
+		"Username is already taken.": "Benutzername ist bereits vergeben.",
+		"Password is required.": "Passwort ist erforderlich.",
+		"Confirm password is required.": "Passwortbestätigung ist erforderlich.",
+		"The confirm password does not match the password.": "Das Bestätigungskennwort stimmt nicht mit dem Kennwort überein.",
+		"Human Verification is required.": "Eine menschliche Verifizierung ist erforderlich.",
+		"Human Verification code is not correct.": "Der Human Verification Code ist nicht korrekt.",
+		"Recovery Email is required.": "Eine Wiederherstellungs-E-Mail ist erforderlich.",
+		"You must read and accept the Terms of Service to create your account.": "Sie müssen die Allgemeinen Geschäftsbedingungen lesen und akzeptieren, um Ihr Konto zu erstellen.",
+		"I have read and accept the <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Terms of Service</a>.": "Ich habe die <a href='http://murena.io/apps/terms_of_service/en/termsandconditions' target='_blank'>Nutzungsbedingungen</a> gelesen und akzeptiere diese.",
+		"Success!": "Erfolgreich!",
+		"Your <b>__username__@__domain__</b> account was successfully created.": "Ihr <b>__username__@__domain__</b>-Konto wurde erfolgreich erstellt.",
+		"If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit <a href='https://doc.e.foundation/support-topics/configure-email'>this page</a>.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte <a href='https://doc.e.foundation/support-topics/configure-email'>diese Seite</a>.",
+		"Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32",
+		"Use an alternative email": "Verwenden Sie eine alternative E-Mail",
+		"Important:": "Das ist wichtig:",
+		"For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.",
+		"Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse",
+		"Captcha is not verified!": "Captcha wird nicht überprüft!",
+		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
+		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" tippst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen."
+	},
+	"pluralForm": "nplurals=2; plural=(n != 1);"
+}
diff --git a/l10n/en.js b/l10n/en.js
index 8030a730..0532b2a7 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"Set a recovery email address": "Set a recovery email address",
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
-		"An error occurred while creating your account!": "An error occurred while creating your account!"
+		"An error occurred while creating your account!": "An error occurred while creating your account!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 4ff11bf0..9fd48d10 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -81,7 +81,8 @@
 		"Set a recovery email address": "Set a recovery email address",
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
-		"An error occurred while creating your account!": "An error occurred while creating your account!"
+		"An error occurred while creating your account!": "An error occurred while creating your account!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index 5f992f49..b287c5fd 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -83,6 +83,7 @@ OC.L10N.register(
 		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
-		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index d4083680..38fed6a9 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -82,7 +82,8 @@
 		"Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación",
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
-		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!"
+		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index f4e12ac1..78c2c1b4 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -82,6 +82,7 @@ OC.L10N.register(
 		"Set a recovery email address": "Définir une adresse électronique de récupération",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
-		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 479b0cf1..4e9a17d4 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -81,7 +81,8 @@
 		"Set a recovery email address": "Définir une adresse électronique de récupération",
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
-		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!"
+		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index 6399df1e..e9f75b05 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -82,6 +82,7 @@ OC.L10N.register(
 		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
-		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo facendo clic su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 840043dc..9e9d9d1a 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -77,7 +77,8 @@
 		"Set a recovery email address": "Impostare un indirizzo e-mail di recupero",
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
-		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!"
+		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo cliccando su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
index d124d813..622b6ebf 100644
--- a/lib/Listeners/BeforeTemplateRenderedListener.php
+++ b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -44,6 +44,9 @@ class BeforeTemplateRenderedListener implements IEventListener {
 		if (strpos($pathInfo, '/apps/ecloud-accounts/accounts') !== false) {
 			$this->util->addStyle($this->appName, $this->appName . '-userregistration');
 		}
+		if (strpos($pathInfo, '/settings/user/migration') !== false) {
+			$this->util->addScript($this->appName, $this->appName . '-settings-user-migration');
+		}
 
 	}
 }
diff --git a/src/settings-user-migration.js b/src/settings-user-migration.js
new file mode 100644
index 00000000..76a2f75a
--- /dev/null
+++ b/src/settings-user-migration.js
@@ -0,0 +1,11 @@
+document.addEventListener('DOMContentLoaded', function() {
+	const googleContent = document.getElementById('google-content')
+
+	const translationKey = "If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message."
+	const translatedText = t('ecloud-accounts', translationKey)
+
+	const newParagraph = document.createElement('p')
+	newParagraph.textContent = '⚠️ ' + translatedText
+
+	googleContent.insertBefore(newParagraph, googleContent.querySelector('h3'))
+})
diff --git a/webpack.config.js b/webpack.config.js
index b6eaacba..762d20f7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,6 +9,7 @@ module.exports = {
 		'delete-shop-account-setting': path.join(__dirname, 'src/delete-shop-account-setting.js'),
 		'delete-account-listeners': path.join(__dirname, 'src/delete-account-listeners.js'),
 		'beta-user-setting': path.join(__dirname, 'src/beta-user-setting.js'),
+		'settings-user-migration': path.join(__dirname, 'src/settings-user-migration.js'),
 		'signup': path.join(__dirname, 'src/signup.js')
 	},
 }
-- 
GitLab


From 81b48072517e88755406e382467abf8e79a21f8a Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Mon, 9 Sep 2024 13:29:16 +0000
Subject: [PATCH 109/185] version bump 8-0-1

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 6c90f4c9..923f9ade 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>8.0.0</version>
+    <version>8.0.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From a9d7fb0552540b06abb45937f4a2aea984ca00a1 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Tue, 10 Sep 2024 15:28:41 +0000
Subject: [PATCH 110/185] Username validation changes in account-creation flow

---
 appinfo/routes.php                   |  2 +-
 l10n/de.js                           |  6 +++--
 l10n/de.json                         |  6 +++--
 l10n/de_DE.js                        |  6 +++--
 l10n/de_DE.json                      |  6 +++--
 l10n/en.js                           |  6 +++--
 l10n/en.json                         |  6 +++--
 l10n/es.js                           |  6 +++--
 l10n/es.json                         |  6 +++--
 l10n/fr.js                           |  6 +++--
 l10n/fr.json                         |  6 +++--
 l10n/it.js                           |  6 +++--
 l10n/it.json                         |  6 +++--
 lib/Controller/AccountController.php | 37 +++++++++++++++++++++++-----
 src/signup/RegistrationForm.vue      | 29 ++++++++++++++++------
 15 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index eeeec68a..90b0f6f7 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -30,6 +30,6 @@ return ['routes' => [
 	['name' => 'account#create', 'url' => '/accounts/create', 'verb' => 'POST'],
 	['name' => 'account#captcha', 'url' => '/accounts/captcha', 'verb' => 'GET'],
 	['name' => 'account#verify_captcha', 'url' => '/accounts/verify_captcha', 'verb' => 'POST'],
-	['name' => 'account#check_username_available', 'url' => '/accounts/check_username_available', 'verb' => 'POST'],
+	['name' => 'account#validate_fields', 'url' => '/accounts/validate_fields', 'verb' => 'POST'],
 
 ]];
diff --git a/l10n/de.js b/l10n/de.js
index cc5a45d0..14a5579d 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -59,7 +59,7 @@ OC.L10N.register(
 		"Recovery Email": "Wiederherstellung E-Mail",
 		"Display name is required.": "Anzeigename ist erforderlich.",
 		"Username is required.": "Der Benutzername ist erforderlich.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen, Punkten und Unterstrichen bestehen.",
 		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
 		"Username is already taken.": "Benutzername ist bereits vergeben.",
 		"Password is required.": "Passwort ist erforderlich.",
@@ -82,6 +82,8 @@ OC.L10N.register(
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" klicken. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" klicken. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen.",
+		"Username is too large.": "Der Benutzername ist zu groß.",
+		"Display name is too large.": "Der Anzeigename ist zu groß."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index a026300f..c3dd2ba5 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -58,7 +58,7 @@
 		"Recovery Email": "Wiederherstellung E-Mail",
 		"Display name is required.": "Anzeigename ist erforderlich.",
 		"Username is required.": "Der Benutzername ist erforderlich.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen, Punkten und Unterstrichen bestehen.",
 		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
 		"Username is already taken.": "Benutzername ist bereits vergeben.",
 		"Password is required.": "Passwort ist erforderlich.",
@@ -80,7 +80,9 @@
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" tippen. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" tippen. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen.",
+		"Username is too large.": "Der Benutzername ist zu groß.",
+		"Display name is too large.": "Der Anzeigename ist zu groß."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 4a2393cd..4754fe0e 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -59,7 +59,7 @@ OC.L10N.register(
 		"Recovery Email": "Wiederherstellung E-Mail",
 		"Display name is required.": "Anzeigename ist erforderlich.",
 		"Username is required.": "Der Benutzername ist erforderlich.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen, Punkten und Unterstrichen bestehen.",
 		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
 		"Username is already taken.": "Benutzername ist bereits vergeben.",
 		"Password is required.": "Passwort ist erforderlich.",
@@ -82,6 +82,8 @@ OC.L10N.register(
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" klickst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" klickst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen.",
+		"Username is too large.": "Der Benutzername ist zu groß.",
+		"Display name is too large.": "Der Anzeigename ist zu groß."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index fffb2d93..2f526340 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -58,7 +58,7 @@
 		"Recovery Email": "Wiederherstellung E-Mail",
 		"Display name is required.": "Anzeigename ist erforderlich.",
 		"Username is required.": "Der Benutzername ist erforderlich.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen und Unterstrichen bestehen.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Der Benutzername darf nur aus Buchstaben, Zahlen, Bindestrichen, Punkten und Unterstrichen bestehen.",
 		"Username must be at least 3 characters long.": "Der Benutzername muss mindestens 3 Zeichen lang sein.",
 		"Username is already taken.": "Benutzername ist bereits vergeben.",
 		"Password is required.": "Passwort ist erforderlich.",
@@ -80,7 +80,9 @@
 		"Captcha is not verified!": "Captcha wird nicht überprüft!",
 		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" tippst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" tippst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen.",
+		"Username is too large.": "Der Benutzername ist zu groß.",
+		"Display name is too large.": "Der Anzeigename ist zu groß."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index 0532b2a7..d7c570df 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -62,7 +62,7 @@ OC.L10N.register(
 		"Recovery Email": "Recovery Email",
 		"Display name is required.": "Display name is required.",
 		"Username is required.": "Username is required.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Username must consist of letters, numbers, hyphens, and underscores only.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Username must consist of letters, numbers, hyphens, dots and underscores only.",
 		"Username must be at least 3 characters long.": "Username must be at least 3 characters long.",
 		"Username is already taken.": "Username is already taken.",
 		"Password is required.": "Password is required.",
@@ -85,6 +85,8 @@ OC.L10N.register(
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
 		"An error occurred while creating your account!": "An error occurred while creating your account!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.",
+		"Username is too large.": "Username is too large.",
+		"Display name is too large.": "Display name is too large."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 9fd48d10..7568e3f8 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -59,7 +59,7 @@
 		"Recovery Email": "Recovery Email",
 		"Display name is required.": "Display name is required.",
 		"Username is required.": "Username is required.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Username must consist of letters, numbers, hyphens, and underscores only.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Username must consist of letters, numbers, hyphens, dots and underscores only.",
 		"Username must be at least 3 characters long.": "Username must be at least 3 characters long.",
 		"Username is already taken.": "Username is already taken.",
 		"Password is required.": "Password is required.",
@@ -82,7 +82,9 @@
 		"Captcha is not verified!": "Captcha is not verified!",
 		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
 		"An error occurred while creating your account!": "An error occurred while creating your account!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.",
+		"Username is too large.": "Username is too large.",
+		"Display name is too large.": "Display name is too large."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index b287c5fd..c97769b9 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -61,7 +61,7 @@ OC.L10N.register(
 		"Recovery Email": "Correo electrónico de recuperación",
 		"Display name is required.": "El nombre para mostrar es obligatorio.",
 		"Username is required.": "Nombre de usuario obligatorio.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "El nombre de usuario debe estar compuesto únicamente por letras, números, guiones y guiones bajos.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "El nombre de usuario debe estar compuesto únicamente por letras, números, guiones, puntos y guiones bajos.",
 		"Username must be at least 3 characters long.": "El nombre de usuario debe tener al menos 3 caracteres.",
 		"Username is already taken.": "El nombre de usuario ya está ocupado.",
 		"Password is required.": "Se requiere contraseña.",
@@ -84,6 +84,8 @@ OC.L10N.register(
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
 		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje.",
+		"Username is too large.": "El nombre de usuario es demasiado grande.",
+		"Display name is too large.": "El nombre para mostrar es demasiado grande."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 38fed6a9..fd22c863 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -60,7 +60,7 @@
 		"Recovery Email": "Correo electrónico de recuperación",
 		"Display name is required.": "El nombre para mostrar es obligatorio.",
 		"Username is required.": "Nombre de usuario obligatorio.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "El nombre de usuario debe estar compuesto únicamente por letras, números, guiones y guiones bajos.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "El nombre de usuario debe estar compuesto únicamente por letras, números, guiones, puntos y guiones bajos.",
 		"Username must be at least 3 characters long.": "El nombre de usuario debe tener al menos 3 caracteres.",
 		"Username is already taken.": "El nombre de usuario ya está ocupado.",
 		"Password is required.": "Se requiere contraseña.",
@@ -83,7 +83,9 @@
 		"Captcha is not verified!": "¡Captcha no está verificado!",
 		"A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.",
 		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje.",
+		"Username is too large.": "El nombre de usuario es demasiado grande.",
+		"Display name is too large.": "El nombre para mostrar es demasiado grande."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 78c2c1b4..5a84aea7 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -60,7 +60,7 @@ OC.L10N.register(
 		"Recovery Email": "Récupération de l'email",
 		"Display name is required.": "Le nom d'affichage est obligatoire.",
 		"Username is required.": "Le nom d'utilisateur est requis.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Le nom d'utilisateur doit être composé uniquement de lettres, de chiffres, de traits d'union et de traits de soulignement.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Le nom d'utilisateur doit être composé uniquement de lettres, de chiffres, de traits d'union, de points et de traits de soulignement.",
 		"Username must be at least 3 characters long.": "Le nom d'utilisateur doit comporter au moins 3 caractères.",
 		"Username is already taken.": "Le nom d'utilisateur est déjà pris.",
 		"Password is required.": "Le mot de passe est requis.",
@@ -83,6 +83,8 @@ OC.L10N.register(
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
 		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message.",
+		"Username is too large.": "Le nom d'utilisateur est trop grand.",
+		"Display name is too large.": "Le nom affiché est trop grand."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 4e9a17d4..2b733b05 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -59,7 +59,7 @@
 		"Recovery Email": "Récupération de l'email",
 		"Display name is required.": "Le nom d'affichage est obligatoire.",
 		"Username is required.": "Le nom d'utilisateur est requis.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Le nom d'utilisateur doit être composé uniquement de lettres, de chiffres, de traits d'union et de traits de soulignement.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Le nom d'utilisateur doit être composé uniquement de lettres, de chiffres, de traits d'union, de points et de traits de soulignement.",
 		"Username must be at least 3 characters long.": "Le nom d'utilisateur doit comporter au moins 3 caractères.",
 		"Username is already taken.": "Le nom d'utilisateur est déjà pris.",
 		"Password is required.": "Le mot de passe est requis.",
@@ -82,7 +82,9 @@
 		"Captcha is not verified!": "Captcha n'est pas vérifié !",
 		"A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.",
 		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message.",
+		"Username is too large.": "Le nom d'utilisateur est trop grand.",
+		"Display name is too large.": "Le nom affiché est trop grand."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index e9f75b05..cbf1181e 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -60,7 +60,7 @@ OC.L10N.register(
 		"Recovery Email": "Recupero e-mail",
 		"Display name is required.": "Il nome visualizzato è obbligatorio.",
 		"Username is required.": "Il nome utente è necessario.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Il nome utente deve essere composto esclusivamente da lettere, numeri, trattini e trattini bassi.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Il nome utente deve essere composto esclusivamente da lettere, numeri, trattini, punti e trattini bassi.",
 		"Username must be at least 3 characters long.": "Il nome utente deve essere lungo almeno 3 caratteri.",
 		"Username is already taken.": "Il nome utente è già stato preso.",
 		"Password is required.": "La password è necessaria.",
@@ -83,6 +83,8 @@ OC.L10N.register(
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
 		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo facendo clic su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo facendo clic su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio.",
+		"Username is too large.": "Il nome utente è troppo grande.",
+		"Display name is too large.": "Il nome del display è troppo grande."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 9e9d9d1a..18307c2b 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -59,7 +59,7 @@
 		"Recovery Email": "Recupero e-mail",
 		"Display name is required.": "Il nome visualizzato è obbligatorio.",
 		"Username is required.": "Il nome utente è necessario.",
-		"Username must consist of letters, numbers, hyphens, and underscores only.": "Il nome utente deve essere composto esclusivamente da lettere, numeri, trattini e trattini bassi.",
+		"Username must consist of letters, numbers, hyphens, dots and underscores only.": "Il nome utente deve essere composto esclusivamente da lettere, numeri, trattini, punti e trattini bassi.",
 		"Username must be at least 3 characters long.": "Il nome utente deve essere lungo almeno 3 caratteri.",
 		"Username is already taken.": "Il nome utente è già stato preso.",
 		"Password is required.": "La password è necessaria.",
@@ -78,7 +78,9 @@
 		"Captcha is not verified!": "Il Captcha non è verificato!",
 		"A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.",
 		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
-		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo cliccando su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio."
+		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo cliccando su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio.",
+		"Username is too large.": "Il nome utente è troppo grande.",
+		"Display name is too large.": "Il nome del display è troppo grande."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index b6aab241..550e1a7d 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -156,7 +156,7 @@ class AccountController extends Controller {
 
 		$inputData = [
 			'username' => ['value' => $username, 'maxLength' => 30],
-			'displayname' => ['value' => $displayname, 'maxLength' => 30],
+			'display name' => ['value' => $displayname, 'maxLength' => 30],
 			'password' => ['value' => $password, 'maxLength' => 1024],
 		];
 		
@@ -227,40 +227,65 @@ class AccountController extends Controller {
 	 */
 	private function validateInput(string $inputName, string $value, ?int $maxLength = null) : ?string {
 		if ($value === '') {
-			return "$inputName is required.";
+			return ucfirst(strtolower($inputName))." is required.";
 		}
-	
 		if ($maxLength !== null && strlen($value) > $maxLength) {
-			return "$inputName is too large.";
+			return ucfirst(strtolower($inputName))." is too large.";
 		}
 	
 		return null; // Validation passed
 	}
 	/**
-	 * Check if a username is available.
+	 * Check if a username and displayname is valid or not.
 	 *
 	 * @NoAdminRequired
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
 	 * @param string $username The username to check.
+	 * @param string $displayname The displayname to check.
 	 *
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
-	public function checkUsernameAvailable(string $username) : DataResponse {
+	public function validateFields(string $username, string $displayname) : DataResponse {
 		$this->session->remove(self::SESSION_USERNAME_CHECK);
 		$response = new DataResponse();
 		$response->setStatus(400);
 
 		if (empty($username)) {
+			$response->setData(['message' => 'Username is required.', 'field' => 'username', 'success' => false]);
+			return $response;
+		}
+		if (empty($displayname)) {
+			$response->setData(['message' => 'Display name is required.', 'field' => 'display name', 'success' => false]);
 			return $response;
 		}
 
+		$inputData = [
+			'username' => ['value' => $username, 'maxLength' => 30],
+			'display name' => ['value' => $displayname, 'maxLength' => 30]
+		];
+		
+		foreach ($inputData as $inputName => $inputInfo) {
+			$validationError = $this->validateInput($inputName, $inputInfo['value'], $inputInfo['maxLength']);
+			if ($validationError !== null) {
+				$response->setData(['message' => $validationError, 'field' => $inputName, 'success' => false]);
+				$response->setStatus(400);
+				return $response;
+			}
+		}
+		if (!preg_match('/^[a-zA-Z0-9._-]+$/', $username)) {
+			$response->setData(['message' => 'Username must consist of letters, numbers, hyphens, dots and underscores only.', 'field' => 'username', 'success' => false]);
+			$response->setStatus(403);
+			return $response;
+		}
 		try {
 			$username = mb_strtolower($username, 'UTF-8');
 			if (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) {
 				$response->setStatus(200);
 				$this->session->set(self::SESSION_USERNAME_CHECK, true);
+			} else {
+				$response->setData(['message' => 'Username is already taken.', 'field' => 'username', 'success' => false]);
 			}
 		} catch (Exception $e) {
 			$this->logger->logException($e, ['app' => Application::APP_ID ]);
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 34d85342..7ae385ab 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -27,6 +27,9 @@
 						<p v-if="validation.isDisplaynameEmpty" class="validation-warning">
 							{{ t(appName,'Display name is required.') }}
 						</p>
+						<p v-else-if="validation.isDisplaynameNotValid" class="validation-warning">
+							{{ t(appName, displaynameValidationMessage) }}
+						</p>
 					</div>
 				</div>
 			</div>
@@ -182,6 +185,7 @@ export default {
 		return {
 			appName: APPLICATION_NAME,
 			usernameValidationMessage: '',
+			displaynameValidationMessage: '',
 			domain: window.location.host,
 			validation: {
 				isDisplaynameEmpty: false,
@@ -192,6 +196,7 @@ export default {
 				isRepasswordEmpty: false,
 				isRePasswordMatched: false,
 				isAccepttnsEmpty: false,
+				isDisplaynameNotValid: false,
 			},
 			languages: [
 				{ code: 'en', name: 'English' },
@@ -259,13 +264,13 @@ export default {
 			this.validation.isUsernameNotValid = false
 			this.usernameValidationMessage = ''
 			this.isUsernameAvailable = false
-			const usernamePattern = /^[a-zA-Z0-9_-]+$/
+			const usernamePattern = /^[a-zA-Z0-9._-]+$/
 			const minCharacterCount = 3
 			const isValidUsername = usernamePattern.test(this.formData.username)
 			const isEnoughCharacters = this.formData.username.length >= minCharacterCount
 
 			if (!isValidUsername) {
-				this.usernameValidationMessage = t(this.appName, 'Username must consist of letters, numbers, hyphens, and underscores only.')
+				this.usernameValidationMessage = t(this.appName, 'Username must consist of letters, numbers, hyphens, dots and underscores only.')
 				this.validation.isUsernameNotValid = true
 			} else if (!isEnoughCharacters) {
 				this.usernameValidationMessage = t(this.appName, 'Username must be at least 3 characters long.')
@@ -273,20 +278,30 @@ export default {
 			}
 		},
 
-		async checkUsername() {
+		async validateFields() {
+			this.validation.isUsernameNotValid = false
+			this.validation.isDisplaynameNotValid = false
 			const data = {
 				username: this.formData.username,
+				displayname: this.formData.displayname,
 			}
-			const url = generateUrl(`/apps/${this.appName}/accounts/check_username_available`)
+			const url = generateUrl(`/apps/${this.appName}/accounts/validate_fields`)
 
 			try {
 				await Axios.post(url, data)
 				this.isUsernameAvailable = true
 			} catch (error) {
-				this.validation.isUsernameNotValid = true
 				if (error.response && error.response.status === 400) {
-					this.usernameValidationMessage = t(this.appName, 'Username is already taken.')
+					if (error.response.data.field === 'username') {
+						this.validation.isUsernameNotValid = true
+						this.usernameValidationMessage = t(this.appName, error.response.data.message)
+					}
+					if (error.response.data.field === 'display name') {
+						this.validation.isDisplaynameNotValid = true
+						this.displaynameValidationMessage = t(this.appName, error.response.data.message)
+					}
 				} else {
+					this.validation.isUsernameNotValid = true
 					this.usernameValidationMessage = t(this.appName, 'Something went wrong.')
 				}
 			}
@@ -294,7 +309,7 @@ export default {
 		async submitRegistrationForm() {
 			this.processing = true
 			this.validateForm(['displayname', 'username', 'password', 'repassword', 'termsandservices'])
-			await this.checkUsername()
+			await this.validateFields()
 			const isFormValid = Object.values(this.validation).every(value => !value)
 
 			if (isFormValid) {
-- 
GitLab


From 41890951213b27782a0f4d5f0e37706d6bd6ab54 Mon Sep 17 00:00:00 2001
From: Fazle Rabbi <fazle.rabbi.ext@murena.com>
Date: Mon, 23 Sep 2024 06:32:56 +0000
Subject: [PATCH 111/185] 1789 Setup MR review tools in GitLab

---
 .codeclimate.yml |  8 ++++++++
 .gitlab-ci.yml   | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .codeclimate.yml

diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 00000000..c820af6b
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,8 @@
+plugins:
+  phpmd:
+    enabled: true
+    config:
+      file_extensions:
+        - php
+        - inc
+      rulesets: "unusedcode,codesize,naming,controversial,design"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c268fb41..08326169 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,10 @@
+stages:
+  - test
+  - build
+  - performance
+  - dast
+  - deploy
+
 variables:
     TO_PACKAGE: 'appinfo l10n lib templates js img css'
 include:
@@ -7,6 +14,15 @@ include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-deploy.yml"
+  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+    ref: main
+    file: "mr-review-tools.yml"
+  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+    ref: main
+    file: "git-operations.yml"
+  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
+    ref: main
+    file: "populate-code-climate-default-config.yml"
 
 build-vendor:
   stage: build
-- 
GitLab


From 7459425389e5b06d268d6faf458e2d0a39bea1fb Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 25 Sep 2024 17:06:09 +0530
Subject: [PATCH 112/185] Bump to 8.0.2

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 923f9ade..90509703 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>8.0.1</version>
+    <version>8.0.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From e2d20f96fae55297f3f5874f73a068f4a6d3da6c Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Wed, 2 Oct 2024 14:54:37 +0000
Subject: [PATCH 113/185] add loader

---
 src/DeleteShopAccountSetting.vue | 126 ++++++++++++++++++-------------
 src/delete-account-listeners.js  |   5 ++
 2 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 6c1f1ebb..7c28a59c 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,63 +1,68 @@
 <template>
-	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
-		<div>
-			<p>
-				{{
-					t(appName, 'We are going to proceed with your cloud account suppression.')
-				}}
-				<span v-if="!hasActiveSubscription">
+	<div>
+		<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
+			<div>
+				<p>
 					{{
-						t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
+						t(appName, 'We are going to proceed with your cloud account suppression.')
 					}}
-				</span>
-			</p>
+					<span v-if="!hasActiveSubscription">
+						{{
+							t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
+						}}
+					</span>
+				</p>
 
-			<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
-			<p v-if="hasActiveSubscription">
-				<b>
-					{{
-						t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
-					}}
-				</b>
-			</p>
+				<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
+				<p v-if="hasActiveSubscription">
+					<b>
+						{{
+							t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
+						}}
+					</b>
+				</p>
 
-			<form @submit.prevent>
-				<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
-					<div class="delete-shop-input">
-						<CheckboxRadioSwitch id="shop-accounts_confirm"
-							:checked.sync="deleteShopAccount"
-							:disabled="hasActiveSubscription || !allowDelete"
-							@update:checked="updateDeleteShopPreference">
-							{{
-								t(
-									appName,
-									"I also want to delete my shop account"
-								)
-							}}
-						</CheckboxRadioSwitch>
-					</div>
-					<div v-if="!deleteShopAccount" class="delete-shop-input">
-						<label for="shop-alternate-email">
-							{{
-								t(
-									appName,
-									"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
-								)
-							}}
-						</label>
-						<input id="shop-alternate-email"
-							v-model="shopEmailPostDelete"
-							type="email"
-							name="shop-alternate-email"
-							:placeholder="t(appName, 'Email Address')"
-							class="form-control"
-							:disabled="hasActiveSubscription || !allowDelete"
-							@blur="updateEmailPostDelete($event)">
+				<form @submit.prevent>
+					<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
+						<div class="delete-shop-input">
+							<CheckboxRadioSwitch id="shop-accounts_confirm"
+								:checked.sync="deleteShopAccount"
+								:disabled="hasActiveSubscription || !allowDelete"
+								@update:checked="updateDeleteShopPreference">
+								{{
+									t(
+										appName,
+										"I also want to delete my shop account"
+									)
+								}}
+							</CheckboxRadioSwitch>
+						</div>
+						<div v-if="!deleteShopAccount" class="delete-shop-input">
+							<label for="shop-alternate-email">
+								{{
+									t(
+										appName,
+										"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
+									)
+								}}
+							</label>
+							<input id="shop-alternate-email"
+								v-model="shopEmailPostDelete"
+								type="email"
+								name="shop-alternate-email"
+								:placeholder="t(appName, 'Email Address')"
+								class="form-control"
+								:disabled="hasActiveSubscription || !allowDelete"
+								@blur="updateEmailPostDelete($event)">
+						</div>
 					</div>
-				</div>
-			</form>
+				</form>
+			</div>
+		</SettingsSection>
+		<div id="delete-my-account-loader" class="spinner-container">
+			<NcLoadingIcon :size="40" />
 		</div>
-	</SettingsSection>
+	</div>
 </template>
 
 <script>
@@ -67,6 +72,7 @@ import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 const APPLICATION_NAME = 'ecloud-accounts'
 
@@ -75,6 +81,7 @@ export default {
 	components: {
 		SettingsSection,
 		CheckboxRadioSwitch,
+		NcLoadingIcon,
 	},
 	data() {
 		return {
@@ -283,4 +290,17 @@ input#shop-alternate-email:disabled {
 #delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label:hover{
 	background-color: unset;
 }
+.spinner-container {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100px;
+	margin-top: 50px;
+}
+
+#delete-my-account-loader {
+	margin-left: auto;
+	margin-right: auto;
+	width: 40px;
+}
 </style>
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index f5461b73..770867e4 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -4,16 +4,20 @@ document.addEventListener('DOMContentLoaded', function() {
 	const checkboxSpanSelector = '#delete-account-settings span.checkbox-radio-switch'
 	const disabledClass = 'checkbox-radio-switch--disabled'
 	const deleteAccountSectionId = '#delete-account-settings-section'
+	const deleteMyAccountLoader = '#delete-my-account-loader'
+
 	// Disable initially
 	document.querySelector(checkboxSelector).disabled = true
 	document.querySelector(buttonSelector).disabled = true
 	document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 
 	const elem = document.getElementById('body-settings')
+	document.querySelector(deleteMyAccountLoader).style.display = 'block'
 	elem.addEventListener('disable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
 	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
+	  document.querySelector(deleteMyAccountLoader).style.display = 'block'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'hidden'
 	})
 
@@ -22,6 +26,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
+	  document.querySelector(deleteMyAccountLoader).style.display = 'none'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'visible'
 	})
 })
-- 
GitLab


From 0273226ce9c5ceab0b00a9d760f0673fb9a849db Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Fri, 4 Oct 2024 15:02:51 +0000
Subject: [PATCH 114/185] better validation for password and username

---
 l10n/de.js                           |  3 ++-
 l10n/de.json                         |  3 ++-
 l10n/de_DE.js                        |  3 ++-
 l10n/de_DE.json                      |  3 ++-
 l10n/en.js                           |  3 ++-
 l10n/en.json                         |  3 ++-
 l10n/es.js                           |  3 ++-
 l10n/es.json                         |  4 +++-
 l10n/fr.js                           |  3 ++-
 l10n/fr.json                         |  3 ++-
 l10n/it.js                           |  3 ++-
 l10n/it.json                         |  3 ++-
 lib/Controller/AccountController.php | 29 ++++++++++++++++++++++++----
 src/signup/RegistrationForm.vue      |  1 +
 14 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/l10n/de.js b/l10n/de.js
index 14a5579d..2c00a409 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" klicken. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen.",
 		"Username is too large.": "Der Benutzername ist zu groß.",
-		"Display name is too large.": "Der Anzeigename ist zu groß."
+		"Display name is too large.": "Der Anzeigename ist zu groß.",
+		"Password has invalid characters.": "Das Passwort enthält ungültige Zeichen."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index c3dd2ba5..63b7d434 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -82,7 +82,8 @@
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn Sie eine Nachricht sehen, die besagt \"Google hasn't verified this app\", können Sie diese ignorieren, indem Sie auf \"Advanced\" tippen. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen.",
 		"Username is too large.": "Der Benutzername ist zu groß.",
-		"Display name is too large.": "Der Anzeigename ist zu groß."
+		"Display name is too large.": "Der Anzeigename ist zu groß.",
+		"Password has invalid characters.": "Das Passwort enthält ungültige Zeichen."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 4754fe0e..9478e844 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -84,6 +84,7 @@ OC.L10N.register(
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" klickst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Nachricht zu entfernen.",
 		"Username is too large.": "Der Benutzername ist zu groß.",
-		"Display name is too large.": "Der Anzeigename ist zu groß."
+		"Display name is too large.": "Der Anzeigename ist zu groß.",
+		"Password has invalid characters.": "Das Passwort enthält ungültige Zeichen."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 2f526340..493c1672 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -82,7 +82,8 @@
 		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Wenn du eine Nachricht siehst, die besagt \"Google hasn't verified this app\", kannst du sie ignorieren, indem du auf \"Advanced\" tippst. Wir arbeiten derzeit daran, die erforderliche Zertifizierung von Google zu erhalten, um diese Fehlermeldung zu beseitigen.",
 		"Username is too large.": "Der Benutzername ist zu groß.",
-		"Display name is too large.": "Der Anzeigename ist zu groß."
+		"Display name is too large.": "Der Anzeigename ist zu groß.",
+		"Password has invalid characters.": "Das Passwort enthält ungültige Zeichen."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/en.js b/l10n/en.js
index d7c570df..95596e24 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -87,6 +87,7 @@ OC.L10N.register(
 		"An error occurred while creating your account!": "An error occurred while creating your account!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.",
 		"Username is too large.": "Username is too large.",
-		"Display name is too large.": "Display name is too large."
+		"Display name is too large.": "Display name is too large.",
+		"Password has invalid characters.": "Password has invalid characters."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/en.json b/l10n/en.json
index 7568e3f8..d6550f49 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -84,7 +84,8 @@
 		"An error occurred while creating your account!": "An error occurred while creating your account!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.",
 		"Username is too large.": "Username is too large.",
-		"Display name is too large.": "Display name is too large."
+		"Display name is too large.": "Display name is too large.",
+		"Password has invalid characters.": "La contraseña tiene caracteres no válidos."	
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
index c97769b9..7238cc2a 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -86,6 +86,7 @@ OC.L10N.register(
 		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje.",
 		"Username is too large.": "El nombre de usuario es demasiado grande.",
-		"Display name is too large.": "El nombre para mostrar es demasiado grande."
+		"Display name is too large.": "El nombre para mostrar es demasiado grande.",
+		"Password has invalid characters.": "La contraseña tiene caracteres no válidos."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index fd22c863..74dad40c 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -85,7 +85,9 @@
 		"An error occurred while creating your account!": "¡Hubo un error creando tu cuenta!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si ves un mensaje que dice \"Google hasn't verified this app\", puedes omitirlo haciendo clic en \"Advanced\". Actualmente estamos trabajando para obtener la certificación que Google exige para eliminar este mensaje.",
 		"Username is too large.": "El nombre de usuario es demasiado grande.",
-		"Display name is too large.": "El nombre para mostrar es demasiado grande."
+		"Display name is too large.": "El nombre para mostrar es demasiado grande.",
+		"Password has invalid characters.": "Password has invalid characters."	
+
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/fr.js b/l10n/fr.js
index 5a84aea7..3a7a008e 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -85,6 +85,7 @@ OC.L10N.register(
 		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message.",
 		"Username is too large.": "Le nom d'utilisateur est trop grand.",
-		"Display name is too large.": "Le nom affiché est trop grand."
+		"Display name is too large.": "Le nom affiché est trop grand.",
+		"Password has invalid characters.": "Le mot de passe contient des caractères non valides."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 2b733b05..8f27e62a 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -84,7 +84,8 @@
 		"An error occurred while creating your account!": "Une erreur s'est produite lors de la création de votre compte!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Si vous voyez un message disant \"Google hasn't verified this app\" vous pouvez le contourner en cliquant sur \"Advanced\". Nous travaillons actuellement sur l'obtention de la certification exigée par Google pour se débarrasser de ce message.",
 		"Username is too large.": "Le nom d'utilisateur est trop grand.",
-		"Display name is too large.": "Le nom affiché est trop grand."
+		"Display name is too large.": "Le nom affiché est trop grand.",
+		"Password has invalid characters.": "Le mot de passe contient des caractères non valides."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index cbf1181e..f90e0506 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -85,6 +85,7 @@ OC.L10N.register(
 		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo facendo clic su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio.",
 		"Username is too large.": "Il nome utente è troppo grande.",
-		"Display name is too large.": "Il nome del display è troppo grande."
+		"Display name is too large.": "Il nome del display è troppo grande.",
+		"Password has invalid characters.": "La password contiene caratteri non validi."
 	},
 	"nplurals=2; plural=(n != 1);");
diff --git a/l10n/it.json b/l10n/it.json
index 18307c2b..fcd388c4 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -80,7 +80,8 @@
 		"An error occurred while creating your account!": "Si è verificato un errore nella creazione dell'account!",
 		"If you see a \"Google hasn't verified this app\" message you can bypass it by clicking \"Advanced\". We're currently working on passing the certification Google demands to get rid of this message.":"Se vedi un messaggio che dice \"Google hasn't verified this app\", puoi ignorarlo cliccando su \"Advanced\". Attualmente stiamo lavorando per ottenere la certificazione richiesta da Google per eliminare questo messaggio.",
 		"Username is too large.": "Il nome utente è troppo grande.",
-		"Display name is too large.": "Il nome del display è troppo grande."
+		"Display name is too large.": "Il nome del display è troppo grande.",
+		"Password has invalid characters.": "La password contiene caratteri non validi."
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 550e1a7d..81a2e997 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -21,6 +21,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
+use OCP\Files\IAppData;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IRequest;
@@ -43,13 +44,15 @@ class AccountController extends Controller {
 	/** @var IConfig */
 	private IConfig $config;
 	private IInitialState $initialState;
+	private IAppData $appData;
 	private const SESSION_USERNAME_CHECK = 'username_check_passed';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
 	private const ALLOWED_CAPTCHA_PROVIDERS = ['image', 'hcaptcha'];
 	private const DEFAULT_CAPTCHA_PROVIDER = 'image';
 	private const HCAPTCHA_PROVIDER = 'hcaptcha';
 	private const HCAPTCHA_DOMAINS = ['https://hcaptcha.com', 'https://*.hcaptcha.com'];
-
+	private const BLACKLISTED_USERNAMES_FILE_NAME = 'blacklisted_usernames';
+	
 	private ILogger $logger;
 	public function __construct(
 		$AppName,
@@ -64,7 +67,8 @@ class AccountController extends Controller {
 		ISession $session,
 		IConfig $config,
 		ILogger $logger,
-		IInitialState $initialState
+		IInitialState $initialState,
+		IAppData $appData
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
@@ -80,6 +84,7 @@ class AccountController extends Controller {
 		$this->logger = $logger;
 		$this->request = $request;
 		$this->initialState = $initialState;
+		$this->appData = $appData;
 	}
 
 	/**
@@ -154,6 +159,12 @@ class AccountController extends Controller {
 			return $response;
 		}
 
+		if (preg_match("/\\\/", $password)) {
+			$response->setData(['message' => 'Password has invalid characters.', 'success' => false]);
+			$response->setStatus(400);
+			return $response;
+		}
+
 		$inputData = [
 			'username' => ['value' => $username, 'maxLength' => 30],
 			'display name' => ['value' => $displayname, 'maxLength' => 30],
@@ -274,14 +285,24 @@ class AccountController extends Controller {
 				return $response;
 			}
 		}
-		if (!preg_match('/^[a-zA-Z0-9._-]+$/', $username)) {
+		if (!preg_match('/^(?=.{3,30}$)(?![_.-])(?!.*[_.-]{2})[a-zA-Z0-9._-]+(?<![_.-])$/', $username)) {
 			$response->setData(['message' => 'Username must consist of letters, numbers, hyphens, dots and underscores only.', 'field' => 'username', 'success' => false]);
 			$response->setStatus(403);
 			return $response;
 		}
 		try {
 			$username = mb_strtolower($username, 'UTF-8');
-			if (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) {
+			$blacklist = [];
+			$appDataFolder = $this->appData->getFolder('/');
+			if (!$appDataFolder->fileExists(self::BLACKLISTED_USERNAMES_FILE_NAME)) {
+				$appDataFolder->newFile(self::BLACKLISTED_USERNAMES_FILE_NAME, "");
+			}
+			$content = $appDataFolder->getFile(self::BLACKLISTED_USERNAMES_FILE_NAME)->getContent();
+			$blacklist = explode("\n", $content);
+
+			if (in_array($username, $blacklist)) {
+				$response->setData(['message' => 'Username is already taken.', 'field' => 'username', 'success' => false]);
+			} elseif (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) {
 				$response->setStatus(200);
 				$this->session->set(self::SESSION_USERNAME_CHECK, true);
 			} else {
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 7ae385ab..70dd2350 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -208,6 +208,7 @@ export default {
 			passwordErrors: [],
 			passwordRules: [
 				{ message: t(this.appName, 'Incorrect password length: Required length is 8 to 32'), regex: /.{8,32}/ },
+				{ message: t(this.appName, 'Password has invalid characters.'), regex: /^(?!.*\\).*/ },
 			],
 			isUsernameAvailable: false,
 			processing: false,
-- 
GitLab


From 6beea3cac94fe8a72229f6255429bf10df218cc8 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Sun, 13 Oct 2024 12:57:43 +0000
Subject: [PATCH 115/185] Storage wrapper to disable filesystem fully

---
 lib/AppInfo/Application.php       |  29 ++++
 lib/Filesystem/CacheWrapper.php   |  47 ++++++
 lib/Filesystem/StorageWrapper.php | 260 ++++++++++++++++++++++++++++++
 3 files changed, 336 insertions(+)
 create mode 100644 lib/Filesystem/CacheWrapper.php
 create mode 100644 lib/Filesystem/StorageWrapper.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 24c5f795..a6f4e9c6 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,6 +26,8 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
+use OC\Files\Filesystem;
+use OCA\EcloudAccounts\Filesystem\StorageWrapper;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
@@ -39,10 +41,12 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
+use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
@@ -52,6 +56,7 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
+		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
@@ -69,4 +74,28 @@ class Application extends App implements IBootstrap {
 			);
 		});
 	}
+
+	/**
+	 * @internal
+	 */
+	public function addStorageWrapper(): void {
+		Filesystem::addStorageWrapper('ecloud-accounts', [$this, 'addStorageWrapperCallback'], -10);
+	}
+
+	/**
+	 * @internal
+	 * @param $mountPoint
+	 * @param IStorage $storage
+	 * @return StorageWrapper|IStorage
+	 */
+	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
+		if (!\OC::$CLI && $mountPoint !== '/') {
+			return new StorageWrapper([
+				'storage' => $storage,
+				'mountPoint' => $mountPoint,
+			]);
+		}
+
+		return $storage;
+	}
 }
diff --git a/lib/Filesystem/CacheWrapper.php b/lib/Filesystem/CacheWrapper.php
new file mode 100644
index 00000000..8233a60e
--- /dev/null
+++ b/lib/Filesystem/CacheWrapper.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Filesystem;
+
+use OC\Files\Cache\Wrapper\CacheWrapper as Wrapper;
+use OCP\Constants;
+use OCP\Files\Cache\ICache;
+use OCP\Files\ForbiddenException;
+
+class CacheWrapper extends Wrapper {
+
+	public function __construct(
+		ICache $cache
+	) {
+		parent::__construct($cache);
+		$this->mask = Constants::PERMISSION_ALL
+			& ~Constants::PERMISSION_READ
+			& ~Constants::PERMISSION_CREATE
+			& ~Constants::PERMISSION_UPDATE
+			& ~Constants::PERMISSION_DELETE;
+	}
+
+	protected function formatCacheEntry($entry) {
+		if (isset($entry['path']) && isset($entry['permissions'])) {
+			try {
+				throw new ForbiddenException('Access denied', false);
+			} catch (ForbiddenException) {
+				$entry['permissions'] &= $this->mask;
+			}
+		}
+		return $entry;
+	}
+
+	public function insert($file, $data) {
+		throw new \Exception('User data cache insert is disabled.');
+	}
+
+	public function update($id, $data) {
+		throw new \Exception('User data cache update is disabled.');
+	}
+
+	public function remove($fileId) {
+		throw new \Exception('User data cache removal is disabled.');
+	}
+}
diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
new file mode 100644
index 00000000..f35a5510
--- /dev/null
+++ b/lib/Filesystem/StorageWrapper.php
@@ -0,0 +1,260 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Filesystem;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Storage\Storage;
+use OC\Files\Storage\Wrapper\Wrapper;
+use OCP\Files\ForbiddenException;
+use OCP\Files\Storage\IStorage;
+use OCP\Files\Storage\IWriteStreamStorage;
+
+class StorageWrapper extends Wrapper implements IWriteStreamStorage {
+	/**
+	 * @param array $parameters
+	 */
+	public function __construct($parameters) {
+		parent::__construct($parameters);
+	}
+
+	/**
+	 * @throws ForbiddenException
+	 */
+	protected function checkFileAccess(string $path, bool $isDir = false): void {
+		throw new ForbiddenException('Access denied', false);
+	}
+
+	/*
+	 * Storage wrapper methods
+	 */
+
+	/**
+	 * see http://php.net/manual/en/function.mkdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function mkdir($path) {
+		$this->checkFileAccess($path, true);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rmdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function rmdir($path) {
+		$this->checkFileAccess($path, true);
+	}
+
+	/**
+	 * check if a file can be created in $path
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isCreatable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file can be read
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isReadable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file can be written to
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isUpdatable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file can be deleted
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isDeletable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	public function getPermissions($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return $this->mask;
+		}
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_get_contents.php
+	 *
+	 * @param string $path
+	 * @return string
+	 * @throws ForbiddenException
+	 */
+	public function file_get_contents($path) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_put_contents.php
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function file_put_contents($path, $data) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.unlink.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function unlink($path) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rename.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function rename($path1, $path2) {
+		$this->checkFileAccess($path1);
+		$this->checkFileAccess($path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.copy.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function copy($path1, $path2) {
+		$this->checkFileAccess($path1);
+		$this->checkFileAccess($path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.fopen.php
+	 *
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 * @throws ForbiddenException
+	 */
+	public function fopen($path, $mode) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.touch.php
+	 * If the backend does not support the operation, false should be returned
+	 *
+	 * @param string $path
+	 * @param int $mtime
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function touch($path, $mtime = null) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * get a cache instance for the storage
+	 *
+	 * @param string $path
+	 * @param Storage (optional) the storage to pass to the cache
+	 * @return Cache
+	 */
+	public function getCache($path = '', $storage = null) {
+		if (!$storage) {
+			$storage = $this;
+		}
+		$cache = $this->storage->getCache($path, $storage);
+		return new CacheWrapper($cache, $storage);
+	}
+
+	/**
+	 * A custom storage implementation can return an url for direct download of a give file.
+	 *
+	 * For now the returned array can hold the parameter url - in future more attributes might follow.
+	 *
+	 * @param string $path
+	 * @return array
+	 * @throws ForbiddenException
+	 */
+	public function getDirectDownload($path) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * @param IStorage $sourceStorage
+	 * @param string $sourceInternalPath
+	 * @param string $targetInternalPath
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		$this->checkFileAccess($targetInternalPath);
+	}
+
+	/**
+	 * @param IStorage $sourceStorage
+	 * @param string $sourceInternalPath
+	 * @param string $targetInternalPath
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		$this->checkFileAccess($targetInternalPath);
+	}
+
+	/**
+	 * @throws ForbiddenException
+	 */
+	public function writeStream(string $path, $stream, ?int $size = null): int {
+		$this->checkFileAccess($path);
+	}
+}
-- 
GitLab


From d81e92cde565c354babe88777c98aa58f6d03168 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Sun, 13 Oct 2024 13:00:18 +0000
Subject: [PATCH 116/185] Bump version to 9.0.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 90509703..e32120fc 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>8.0.2</version>
+    <version>9.0.0</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
-- 
GitLab


From d8cbe225ad3f401fe00fe0add25f230d975d6f8d Mon Sep 17 00:00:00 2001
From: AVINASH GUSAIN <avinashg@e.email>
Date: Thu, 17 Oct 2024 14:32:17 +0000
Subject: [PATCH 117/185] skip appdata folder

---
 appinfo/info.xml            | 2 +-
 lib/AppInfo/Application.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e32120fc..90509703 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>9.0.0</version>
+    <version>8.0.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index a6f4e9c6..ae455434 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -89,7 +89,9 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
-		if (!\OC::$CLI && $mountPoint !== '/') {
+		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+		$appdataFolder = 'appdata_' . $instanceId;
+		if (!\OC::$CLI && $mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
 			return new StorageWrapper([
 				'storage' => $storage,
 				'mountPoint' => $mountPoint,
-- 
GitLab


From cc1c12c2ee05186104450b85289ef78923fd1a12 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 22 Oct 2024 06:14:52 +0000
Subject: [PATCH 118/185] Improve userName & displayName validation on
 accountCreation stage

---
 lib/Controller/AccountController.php | 28 ++++++++++++++++++++++------
 src/Signup.vue                       |  2 --
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 81a2e997..83584199 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -45,7 +45,8 @@ class AccountController extends Controller {
 	private IConfig $config;
 	private IInitialState $initialState;
 	private IAppData $appData;
-	private const SESSION_USERNAME_CHECK = 'username_check_passed';
+	private const SESSION_VERIFIED_USERNAME = 'verified_username';
+	private const SESSION_VERIFIED_DISPLAYNAME = 'verified_displayname';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
 	private const ALLOWED_CAPTCHA_PROVIDERS = ['image', 'hcaptcha'];
 	private const DEFAULT_CAPTCHA_PROVIDER = 'image';
@@ -143,7 +144,7 @@ class AccountController extends Controller {
 	 *
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
-	public function create(string $displayname = '', string $recoveryEmail = '', string $username = '', string $password = '', string $language = 'en', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse {
+	public function create(string $recoveryEmail = '', string $password = '', string $language = 'en', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse {
 		
 		$response = new DataResponse();
 		
@@ -153,7 +154,10 @@ class AccountController extends Controller {
 			return $response;
 		}
 
-		if (!$this->session->get(self::SESSION_USERNAME_CHECK)) {
+		$displayname = $this->session->get(self::SESSION_VERIFIED_DISPLAYNAME);
+		$username = $this->session->get(self::SESSION_VERIFIED_USERNAME);
+
+		if ($this->isNullOrEmptyInput($displayname) || $this->isNullOrEmptyInput($username)) {
 			$response->setData(['message' => 'Username is already taken.', 'success' => false]);
 			$response->setStatus(400);
 			return $response;
@@ -200,7 +204,8 @@ class AccountController extends Controller {
 		
 			$this->userService->sendWelcomeEmail($displayname, $username, $userEmail, $language);
 			
-			$this->session->remove(self::SESSION_USERNAME_CHECK);
+			$this->session->remove(self::SESSION_VERIFIED_USERNAME);
+			$this->session->remove(self::SESSION_VERIFIED_DISPLAYNAME);
 			$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
 			$ipAddress = $this->request->getRemoteAddress();
 			$this->userService->addUsernameToCommonDataStore($username, $ipAddress, $recoveryEmail);
@@ -227,6 +232,15 @@ class AccountController extends Controller {
 
 		return $response;
 	}
+
+	private function isNullOrEmptyInput(string|null $input): bool {
+		if($input === null || empty(trim($input))) {
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Validate input for a given input name, value, and optional maximum length.
 	 *
@@ -259,7 +273,8 @@ class AccountController extends Controller {
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
 	public function validateFields(string $username, string $displayname) : DataResponse {
-		$this->session->remove(self::SESSION_USERNAME_CHECK);
+		$this->session->remove(self::SESSION_VERIFIED_DISPLAYNAME);
+		$this->session->remove(self::SESSION_VERIFIED_USERNAME);
 		$response = new DataResponse();
 		$response->setStatus(400);
 
@@ -304,7 +319,8 @@ class AccountController extends Controller {
 				$response->setData(['message' => 'Username is already taken.', 'field' => 'username', 'success' => false]);
 			} elseif (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) {
 				$response->setStatus(200);
-				$this->session->set(self::SESSION_USERNAME_CHECK, true);
+				$this->session->set(self::SESSION_VERIFIED_USERNAME, $username);
+				$this->session->set(self::SESSION_VERIFIED_DISPLAYNAME, $displayname);
 			} else {
 				$response->setData(['message' => 'Username is already taken.', 'field' => 'username', 'success' => false]);
 			}
diff --git a/src/Signup.vue b/src/Signup.vue
index a14320ae..719b96ff 100644
--- a/src/Signup.vue
+++ b/src/Signup.vue
@@ -92,8 +92,6 @@ export default {
 		submitRecoveryEmailForm(data) {
 			if (data.isFormValid) {
 				const data = {
-					displayname: this.formData.displayname,
-					username: this.formData.username,
 					password: this.formData.password,
 					recoveryEmail: this.formData.email,
 					language: this.formData.selectedLanguage,
-- 
GitLab


From ae2b37e7dcc04509259f02da8778ea7d96e7a93c Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 24 Oct 2024 15:39:18 +0000
Subject: [PATCH 119/185] feat: remove cli check condition on storageWrapper
 setup

---
 appinfo/info.xml            | 2 +-
 lib/AppInfo/Application.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 90509703..35a9b216 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>8.0.2</version>
+    <version>8.0.3</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index ae455434..1beceac8 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -91,7 +91,7 @@ class Application extends App implements IBootstrap {
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
-		if (!\OC::$CLI && $mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
+		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
 			return new StorageWrapper([
 				'storage' => $storage,
 				'mountPoint' => $mountPoint,
-- 
GitLab


From 05febe930bc644b2c323aa1554710f9e390897b8 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Fri, 25 Oct 2024 07:03:58 +0000
Subject: [PATCH 120/185] disable search

---
 lib/Filesystem/CacheWrapper.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/Filesystem/CacheWrapper.php b/lib/Filesystem/CacheWrapper.php
index 8233a60e..da6e3253 100644
--- a/lib/Filesystem/CacheWrapper.php
+++ b/lib/Filesystem/CacheWrapper.php
@@ -7,7 +7,9 @@ namespace OCA\EcloudAccounts\Filesystem;
 use OC\Files\Cache\Wrapper\CacheWrapper as Wrapper;
 use OCP\Constants;
 use OCP\Files\Cache\ICache;
+use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\ForbiddenException;
+use OCP\Files\Search\ISearchQuery;
 
 class CacheWrapper extends Wrapper {
 
@@ -44,4 +46,12 @@ class CacheWrapper extends Wrapper {
 	public function remove($fileId) {
 		throw new \Exception('User data cache removal is disabled.');
 	}
+
+	public function searchQuery(ISearchQuery $searchQuery) {
+		return [];
+	}
+
+	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
+		return null;
+	}
 }
-- 
GitLab


From 078c2cb1d9d5062da1e095cc0fa90ccee4791527 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 14 Jan 2025 06:38:26 +0000
Subject: [PATCH 121/185] Add origin header on newsletter POST /singnup request

---
 lib/Service/NewsLetterService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Service/NewsLetterService.php b/lib/Service/NewsLetterService.php
index 110861c6..5053d659 100644
--- a/lib/Service/NewsLetterService.php
+++ b/lib/Service/NewsLetterService.php
@@ -54,6 +54,7 @@ class NewsLetterService {
 
 	private function signupForNewsletter(string $userEmail, array $listIds, string $userLanguage): void {
 		$newsletterApiUrl = $this->config->getSystemValue('newsletter_base_url', '');
+		$origin = (!empty($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'];
 
 		if (empty($newsletterApiUrl)) {
 			return;
@@ -70,7 +71,8 @@ class NewsLetterService {
 		$params_string = json_encode($params);
 		$headers = [
 			'Content-Type: application/json',
-			'Content-Length: ' . strlen($params_string)
+			'Content-Length: ' . strlen($params_string),
+			'Origin: ' . $origin
 		];
 		$this->curl->post($url, $params, $headers);
 
-- 
GitLab


From 0717336fc93b5cdf8f83f8eec3b892f7270c395b Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 14 Jan 2025 13:14:20 +0000
Subject: [PATCH 122/185] Search SSO API endpoint with email instead of
 username

---
 appinfo/info.xml           |  2 +-
 lib/Service/SSOService.php | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 35a9b216..88fad061 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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>8.0.3</version>
+    <version>8.0.4</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/Service/SSOService.php b/lib/Service/SSOService.php
index 896b2d20..a6cb4d23 100644
--- a/lib/Service/SSOService.php
+++ b/lib/Service/SSOService.php
@@ -8,6 +8,7 @@ use OCA\EcloudAccounts\Exception\SSOAdminAccessTokenException;
 use OCA\EcloudAccounts\Exception\SSOAdminAPIException;
 use OCP\IConfig;
 use OCP\ILogger;
+use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Security\ICrypto;
 
@@ -21,12 +22,13 @@ class SSOService {
 	private string $currentUserId;
 	private ICrypto $crypto;
 	private IFactory $l10nFactory;
+	private IUserManager $userManager;
 
 	private const ADMIN_TOKEN_ENDPOINT = '/auth/realms/master/protocol/openid-connect/token';
 	private const USERS_ENDPOINT = '/users';
 	private const CREDENTIALS_ENDPOINT = '/users/{USER_ID}/credentials';
 
-	public function __construct($appName, IConfig $config, CurlService $curlService, ICrypto $crypto, IFactory $l10nFactory, ILogger $logger) {
+	public function __construct($appName, IConfig $config, CurlService $curlService, ICrypto $crypto, IFactory $l10nFactory, IUserManager $userManager, ILogger $logger) {
 		$this->appName = $appName;
 		$this->config = $config;
 
@@ -45,6 +47,7 @@ class SSOService {
 		$this->curl = $curlService;
 		$this->logger = $logger;
 		$this->l10nFactory = $l10nFactory;
+		$this->userManager = $userManager;
 	}
 
 	public function shouldSync2FA() : bool {
@@ -147,8 +150,16 @@ class SSOService {
 	}
 
 	private function getUserId(string $username) : void {
-		$usernameWithoutDomain = explode('@', $username)[0];
-		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '?exact=true&username=' . $usernameWithoutDomain;
+		$user = $this->userManager->get($username);
+		if ($user === null) {
+			throw new SSOAdminAPIException('Error: no user exists in cloud with username ' . $username);
+		}
+		$email = $user->getEMailAddress();
+		if ($email === null) {
+			throw new SSOAdminAPIException('Error: user with username ' . $username . ' does not have email field set');
+		}
+
+		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '?exact=true&email=' . $email;
 		$this->logger->debug('getUserId calling SSO API with url: '. $url);
 		$users = $this->callSSOAPI($url, 'GET');
 		if (empty($users) || !is_array($users) || !isset($users[0])) {
-- 
GitLab


From 024895a4e516f2e1a88e1737fa5447b519348501 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 15 Jan 2025 07:23:53 +0000
Subject: [PATCH 123/185] Update newsletter POST signup api endpoint

---
 lib/Service/NewsLetterService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/NewsLetterService.php b/lib/Service/NewsLetterService.php
index 5053d659..e40b4326 100644
--- a/lib/Service/NewsLetterService.php
+++ b/lib/Service/NewsLetterService.php
@@ -60,7 +60,7 @@ class NewsLetterService {
 			return;
 		}
 
-		$endpoint = '/api/signup';
+		$endpoint = '/v2/api/signup';
 		$url = $newsletterApiUrl . $endpoint;
 
 		$params = [
-- 
GitLab


From c1f7d33d997e125171315771dacfdcd6f9698a08 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 10:47:16 +0530
Subject: [PATCH 124/185] Invalidate session and reset last login

---
 .../InvalidateSessionsAndResetLastLogin.php   | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 lib/Command/InvalidateSessionsAndResetLastLogin.php

diff --git a/lib/Command/InvalidateSessionsAndResetLastLogin.php b/lib/Command/InvalidateSessionsAndResetLastLogin.php
new file mode 100644
index 00000000..179a9448
--- /dev/null
+++ b/lib/Command/InvalidateSessionsAndResetLastLogin.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Command;
+
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\DB\ISimpleQueryBuilder;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class InvalidateSessionsAndResetLastLogin extends Command {
+    private IUserManager $userManager;
+    private IDBConnection $dbConnection;
+    private OutputInterface $commandOutput;
+
+    public function __construct(IUserManager $userManager, IDBConnection $dbConnection) {
+        $this->userManager = $userManager;
+        $this->dbConnection = $dbConnection;
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('ecloud-accounts:invalidate-sessions-reset-lastlogin')
+            ->setDescription('Invalidates user sessions and resets lastlogin for users created after a specified date')
+            ->addOption(
+                'created-after',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Users created after this date (format: YYYY-MM-DD)',
+                ''
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        try {
+            $this->commandOutput = $output;
+            $createdAfter = $input->getOption('created-after');
+
+            if (empty($createdAfter) || !strtotime($createdAfter)) {
+                $output->writeln('Invalid or missing date for --created-after.');
+                return 1;
+            }
+
+            $users = $this->getUsersCreatedAfter($createdAfter);
+            if (empty($users)) {
+                $output->writeln('No users found created after ' . $createdAfter . '.');
+                return 0;
+            }
+
+            $this->invalidateSessions($users);
+            $this->resetLastLogin($users);
+
+            $output->writeln('Successfully invalidated sessions and reset lastlogin for users:');
+            $output->writeln(implode(', ', $users));
+
+            return 0;
+        } catch (\Exception $e) {
+            $this->commandOutput->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+    }
+
+    private function getUsersCreatedAfter(string $date): array {
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->select('uid')
+            ->from('users')
+            ->where($queryBuilder->expr()->gt('creation_date', $queryBuilder->createNamedParameter($date, IQueryBuilder::PARAM_STR)));
+
+        $result = $queryBuilder->executeQuery();
+        return $result->fetchFirstColumn();
+    }
+
+    private function invalidateSessions(array $userIds): void {
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->delete('authtoken')
+            ->where($queryBuilder->expr()->in('user', $queryBuilder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $queryBuilder->executeStatement();
+        $this->commandOutput->writeln('Invalidated sessions for ' . count($userIds) . ' users.');
+    }
+
+    private function resetLastLogin(array $userIds): void {
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->update('preferences')
+            ->set('configvalue', $queryBuilder->createNamedParameter(null))
+            ->where($queryBuilder->expr()->in('user_id', $queryBuilder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
+            ->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastlogin')));
+
+        $queryBuilder->executeStatement();
+        $this->commandOutput->writeln('Reset lastlogin for ' . count($userIds) . ' users.');
+    }
+}
-- 
GitLab


From 132f39ffcde5b47e4f0188f3afaed2e0b9a691f8 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 11:09:32 +0530
Subject: [PATCH 125/185] fetch ldap records and logout session

---
 .../InvalidateSessionsAndResetLastLogin.php   | 100 ----------------
 lib/Command/ResetUserSessions.php             | 112 ++++++++++++++++++
 lib/Service/LDAPConnectionService.php         |  35 ++++++
 3 files changed, 147 insertions(+), 100 deletions(-)
 delete mode 100644 lib/Command/InvalidateSessionsAndResetLastLogin.php
 create mode 100644 lib/Command/ResetUserSessions.php

diff --git a/lib/Command/InvalidateSessionsAndResetLastLogin.php b/lib/Command/InvalidateSessionsAndResetLastLogin.php
deleted file mode 100644
index 179a9448..00000000
--- a/lib/Command/InvalidateSessionsAndResetLastLogin.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Command;
-
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\DB\ISimpleQueryBuilder;
-use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IDBConnection;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class InvalidateSessionsAndResetLastLogin extends Command {
-    private IUserManager $userManager;
-    private IDBConnection $dbConnection;
-    private OutputInterface $commandOutput;
-
-    public function __construct(IUserManager $userManager, IDBConnection $dbConnection) {
-        $this->userManager = $userManager;
-        $this->dbConnection = $dbConnection;
-        parent::__construct();
-    }
-
-    protected function configure(): void {
-        $this
-            ->setName('ecloud-accounts:invalidate-sessions-reset-lastlogin')
-            ->setDescription('Invalidates user sessions and resets lastlogin for users created after a specified date')
-            ->addOption(
-                'created-after',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'Users created after this date (format: YYYY-MM-DD)',
-                ''
-            );
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int {
-        try {
-            $this->commandOutput = $output;
-            $createdAfter = $input->getOption('created-after');
-
-            if (empty($createdAfter) || !strtotime($createdAfter)) {
-                $output->writeln('Invalid or missing date for --created-after.');
-                return 1;
-            }
-
-            $users = $this->getUsersCreatedAfter($createdAfter);
-            if (empty($users)) {
-                $output->writeln('No users found created after ' . $createdAfter . '.');
-                return 0;
-            }
-
-            $this->invalidateSessions($users);
-            $this->resetLastLogin($users);
-
-            $output->writeln('Successfully invalidated sessions and reset lastlogin for users:');
-            $output->writeln(implode(', ', $users));
-
-            return 0;
-        } catch (\Exception $e) {
-            $this->commandOutput->writeln('<error>' . $e->getMessage() . '</error>');
-            return 1;
-        }
-    }
-
-    private function getUsersCreatedAfter(string $date): array {
-        $queryBuilder = $this->dbConnection->getQueryBuilder();
-        $queryBuilder->select('uid')
-            ->from('users')
-            ->where($queryBuilder->expr()->gt('creation_date', $queryBuilder->createNamedParameter($date, IQueryBuilder::PARAM_STR)));
-
-        $result = $queryBuilder->executeQuery();
-        return $result->fetchFirstColumn();
-    }
-
-    private function invalidateSessions(array $userIds): void {
-        $queryBuilder = $this->dbConnection->getQueryBuilder();
-        $queryBuilder->delete('authtoken')
-            ->where($queryBuilder->expr()->in('user', $queryBuilder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-        $queryBuilder->executeStatement();
-        $this->commandOutput->writeln('Invalidated sessions for ' . count($userIds) . ' users.');
-    }
-
-    private function resetLastLogin(array $userIds): void {
-        $queryBuilder = $this->dbConnection->getQueryBuilder();
-        $queryBuilder->update('preferences')
-            ->set('configvalue', $queryBuilder->createNamedParameter(null))
-            ->where($queryBuilder->expr()->in('user_id', $queryBuilder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)))
-            ->andWhere($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
-            ->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastlogin')));
-
-        $queryBuilder->executeStatement();
-        $this->commandOutput->writeln('Reset lastlogin for ' . count($userIds) . ' users.');
-    }
-}
diff --git a/lib/Command/ResetUserSessions.php b/lib/Command/ResetUserSessions.php
new file mode 100644
index 00000000..8e2fbd84
--- /dev/null
+++ b/lib/Command/ResetUserSessions.php
@@ -0,0 +1,112 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Command;
+
+use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ResetUserSessions extends Command {
+	private LDAPConnectionService $ldapService;
+	private IDBConnection $db;
+	
+	/**
+	 * Construct method
+	 * @param \OCA\EcloudAccounts\Service\LDAPConnectionService $ldapService
+	 * @param \OCP\IDBConnection $db
+	 */
+	public function __construct(LDAPConnectionService $ldapService, IDBConnection $db) {
+		$this->ldapService = $ldapService;
+		$this->db = $db;
+		parent::__construct();
+	}
+	/**
+	 * How to run: `occ ecloud-accounts:reset-user-sessions --date=20241201000000Z`
+	 * @return void
+	 */
+	protected function configure(): void {
+		$this
+			->setName('ecloud-accounts:reset-user-sessions')
+			->setDescription('Invalidate sessions and reset first login for users created after a specific date')
+			->addOption(
+				'date',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Date in YYYYMMDDHHMMSSZ format (e.g., 20241201000000Z)',
+				null
+			);
+	}
+	/**
+	 * Execute function
+	 * @param \Symfony\Component\Console\Input\InputInterface $input
+	 * @param \Symfony\Component\Console\Output\OutputInterface $output
+	 * @return int
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$date = $input->getOption('date');
+
+		if (!$date) {
+			$output->writeln('Date option is required.');
+			return Command::INVALID;
+		}
+
+		try {
+			$users = $this->ldapService->getUsersCreatedAfter($date);
+			foreach ($users as $user) {
+				if (!$user['username']) {
+					continue;
+				}
+
+				$output->writeln("Processing user: " . $user['username']);
+
+				// Invalidate sessions
+				$this->invalidateUserSessions($user['username']);
+				$output->writeln("Invalidated session for user: " . $user['username']);
+
+				// Reset first login
+				$this->resetFirstLogin($user['username']);
+				$output->writeln("Reset first login for user: " . $user['username']);
+			}
+
+			$output->writeln('All sessions invalidated and first login reset for eligible users.');
+			return Command::SUCCESS;
+		} catch (\Exception $e) {
+			$output->writeln('Error:' . $e->getMessage());
+			return Command::FAILURE;
+		}
+	}
+	/**
+	 * Invalidate user sessions for username
+	 * @param string $username
+	 * @return void
+	 */
+	private function invalidateUserSessions(string $username): void {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->delete('authtoken')
+			->where($qb->expr()->eq('uid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)));
+
+		$qb->executeStatement();
+	}
+	/**
+	 * Reset firsst login
+	 * @param string $username
+	 * @return void
+	 */
+	private function resetFirstLogin(string $username): void {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->update('preferences')
+			->set('configvalue', $qb->createNamedParameter('0', IQueryBuilder::PARAM_STR))
+			->where($qb->expr()->eq('userid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('firstLogin', IQueryBuilder::PARAM_STR)));
+
+		$qb->executeStatement();
+	}
+}
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index f7609941..7aa63157 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -122,4 +122,39 @@ class LDAPConnectionService {
 
 		$this->closeLDAPConnection($conn);
 	}
+	public function getUsersCreatedAfter(string $date): array {
+		if (!$this->isLDAPEnabled()) {
+			throw new Exception('LDAP backend is not enabled');
+		}
+	
+		// Convert the provided date to LDAP Generalized Time format: YYYYMMDDHHMMSSZ
+		$formattedDate = (new \DateTime($date))->format('YmdHis') . 'Z';
+	
+		$conn = $this->getLDAPConnection();
+		$baseDn = implode(',', $this->getLDAPBaseUsers());
+		$filter = sprintf('(createTimestamp>=%s)', $formattedDate);
+	
+		$searchResult = ldap_search($conn, $baseDn, $filter, ['dn', 'username', 'createTimestamp']);
+		if (!$searchResult) {
+			$this->closeLDAPConnection($conn);
+			throw new Exception('LDAP search failed for createTimestamp after: ' . $date);
+		}
+	
+		$entries = ldap_get_entries($conn, $searchResult);
+		$this->closeLDAPConnection($conn);
+	
+		$users = [];
+		if ($entries['count'] > 0) {
+			for ($i = 0; $i < $entries['count']; $i++) {
+				$users[] = [
+					'dn' => $entries[$i]['dn'],
+					'username' => $entries[$i]['username'][0] ?? null,
+					'createTimestamp' => $entries[$i]['createtimestamp'][0] ?? null,
+				];
+			}
+		}
+	
+		return $users;
+	}
+
 }
-- 
GitLab


From 23c5704f28025582bf54df546a3632e42ce735b7 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 11:34:38 +0530
Subject: [PATCH 126/185] code changes

---
 lib/Command/ResetUserPreferences.php |  96 +++++++++++++++++++++++
 lib/Command/ResetUserSessions.php    | 112 ---------------------------
 2 files changed, 96 insertions(+), 112 deletions(-)
 create mode 100644 lib/Command/ResetUserPreferences.php
 delete mode 100644 lib/Command/ResetUserSessions.php

diff --git a/lib/Command/ResetUserPreferences.php b/lib/Command/ResetUserPreferences.php
new file mode 100644
index 00000000..35c7e277
--- /dev/null
+++ b/lib/Command/ResetUserPreferences.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Command;
+
+use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ResetUserPreferences extends Command {
+    private LDAPConnectionService $ldapService;
+    private IDBConnection $db;
+
+    public function __construct(LDAPConnectionService $ldapService, IDBConnection $db) {
+        $this->ldapService = $ldapService;
+        $this->db = $db;
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('ecloud-accounts:reset-user-preferences')
+            ->setDescription('Invalidate sessions and remove preferences for users created after a specific date')
+            ->addOption(
+                'date',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Date in YYYYMMDDHHMMSSZ format (e.g., 20241201000000Z)',
+                null
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $date = $input->getOption('date');
+
+        if (!$date) {
+            $output->writeln('<error>Date option is required.</error>');
+            return Command::INVALID;
+        }
+
+        try {
+            // Fetch users from LDAP
+            $users = $this->ldapService->getUsersCreatedAfter($date);
+
+            foreach ($users as $user) {
+                if (!$user['username']) {
+                    continue;
+                }
+
+                $username = $user['username'];
+                $output->writeln("Processing user: $username");
+
+                // Invalidate user sessions
+                $this->invalidateUserSessions($username);
+                $output->writeln("Invalidated session for user: $username");
+
+                // Delete specific preferences
+                $this->deletePreference($username, 'firstLoginAccomplished');
+                $output->writeln("Deleted 'firstLoginAccomplished' preference for user: $username");
+
+                $this->deletePreference($username, 'lastLogin');
+                $output->writeln("Deleted 'lastLogin' preference for user: $username");
+            }
+
+            $output->writeln('<info>All sessions invalidated and preferences deleted for eligible users.</info>');
+            return Command::SUCCESS;
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return Command::FAILURE;
+        }
+    }
+
+    private function invalidateUserSessions(string $username): void {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)));
+
+        $qb->executeStatement();
+    }
+
+    private function deletePreference(string $username, string $key): void {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->delete('preferences')
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+
+        $qb->executeStatement();
+    }
+}
diff --git a/lib/Command/ResetUserSessions.php b/lib/Command/ResetUserSessions.php
deleted file mode 100644
index 8e2fbd84..00000000
--- a/lib/Command/ResetUserSessions.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Command;
-
-use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IDBConnection;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class ResetUserSessions extends Command {
-	private LDAPConnectionService $ldapService;
-	private IDBConnection $db;
-	
-	/**
-	 * Construct method
-	 * @param \OCA\EcloudAccounts\Service\LDAPConnectionService $ldapService
-	 * @param \OCP\IDBConnection $db
-	 */
-	public function __construct(LDAPConnectionService $ldapService, IDBConnection $db) {
-		$this->ldapService = $ldapService;
-		$this->db = $db;
-		parent::__construct();
-	}
-	/**
-	 * How to run: `occ ecloud-accounts:reset-user-sessions --date=20241201000000Z`
-	 * @return void
-	 */
-	protected function configure(): void {
-		$this
-			->setName('ecloud-accounts:reset-user-sessions')
-			->setDescription('Invalidate sessions and reset first login for users created after a specific date')
-			->addOption(
-				'date',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Date in YYYYMMDDHHMMSSZ format (e.g., 20241201000000Z)',
-				null
-			);
-	}
-	/**
-	 * Execute function
-	 * @param \Symfony\Component\Console\Input\InputInterface $input
-	 * @param \Symfony\Component\Console\Output\OutputInterface $output
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$date = $input->getOption('date');
-
-		if (!$date) {
-			$output->writeln('Date option is required.');
-			return Command::INVALID;
-		}
-
-		try {
-			$users = $this->ldapService->getUsersCreatedAfter($date);
-			foreach ($users as $user) {
-				if (!$user['username']) {
-					continue;
-				}
-
-				$output->writeln("Processing user: " . $user['username']);
-
-				// Invalidate sessions
-				$this->invalidateUserSessions($user['username']);
-				$output->writeln("Invalidated session for user: " . $user['username']);
-
-				// Reset first login
-				$this->resetFirstLogin($user['username']);
-				$output->writeln("Reset first login for user: " . $user['username']);
-			}
-
-			$output->writeln('All sessions invalidated and first login reset for eligible users.');
-			return Command::SUCCESS;
-		} catch (\Exception $e) {
-			$output->writeln('Error:' . $e->getMessage());
-			return Command::FAILURE;
-		}
-	}
-	/**
-	 * Invalidate user sessions for username
-	 * @param string $username
-	 * @return void
-	 */
-	private function invalidateUserSessions(string $username): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)));
-
-		$qb->executeStatement();
-	}
-	/**
-	 * Reset firsst login
-	 * @param string $username
-	 * @return void
-	 */
-	private function resetFirstLogin(string $username): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->update('preferences')
-			->set('configvalue', $qb->createNamedParameter('0', IQueryBuilder::PARAM_STR))
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('firstLogin', IQueryBuilder::PARAM_STR)));
-
-		$qb->executeStatement();
-	}
-}
-- 
GitLab


From 9fdd22863599959a6d42b89a0e32a275968bef46 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 11:35:45 +0530
Subject: [PATCH 127/185] code changes

---
 lib/Command/ResetUserPreferences.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/Command/ResetUserPreferences.php b/lib/Command/ResetUserPreferences.php
index 35c7e277..91ae0ec9 100644
--- a/lib/Command/ResetUserPreferences.php
+++ b/lib/Command/ResetUserPreferences.php
@@ -21,7 +21,10 @@ class ResetUserPreferences extends Command {
         $this->db = $db;
         parent::__construct();
     }
-
+    /**
+     * run: occ ecloud-accounts:reset-user-preferences --date=20241201000000Z
+     * @return void
+     */
     protected function configure(): void {
         $this
             ->setName('ecloud-accounts:reset-user-preferences')
@@ -39,7 +42,7 @@ class ResetUserPreferences extends Command {
         $date = $input->getOption('date');
 
         if (!$date) {
-            $output->writeln('<error>Date option is required.</error>');
+            $output->writeln('Date option is required.');
             return Command::INVALID;
         }
 
@@ -67,10 +70,10 @@ class ResetUserPreferences extends Command {
                 $output->writeln("Deleted 'lastLogin' preference for user: $username");
             }
 
-            $output->writeln('<info>All sessions invalidated and preferences deleted for eligible users.</info>');
+            $output->writeln('All sessions invalidated and preferences deleted for eligible users.');
             return Command::SUCCESS;
         } catch (\Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('Error: ' . $e->getMessage() );
             return Command::FAILURE;
         }
     }
-- 
GitLab


From c36799dfc28eea6b7e466853d554391e282de74b Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 12:50:02 +0530
Subject: [PATCH 128/185] php fs

---
 lib/Command/ResetUserPreferences.php | 166 +++++++++++++--------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/lib/Command/ResetUserPreferences.php b/lib/Command/ResetUserPreferences.php
index 91ae0ec9..13c855e8 100644
--- a/lib/Command/ResetUserPreferences.php
+++ b/lib/Command/ResetUserPreferences.php
@@ -13,87 +13,87 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ResetUserPreferences extends Command {
-    private LDAPConnectionService $ldapService;
-    private IDBConnection $db;
-
-    public function __construct(LDAPConnectionService $ldapService, IDBConnection $db) {
-        $this->ldapService = $ldapService;
-        $this->db = $db;
-        parent::__construct();
-    }
-    /**
-     * run: occ ecloud-accounts:reset-user-preferences --date=20241201000000Z
-     * @return void
-     */
-    protected function configure(): void {
-        $this
-            ->setName('ecloud-accounts:reset-user-preferences')
-            ->setDescription('Invalidate sessions and remove preferences for users created after a specific date')
-            ->addOption(
-                'date',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'Date in YYYYMMDDHHMMSSZ format (e.g., 20241201000000Z)',
-                null
-            );
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int {
-        $date = $input->getOption('date');
-
-        if (!$date) {
-            $output->writeln('Date option is required.');
-            return Command::INVALID;
-        }
-
-        try {
-            // Fetch users from LDAP
-            $users = $this->ldapService->getUsersCreatedAfter($date);
-
-            foreach ($users as $user) {
-                if (!$user['username']) {
-                    continue;
-                }
-
-                $username = $user['username'];
-                $output->writeln("Processing user: $username");
-
-                // Invalidate user sessions
-                $this->invalidateUserSessions($username);
-                $output->writeln("Invalidated session for user: $username");
-
-                // Delete specific preferences
-                $this->deletePreference($username, 'firstLoginAccomplished');
-                $output->writeln("Deleted 'firstLoginAccomplished' preference for user: $username");
-
-                $this->deletePreference($username, 'lastLogin');
-                $output->writeln("Deleted 'lastLogin' preference for user: $username");
-            }
-
-            $output->writeln('All sessions invalidated and preferences deleted for eligible users.');
-            return Command::SUCCESS;
-        } catch (\Exception $e) {
-            $output->writeln('Error: ' . $e->getMessage() );
-            return Command::FAILURE;
-        }
-    }
-
-    private function invalidateUserSessions(string $username): void {
-        $qb = $this->db->getQueryBuilder();
-
-        $qb->delete('authtoken')
-            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)));
-
-        $qb->executeStatement();
-    }
-
-    private function deletePreference(string $username, string $key): void {
-        $qb = $this->db->getQueryBuilder();
-
-        $qb->delete('preferences')
-            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
-            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-
-        $qb->executeStatement();
-    }
+	private LDAPConnectionService $ldapService;
+	private IDBConnection $db;
+
+	public function __construct(LDAPConnectionService $ldapService, IDBConnection $db) {
+		$this->ldapService = $ldapService;
+		$this->db = $db;
+		parent::__construct();
+	}
+	/**
+	 * run: occ ecloud-accounts:reset-user-preferences --date=20241201000000Z
+	 * @return void
+	 */
+	protected function configure(): void {
+		$this
+			->setName('ecloud-accounts:reset-user-preferences')
+			->setDescription('Invalidate sessions and remove preferences for users created after a specific date')
+			->addOption(
+				'date',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Date in YYYYMMDDHHMMSSZ format (e.g., 20241201000000Z)',
+				null
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$date = $input->getOption('date');
+
+		if (!$date) {
+			$output->writeln('Date option is required.');
+			return Command::INVALID;
+		}
+
+		try {
+			// Fetch users from LDAP
+			$users = $this->ldapService->getUsersCreatedAfter($date);
+
+			foreach ($users as $user) {
+				if (!$user['username']) {
+					continue;
+				}
+
+				$username = $user['username'];
+				$output->writeln("Processing user: $username");
+
+				// Invalidate user sessions
+				$this->invalidateUserSessions($username);
+				$output->writeln("Invalidated session for user: $username");
+
+				// Delete specific preferences
+				$this->deletePreference($username, 'firstLoginAccomplished');
+				$output->writeln("Deleted 'firstLoginAccomplished' preference for user: $username");
+
+				$this->deletePreference($username, 'lastLogin');
+				$output->writeln("Deleted 'lastLogin' preference for user: $username");
+			}
+
+			$output->writeln('All sessions invalidated and preferences deleted for eligible users.');
+			return Command::SUCCESS;
+		} catch (\Exception $e) {
+			$output->writeln('Error: ' . $e->getMessage());
+			return Command::FAILURE;
+		}
+	}
+
+	private function invalidateUserSessions(string $username): void {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->delete('authtoken')
+			->where($qb->expr()->eq('uid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)));
+
+		$qb->executeStatement();
+	}
+
+	private function deletePreference(string $username, string $key): void {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->delete('preferences')
+			->where($qb->expr()->eq('userid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+
+		$qb->executeStatement();
+	}
 }
-- 
GitLab


From 2b737154fdfec15632bf363e563e8f01d4dc9576 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 13:04:30 +0530
Subject: [PATCH 129/185] php fs

---
 lib/Command/ResetUserPreferences.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Command/ResetUserPreferences.php b/lib/Command/ResetUserPreferences.php
index 13c855e8..15b5189a 100644
--- a/lib/Command/ResetUserPreferences.php
+++ b/lib/Command/ResetUserPreferences.php
@@ -33,7 +33,7 @@ class ResetUserPreferences extends Command {
 				'date',
 				null,
 				InputOption::VALUE_REQUIRED,
-				'Date in YYYYMMDDHHMMSSZ format (e.g., 20241201000000Z)',
+				'Date in YYYY-MM-DD HH-MM-SS format (e.g., 2024-12-01 00:00:00)',
 				null
 			);
 	}
-- 
GitLab


From fd0cf3628a31a3f1a551319dcc3b09f5ea6c577f Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 10 Dec 2024 13:09:20 +0530
Subject: [PATCH 130/185] command added in info.xml

---
 appinfo/info.xml                     | 1 +
 lib/Command/ResetUserPreferences.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 88fad061..dad37bba 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -28,5 +28,6 @@
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
+        <command>OCA\EcloudAccounts\Command\ResetUserPreferences</command>
     </commands>
 </info>
diff --git a/lib/Command/ResetUserPreferences.php b/lib/Command/ResetUserPreferences.php
index 15b5189a..1bef4c86 100644
--- a/lib/Command/ResetUserPreferences.php
+++ b/lib/Command/ResetUserPreferences.php
@@ -22,7 +22,7 @@ class ResetUserPreferences extends Command {
 		parent::__construct();
 	}
 	/**
-	 * run: occ ecloud-accounts:reset-user-preferences --date=20241201000000Z
+	 * run: occ ecloud-accounts:reset-user-preferences --date='2024-12-01 00:00:00'
 	 * @return void
 	 */
 	protected function configure(): void {
-- 
GitLab


From 5481eb503362f350da7d1b3e8458d623dd5126d6 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 17 Jan 2025 14:31:56 +0530
Subject: [PATCH 131/185] setupfs added

---
 appinfo/info.xml                              |   2 +-
 lib/AppInfo/Application.php                   |  31 ---
 ...es.php => ResetFoldersAfterEnablingFS.php} |  46 ++--
 lib/Filesystem/CacheWrapper.php               |  57 ----
 lib/Filesystem/StorageWrapper.php             | 260 ------------------
 5 files changed, 20 insertions(+), 376 deletions(-)
 rename lib/Command/{ResetUserPreferences.php => ResetFoldersAfterEnablingFS.php} (54%)
 delete mode 100644 lib/Filesystem/CacheWrapper.php
 delete mode 100644 lib/Filesystem/StorageWrapper.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index dad37bba..4dac79bf 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -28,6 +28,6 @@
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
-        <command>OCA\EcloudAccounts\Command\ResetUserPreferences</command>
+        <command>OCA\EcloudAccounts\Command\ResetFoldersAfterEnablingFS</command>
     </commands>
 </info>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 1beceac8..24c5f795 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,8 +26,6 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
-use OC\Files\Filesystem;
-use OCA\EcloudAccounts\Filesystem\StorageWrapper;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
@@ -41,12 +39,10 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
-use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
@@ -56,7 +52,6 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
@@ -74,30 +69,4 @@ class Application extends App implements IBootstrap {
 			);
 		});
 	}
-
-	/**
-	 * @internal
-	 */
-	public function addStorageWrapper(): void {
-		Filesystem::addStorageWrapper('ecloud-accounts', [$this, 'addStorageWrapperCallback'], -10);
-	}
-
-	/**
-	 * @internal
-	 * @param $mountPoint
-	 * @param IStorage $storage
-	 * @return StorageWrapper|IStorage
-	 */
-	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
-		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
-		$appdataFolder = 'appdata_' . $instanceId;
-		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
-			return new StorageWrapper([
-				'storage' => $storage,
-				'mountPoint' => $mountPoint,
-			]);
-		}
-
-		return $storage;
-	}
 }
diff --git a/lib/Command/ResetUserPreferences.php b/lib/Command/ResetFoldersAfterEnablingFS.php
similarity index 54%
rename from lib/Command/ResetUserPreferences.php
rename to lib/Command/ResetFoldersAfterEnablingFS.php
index 1bef4c86..af0f37b1 100644
--- a/lib/Command/ResetUserPreferences.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -11,8 +11,10 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use OC_Util;
+use OCP\Files\NotPermittedException;
 
-class ResetUserPreferences extends Command {
+class ResetFoldersAfterEnablingFS extends Command {
 	private LDAPConnectionService $ldapService;
 	private IDBConnection $db;
 
@@ -22,13 +24,13 @@ class ResetUserPreferences extends Command {
 		parent::__construct();
 	}
 	/**
-	 * run: occ ecloud-accounts:reset-user-preferences --date='2024-12-01 00:00:00'
+	 * run: occ ecloud-accounts:create-folders --date='2024-12-01 00:00:00'
 	 * @return void
 	 */
 	protected function configure(): void {
 		$this
-			->setName('ecloud-accounts:reset-user-preferences')
-			->setDescription('Invalidate sessions and remove preferences for users created after a specific date')
+			->setName('ecloud-accounts:create-folders')
+			->setDescription('Create Folders for users created after a specific date')
 			->addOption(
 				'date',
 				null,
@@ -59,15 +61,9 @@ class ResetUserPreferences extends Command {
 				$output->writeln("Processing user: $username");
 
 				// Invalidate user sessions
-				$this->invalidateUserSessions($username);
-				$output->writeln("Invalidated session for user: $username");
+				$this->callSetupFS($username);
+				$output->writeln("call setup fs for user: $username");
 
-				// Delete specific preferences
-				$this->deletePreference($username, 'firstLoginAccomplished');
-				$output->writeln("Deleted 'firstLoginAccomplished' preference for user: $username");
-
-				$this->deletePreference($username, 'lastLogin');
-				$output->writeln("Deleted 'lastLogin' preference for user: $username");
 			}
 
 			$output->writeln('All sessions invalidated and preferences deleted for eligible users.');
@@ -78,22 +74,18 @@ class ResetUserPreferences extends Command {
 		}
 	}
 
-	private function invalidateUserSessions(string $username): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)));
+	private function callSetupFS(string $user): void {
+		OC_Util::setupFS($user);
+		
+		//trigger creation of user home and /files folder
+		$userFolder = \OC::$server->getUserFolder($user);
 
-		$qb->executeStatement();
+		try {
+			// copy skeleton
+			OC_Util::copySkeleton($user, $userFolder);
+		} catch (NotPermittedException $ex) {
+			// read only uses
+		}
 	}
 
-	private function deletePreference(string $username, string $key): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete('preferences')
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($username, IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-
-		$qb->executeStatement();
-	}
 }
diff --git a/lib/Filesystem/CacheWrapper.php b/lib/Filesystem/CacheWrapper.php
deleted file mode 100644
index da6e3253..00000000
--- a/lib/Filesystem/CacheWrapper.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Filesystem;
-
-use OC\Files\Cache\Wrapper\CacheWrapper as Wrapper;
-use OCP\Constants;
-use OCP\Files\Cache\ICache;
-use OCP\Files\Cache\ICacheEntry;
-use OCP\Files\ForbiddenException;
-use OCP\Files\Search\ISearchQuery;
-
-class CacheWrapper extends Wrapper {
-
-	public function __construct(
-		ICache $cache
-	) {
-		parent::__construct($cache);
-		$this->mask = Constants::PERMISSION_ALL
-			& ~Constants::PERMISSION_READ
-			& ~Constants::PERMISSION_CREATE
-			& ~Constants::PERMISSION_UPDATE
-			& ~Constants::PERMISSION_DELETE;
-	}
-
-	protected function formatCacheEntry($entry) {
-		if (isset($entry['path']) && isset($entry['permissions'])) {
-			try {
-				throw new ForbiddenException('Access denied', false);
-			} catch (ForbiddenException) {
-				$entry['permissions'] &= $this->mask;
-			}
-		}
-		return $entry;
-	}
-
-	public function insert($file, $data) {
-		throw new \Exception('User data cache insert is disabled.');
-	}
-
-	public function update($id, $data) {
-		throw new \Exception('User data cache update is disabled.');
-	}
-
-	public function remove($fileId) {
-		throw new \Exception('User data cache removal is disabled.');
-	}
-
-	public function searchQuery(ISearchQuery $searchQuery) {
-		return [];
-	}
-
-	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
-		return null;
-	}
-}
diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
deleted file mode 100644
index f35a5510..00000000
--- a/lib/Filesystem/StorageWrapper.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Filesystem;
-
-use OC\Files\Cache\Cache;
-use OC\Files\Storage\Storage;
-use OC\Files\Storage\Wrapper\Wrapper;
-use OCP\Files\ForbiddenException;
-use OCP\Files\Storage\IStorage;
-use OCP\Files\Storage\IWriteStreamStorage;
-
-class StorageWrapper extends Wrapper implements IWriteStreamStorage {
-	/**
-	 * @param array $parameters
-	 */
-	public function __construct($parameters) {
-		parent::__construct($parameters);
-	}
-
-	/**
-	 * @throws ForbiddenException
-	 */
-	protected function checkFileAccess(string $path, bool $isDir = false): void {
-		throw new ForbiddenException('Access denied', false);
-	}
-
-	/*
-	 * Storage wrapper methods
-	 */
-
-	/**
-	 * see http://php.net/manual/en/function.mkdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function mkdir($path) {
-		$this->checkFileAccess($path, true);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rmdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function rmdir($path) {
-		$this->checkFileAccess($path, true);
-	}
-
-	/**
-	 * check if a file can be created in $path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isCreatable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if a file can be read
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isReadable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if a file can be written to
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isUpdatable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if a file can be deleted
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isDeletable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function getPermissions($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return $this->mask;
-		}
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_get_contents.php
-	 *
-	 * @param string $path
-	 * @return string
-	 * @throws ForbiddenException
-	 */
-	public function file_get_contents($path) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_put_contents.php
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function file_put_contents($path, $data) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.unlink.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function unlink($path) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rename.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function rename($path1, $path2) {
-		$this->checkFileAccess($path1);
-		$this->checkFileAccess($path2);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.copy.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function copy($path1, $path2) {
-		$this->checkFileAccess($path1);
-		$this->checkFileAccess($path2);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.fopen.php
-	 *
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 * @throws ForbiddenException
-	 */
-	public function fopen($path, $mode) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.touch.php
-	 * If the backend does not support the operation, false should be returned
-	 *
-	 * @param string $path
-	 * @param int $mtime
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function touch($path, $mtime = null) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param Storage (optional) the storage to pass to the cache
-	 * @return Cache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		$cache = $this->storage->getCache($path, $storage);
-		return new CacheWrapper($cache, $storage);
-	}
-
-	/**
-	 * A custom storage implementation can return an url for direct download of a give file.
-	 *
-	 * For now the returned array can hold the parameter url - in future more attributes might follow.
-	 *
-	 * @param string $path
-	 * @return array
-	 * @throws ForbiddenException
-	 */
-	public function getDirectDownload($path) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->checkFileAccess($targetInternalPath);
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->checkFileAccess($targetInternalPath);
-	}
-
-	/**
-	 * @throws ForbiddenException
-	 */
-	public function writeStream(string $path, $stream, ?int $size = null): int {
-		$this->checkFileAccess($path);
-	}
-}
-- 
GitLab


From 3ef6d4173c488d5d770b986f6bf91bd02cb61937 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 17 Jan 2025 14:35:25 +0530
Subject: [PATCH 132/185] setupfs added

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index af0f37b1..2b707915 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -66,7 +66,7 @@ class ResetFoldersAfterEnablingFS extends Command {
 
 			}
 
-			$output->writeln('All sessions invalidated and preferences deleted for eligible users.');
+			$output->writeln('Setup completed for eligible users.');
 			return Command::SUCCESS;
 		} catch (\Exception $e) {
 			$output->writeln('Error: ' . $e->getMessage());
-- 
GitLab


From 71edcc60946a1b1c3844a60f05dabe08d8cf2f62 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 17 Jan 2025 14:37:46 +0530
Subject: [PATCH 133/185] setupfs added

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 2b707915..bb21eb48 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -60,7 +60,6 @@ class ResetFoldersAfterEnablingFS extends Command {
 				$username = $user['username'];
 				$output->writeln("Processing user: $username");
 
-				// Invalidate user sessions
 				$this->callSetupFS($username);
 				$output->writeln("call setup fs for user: $username");
 
-- 
GitLab


From 2c6da322301298a9cbae2ffb23bdadc8f6c83225 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 17 Jan 2025 18:10:23 +0530
Subject: [PATCH 134/185] added check to add in group

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 36 +++++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index bb21eb48..5b66728a 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -5,22 +5,28 @@ declare(strict_types=1);
 namespace OCA\EcloudAccounts\Command;
 
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IDBConnection;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use OC_Util;
 use OCP\Files\NotPermittedException;
+use OCP\IConfig;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+
 
 class ResetFoldersAfterEnablingFS extends Command {
 	private LDAPConnectionService $ldapService;
-	private IDBConnection $db;
+	private IUserManager $userManager;
+	private IConfig $config;
+	private IGroupManager $groupManager;
 
-	public function __construct(LDAPConnectionService $ldapService, IDBConnection $db) {
+	public function __construct(LDAPConnectionService $ldapService, IConfig $config, IUserManager $userManager, IGroupManager $groupManager) {
 		$this->ldapService = $ldapService;
-		$this->db = $db;
+		$this->config = $config;
+		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
 		parent::__construct();
 	}
 	/**
@@ -58,10 +64,13 @@ class ResetFoldersAfterEnablingFS extends Command {
 				}
 
 				$username = $user['username'];
-				$output->writeln("Processing user: $username");
+				$output->writeln("Processing user $username");
 
 				$this->callSetupFS($username);
-				$output->writeln("call setup fs for user: $username");
+				$output->writeln("Call setup fs for user: $username");
+
+				$this->addUserInGroup($username);
+				$output->writeln("Add user $username in group.");
 
 			}
 
@@ -86,5 +95,18 @@ class ResetFoldersAfterEnablingFS extends Command {
 			// read only uses
 		}
 	}
+	public function addUserInGroup($username) {
+		$user = $this->userManager->get($username);
+  		if (!$user) {
+  			return false;
+  		}
+		$groupName = $this->config->getSystemValue("temporary_group_name");
+		if (!$this->groupManager->groupExists($groupName)) {
+			return false;
+		}
+		$group = $this->groupManager->get($groupName);
+		$group->addUser($user);
+		return true;
+	}
 
 }
-- 
GitLab


From ae2026c9fe7d6c97319a7d689c69dbb02befeecd Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 17 Jan 2025 18:18:48 +0530
Subject: [PATCH 135/185] php fixer

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 5b66728a..593c9060 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -4,17 +4,16 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
-use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
 use OC_Util;
+use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IUserManager;
-
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class ResetFoldersAfterEnablingFS extends Command {
 	private LDAPConnectionService $ldapService;
@@ -97,9 +96,9 @@ class ResetFoldersAfterEnablingFS extends Command {
 	}
 	public function addUserInGroup($username) {
 		$user = $this->userManager->get($username);
-  		if (!$user) {
-  			return false;
-  		}
+		if (!$user) {
+			return false;
+		}
 		$groupName = $this->config->getSystemValue("temporary_group_name");
 		if (!$this->groupManager->groupExists($groupName)) {
 			return false;
-- 
GitLab


From 78d964006f1d268579540f1493b9c54a207d3ff2 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 21 Jan 2025 21:45:53 +0530
Subject: [PATCH 136/185] added more logs

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 593c9060..a122b07f 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -65,7 +65,7 @@ class ResetFoldersAfterEnablingFS extends Command {
 				$username = $user['username'];
 				$output->writeln("Processing user $username");
 
-				$this->callSetupFS($username);
+				$this->callSetupFS($username, $output);
 				$output->writeln("Call setup fs for user: $username");
 
 				$this->addUserInGroup($username);
@@ -81,17 +81,22 @@ class ResetFoldersAfterEnablingFS extends Command {
 		}
 	}
 
-	private function callSetupFS(string $user): void {
+	private function callSetupFS(string $user, OutputInterface $output): void {
+		
+		$output->writeln("OC_Util::setupFS called for user: $user");
 		OC_Util::setupFS($user);
+		$output->writeln("OC_Util::setupFS Done for user: $user");
 		
 		//trigger creation of user home and /files folder
 		$userFolder = \OC::$server->getUserFolder($user);
 
 		try {
+			$output->writeln("getUserFolder for user: $user");
 			// copy skeleton
 			OC_Util::copySkeleton($user, $userFolder);
 		} catch (NotPermittedException $ex) {
 			// read only uses
+			$output->writeln("NotPermittedException exception for user: $user");
 		}
 	}
 	public function addUserInGroup($username) {
-- 
GitLab


From 32408619220a1923ec44edaa11eb263f8ce00cb1 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 21 Jan 2025 23:39:25 +0530
Subject: [PATCH 137/185] evernt dispatcher added

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index a122b07f..027ed753 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -6,10 +6,14 @@ namespace OCA\EcloudAccounts\Command;
 
 use OC_Util;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCP\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
+use OCP\IUser;
 use OCP\IUserManager;
+use OCP\User\Events\UserFirstTimeLoggedInEvent;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -98,6 +102,10 @@ class ResetFoldersAfterEnablingFS extends Command {
 			// read only uses
 			$output->writeln("NotPermittedException exception for user: $user");
 		}
+
+		// trigger any other initialization
+		\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser()));
+		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($this->getUser()));
 	}
 	public function addUserInGroup($username) {
 		$user = $this->userManager->get($username);
-- 
GitLab


From a2758e4ade7771d05b8c0ade9c2c312e69034f7b Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 21 Jan 2025 23:56:17 +0530
Subject: [PATCH 138/185] evernt dispatcher added

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 027ed753..236b0be4 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
+use OC\User\Manager;
 use OC_Util;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCP\EventDispatcher\GenericEvent;
@@ -22,13 +23,15 @@ use Symfony\Component\Console\Output\OutputInterface;
 class ResetFoldersAfterEnablingFS extends Command {
 	private LDAPConnectionService $ldapService;
 	private IUserManager $userManager;
+	private Manager $manager;
 	private IConfig $config;
 	private IGroupManager $groupManager;
 
-	public function __construct(LDAPConnectionService $ldapService, IConfig $config, IUserManager $userManager, IGroupManager $groupManager) {
+	public function __construct(LDAPConnectionService $ldapService, IConfig $config, Manager $manager, IUserManager $userManager, IGroupManager $groupManager) {
 		$this->ldapService = $ldapService;
 		$this->config = $config;
 		$this->userManager = $userManager;
+		$this->manager = $manager;
 		$this->groupManager = $groupManager;
 		parent::__construct();
 	}
@@ -102,10 +105,11 @@ class ResetFoldersAfterEnablingFS extends Command {
 			// read only uses
 			$output->writeln("NotPermittedException exception for user: $user");
 		}
+		$userDetails = $this->manager->get($user);
 
 		// trigger any other initialization
-		\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser()));
-		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($this->getUser()));
+		\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($userDetails));
+		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($userDetails));
 	}
 	public function addUserInGroup($username) {
 		$user = $this->userManager->get($username);
-- 
GitLab


From e9bbe1cc85be8e3f170dd95a16adfde869d4130e Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 22 Jan 2025 10:53:20 +0530
Subject: [PATCH 139/185] FS service added

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 66 ++-----------------
 lib/Service/FSService.php                   | 73 +++++++++++++++++++++
 2 files changed, 80 insertions(+), 59 deletions(-)
 create mode 100644 lib/Service/FSService.php

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 236b0be4..6680b6ae 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -4,17 +4,8 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
-use OC\User\Manager;
-use OC_Util;
+use OCA\EcloudAccounts\Service\FSService;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use OCP\EventDispatcher\GenericEvent;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Files\NotPermittedException;
-use OCP\IConfig;
-use OCP\IGroupManager;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\User\Events\UserFirstTimeLoggedInEvent;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -22,17 +13,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class ResetFoldersAfterEnablingFS extends Command {
 	private LDAPConnectionService $ldapService;
-	private IUserManager $userManager;
-	private Manager $manager;
-	private IConfig $config;
-	private IGroupManager $groupManager;
+	private FSService $fsservice;
 
-	public function __construct(LDAPConnectionService $ldapService, IConfig $config, Manager $manager, IUserManager $userManager, IGroupManager $groupManager) {
+	public function __construct(LDAPConnectionService $ldapService, FSService $fsservice) {
 		$this->ldapService = $ldapService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->manager = $manager;
-		$this->groupManager = $groupManager;
+		$this->fsservice = $fsservice;
 		parent::__construct();
 	}
 	/**
@@ -72,11 +57,11 @@ class ResetFoldersAfterEnablingFS extends Command {
 				$username = $user['username'];
 				$output->writeln("Processing user $username");
 
-				$this->callSetupFS($username, $output);
+				$this->fsservice->callSetupFS($username);
 				$output->writeln("Call setup fs for user: $username");
 
-				$this->addUserInGroup($username);
-				$output->writeln("Add user $username in group.");
+				$isAdded = $this->fsservice->addUserInGroup($username);
+				$output->writeln("Add user $username in group: ".$isAdded ? 'YES': 'NO');
 
 			}
 
@@ -88,41 +73,4 @@ class ResetFoldersAfterEnablingFS extends Command {
 		}
 	}
 
-	private function callSetupFS(string $user, OutputInterface $output): void {
-		
-		$output->writeln("OC_Util::setupFS called for user: $user");
-		OC_Util::setupFS($user);
-		$output->writeln("OC_Util::setupFS Done for user: $user");
-		
-		//trigger creation of user home and /files folder
-		$userFolder = \OC::$server->getUserFolder($user);
-
-		try {
-			$output->writeln("getUserFolder for user: $user");
-			// copy skeleton
-			OC_Util::copySkeleton($user, $userFolder);
-		} catch (NotPermittedException $ex) {
-			// read only uses
-			$output->writeln("NotPermittedException exception for user: $user");
-		}
-		$userDetails = $this->manager->get($user);
-
-		// trigger any other initialization
-		\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($userDetails));
-		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($userDetails));
-	}
-	public function addUserInGroup($username) {
-		$user = $this->userManager->get($username);
-		if (!$user) {
-			return false;
-		}
-		$groupName = $this->config->getSystemValue("temporary_group_name");
-		if (!$this->groupManager->groupExists($groupName)) {
-			return false;
-		}
-		$group = $this->groupManager->get($groupName);
-		$group->addUser($user);
-		return true;
-	}
-
 }
diff --git a/lib/Service/FSService.php b/lib/Service/FSService.php
new file mode 100644
index 00000000..372cd071
--- /dev/null
+++ b/lib/Service/FSService.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Service;
+
+use OC_Util;
+use OCP\EventDispatcher\GenericEvent;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\NotPermittedException;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\User\Events\UserFirstTimeLoggedInEvent;
+
+class FSService {
+	/** @var IUserManager */
+	private $userManager;
+	/** @var IConfig */
+	private $config;
+	/** @var ILogger */
+	private $logger;
+	/** @var IGroupManager */
+	private $groupManager;
+	/** @var Manager */
+	private $manager;
+	public function __construct(IUserManager $userManager, IConfig $config, ILogger $logger, Manager $manager, IGroupManager $groupManager) {
+		$this->userManager = $userManager;
+		$this->config = $config;
+		$this->logger = $logger;
+		$this->groupManager = $groupManager;
+		$this->manager = $manager;
+	}
+
+
+	public function callSetupFS(string $user): void {
+
+		$this->logger->error("OC_Util::setupFS called for user: $user");
+		OC_Util::setupFS($user);
+		$this->logger->error("OC_Util::setupFS Done for user: $user");
+		
+		//trigger creation of user home and /files folder
+		$userFolder = \OC::$server->getUserFolder($user);
+
+		try {
+			$this->logger->error("getUserFolder for user: $user");
+			// copy skeleton
+			OC_Util::copySkeleton($user, $userFolder);
+		} catch (NotPermittedException $ex) {
+			// read only uses
+			$this->logger->error("NotPermittedException exception for user: $user");
+		}
+		$userDetails = $this->manager->get($user);
+
+		// trigger any other initialization
+		\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($userDetails));
+		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($userDetails));
+	}
+	public function addUserInGroup($username) {
+		$user = $this->userManager->get($username);
+		if (!$user) {
+			return false;
+		}
+		$groupName = $this->config->getSystemValue("temporary_group_name");
+		if (!$this->groupManager->groupExists($groupName)) {
+			return false;
+		}
+		$group = $this->groupManager->get($groupName);
+		$group->addUser($user);
+		return true;
+	}
+}
-- 
GitLab


From a5820113da6a8e6815739db629065d507d68b0f2 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 22 Jan 2025 15:55:36 +0530
Subject: [PATCH 140/185] manager class added

---
 lib/Service/FSService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Service/FSService.php b/lib/Service/FSService.php
index 372cd071..a35a09aa 100644
--- a/lib/Service/FSService.php
+++ b/lib/Service/FSService.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Service;
 
+use OC\User\Manager;
 use OC_Util;
 use OCP\EventDispatcher\GenericEvent;
 use OCP\EventDispatcher\IEventDispatcher;
-- 
GitLab


From b32541281adb6a0089ce335b12396081dd737890 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 22 Jan 2025 16:10:16 +0530
Subject: [PATCH 141/185] use OCP\IGroupManager added

---
 lib/Service/FSService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Service/FSService.php b/lib/Service/FSService.php
index a35a09aa..b525e287 100644
--- a/lib/Service/FSService.php
+++ b/lib/Service/FSService.php
@@ -10,6 +10,7 @@ use OCP\EventDispatcher\GenericEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
+use OCP\IGroupManager;
 use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
-- 
GitLab


From 143ab0e42e1da118cfd1f8a38dd4185d7bf6a6ae Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 22 Jan 2025 16:57:17 +0530
Subject: [PATCH 142/185] more logs

---
 lib/Command/ResetFoldersAfterEnablingFS.php | 3 ++-
 lib/Service/FSService.php                   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 6680b6ae..f8bc3a4a 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -60,8 +60,9 @@ class ResetFoldersAfterEnablingFS extends Command {
 				$this->fsservice->callSetupFS($username);
 				$output->writeln("Call setup fs for user: $username");
 
+				$output->writeln("Add user $username in group: ");
 				$isAdded = $this->fsservice->addUserInGroup($username);
-				$output->writeln("Add user $username in group: ".$isAdded ? 'YES': 'NO');
+				$output->writeln($isAdded ? "YES": "NO");
 
 			}
 
diff --git a/lib/Service/FSService.php b/lib/Service/FSService.php
index b525e287..a8a04877 100644
--- a/lib/Service/FSService.php
+++ b/lib/Service/FSService.php
@@ -62,14 +62,17 @@ class FSService {
 	public function addUserInGroup($username) {
 		$user = $this->userManager->get($username);
 		if (!$user) {
+			$this->logger->error("addUserInGroup for user: $user . User not found.");
 			return false;
 		}
 		$groupName = $this->config->getSystemValue("temporary_group_name");
 		if (!$this->groupManager->groupExists($groupName)) {
+			$this->logger->error("addUserInGroup for user: $user . Group not found.");
 			return false;
 		}
 		$group = $this->groupManager->get($groupName);
 		$group->addUser($user);
+		$this->logger->error("addUserInGroup for user: $user . SUCCESS.");
 		return true;
 	}
 }
-- 
GitLab


From 21cc75733681f88c532cefaa337991a2bc8d3d36 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 22 Jan 2025 18:22:44 +0530
Subject: [PATCH 143/185] more logs

---
 lib/Service/FSService.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Service/FSService.php b/lib/Service/FSService.php
index a8a04877..758ef2ea 100644
--- a/lib/Service/FSService.php
+++ b/lib/Service/FSService.php
@@ -62,17 +62,17 @@ class FSService {
 	public function addUserInGroup($username) {
 		$user = $this->userManager->get($username);
 		if (!$user) {
-			$this->logger->error("addUserInGroup for user: $user . User not found.");
+			$this->logger->error("addUserInGroup for user: $username . User not found.");
 			return false;
 		}
 		$groupName = $this->config->getSystemValue("temporary_group_name");
 		if (!$this->groupManager->groupExists($groupName)) {
-			$this->logger->error("addUserInGroup for user: $user . Group not found.");
+			$this->logger->error("addUserInGroup for user: $username . Group not found.");
 			return false;
 		}
 		$group = $this->groupManager->get($groupName);
 		$group->addUser($user);
-		$this->logger->error("addUserInGroup for user: $user . SUCCESS.");
+		$this->logger->error("addUserInGroup for user: $username . SUCCESS.");
 		return true;
 	}
 }
-- 
GitLab


From 1f961312c2876ba525a3bfe8868f44733f4cac1f Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 22 Jan 2025 18:24:25 +0530
Subject: [PATCH 144/185] more logs

---
 lib/Service/FSService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Service/FSService.php b/lib/Service/FSService.php
index 758ef2ea..1ad3d78f 100644
--- a/lib/Service/FSService.php
+++ b/lib/Service/FSService.php
@@ -66,6 +66,7 @@ class FSService {
 			return false;
 		}
 		$groupName = $this->config->getSystemValue("temporary_group_name");
+		$this->logger->error("addUserInGroup for user in groupname : $groupName .");
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("addUserInGroup for user: $username . Group not found.");
 			return false;
-- 
GitLab


From 79ccd748c93b42d228cf1e52a20611070e0fadda Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 23 Jan 2025 16:48:39 +0530
Subject: [PATCH 145/185] added changes as per feedback

---
 appinfo/info.xml                              |  2 +-
 lib/Command/ResetFoldersAfterEnablingFS.php   | 38 ++++++++++++++-----
 .../{FSService.php => FilesystemService.php}  |  9 +----
 3 files changed, 32 insertions(+), 17 deletions(-)
 rename lib/Service/{FSService.php => FilesystemService.php} (86%)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4dac79bf..78b4b2cb 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -28,6 +28,6 @@
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
-        <command>OCA\EcloudAccounts\Command\ResetFoldersAfterEnablingFS</command>
+        <command>OCA\EcloudAccounts\Command\CreateUserFilesystem</command>
     </commands>
 </info>
diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index f8bc3a4a..2f3d811f 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -4,50 +4,70 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Command;
 
-use OCA\EcloudAccounts\Service\FSService;
+use OCA\EcloudAccounts\Service\FilesystemService;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ResetFoldersAfterEnablingFS extends Command {
+class CreateUserFilesystem extends Command {
 	private LDAPConnectionService $ldapService;
-	private FSService $fsservice;
+	private FilesystemService $fsservice;
 
-	public function __construct(LDAPConnectionService $ldapService, FSService $fsservice) {
+	public function __construct(LDAPConnectionService $ldapService, FilesystemService $fsservice) {
 		$this->ldapService = $ldapService;
 		$this->fsservice = $fsservice;
 		parent::__construct();
 	}
 	/**
 	 * run: occ ecloud-accounts:create-folders --date='2024-12-01 00:00:00'
+	 *       occ ecloud-accounts:create-folders --user_ids='user1,user2,user3'
 	 * @return void
 	 */
 	protected function configure(): void {
 		$this
 			->setName('ecloud-accounts:create-folders')
-			->setDescription('Create Folders for users created after a specific date')
+			->setDescription('Create Folders for users created after a specific date or for specific user IDs')
 			->addOption(
 				'date',
 				null,
 				InputOption::VALUE_REQUIRED,
 				'Date in YYYY-MM-DD HH-MM-SS format (e.g., 2024-12-01 00:00:00)',
 				null
+			)
+			->addOption(
+				'user_ids',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'Comma-separated list of user IDs to process (e.g., user1,user2,user3)',
+				null
 			);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$date = $input->getOption('date');
+		$userIdsOption = $input->getOption('user_ids');
 
-		if (!$date) {
-			$output->writeln('Date option is required.');
+		if (!$date && !$userIdsOption) {
+			$output->writeln('Either the --date or --user_ids option is required.');
 			return Command::INVALID;
 		}
 
 		try {
-			// Fetch users from LDAP
-			$users = $this->ldapService->getUsersCreatedAfter($date);
+			$users = [];
+			if ($date) {
+				// Fetch users from LDAP created after the specified date
+				$users = $this->ldapService->getUsersCreatedAfter($date);
+				$output->writeln("Fetching users created after $date...");
+			} elseif ($userIdsOption) {
+				// Process specific user IDs
+				$userIds = array_map('trim', explode(',', $userIdsOption));
+				foreach ($userIds as $userId) {
+					$users[] = ['username' => $userId];
+				}
+				$output->writeln('Processing specified user IDs: ' . implode(', ', $userIds));
+			}
 
 			foreach ($users as $user) {
 				if (!$user['username']) {
diff --git a/lib/Service/FSService.php b/lib/Service/FilesystemService.php
similarity index 86%
rename from lib/Service/FSService.php
rename to lib/Service/FilesystemService.php
index 1ad3d78f..853f3543 100644
--- a/lib/Service/FSService.php
+++ b/lib/Service/FilesystemService.php
@@ -16,7 +16,7 @@ use OCP\IUser;
 use OCP\IUserManager;
 use OCP\User\Events\UserFirstTimeLoggedInEvent;
 
-class FSService {
+class FilesystemService {
 	/** @var IUserManager */
 	private $userManager;
 	/** @var IConfig */
@@ -53,11 +53,6 @@ class FSService {
 			// read only uses
 			$this->logger->error("NotPermittedException exception for user: $user");
 		}
-		$userDetails = $this->manager->get($user);
-
-		// trigger any other initialization
-		\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($userDetails));
-		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($userDetails));
 	}
 	public function addUserInGroup($username) {
 		$user = $this->userManager->get($username);
@@ -74,6 +69,6 @@ class FSService {
 		$group = $this->groupManager->get($groupName);
 		$group->addUser($user);
 		$this->logger->error("addUserInGroup for user: $username . SUCCESS.");
-		return true;
+		return true;/canAccessFilesystem
 	}
 }
-- 
GitLab


From bf5bd415f4cadbb27c329211a3ff0258e5bccda5 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 23 Jan 2025 18:41:26 +0530
Subject: [PATCH 146/185] condition added for addStoragewrapper and added group
 whilem account creation

---
 lib/AppInfo/Application.php                 |  42 +++-
 lib/Command/ResetFoldersAfterEnablingFS.php |  22 +-
 lib/Controller/AccountController.php        |   8 +-
 lib/Filesystem/CacheWrapper.php             |  57 +++++
 lib/Filesystem/StorageWrapper.php           | 260 ++++++++++++++++++++
 lib/Service/FilesystemService.php           |  38 +--
 6 files changed, 398 insertions(+), 29 deletions(-)
 create mode 100644 lib/Filesystem/CacheWrapper.php
 create mode 100644 lib/Filesystem/StorageWrapper.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 24c5f795..4d01c590 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,12 +26,15 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
+use OC\Files\Filesystem;
+use OCA\EcloudAccounts\Filesystem\StorageWrapper;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCA\EcloudAccounts\Middleware\AccountMiddleware;
+use OCA\EcloudAccounts\Service\FilesystemService;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\AppFramework\App;
@@ -39,19 +42,30 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
+use OCP\IUserSession;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
+use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
+	private FilesystemService $fsservice;
+	private IUserSession $userSession;
 
-	public function __construct(array $urlParams = []) {
+	public function __construct(FilesystemService $fsservice, IUserSession $userSession, array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
+		$this->fsservice = $fsservice;
+		$this->userSession = $userSession;
 	}
 
 	public function register(IRegistrationContext $context): void {
+		$username = $this->userSession->getUser()->getUID();
+		if(!$this->fsservice->checkFilesGroupAccess($username)) {
+			Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
+		}
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
@@ -69,4 +83,30 @@ class Application extends App implements IBootstrap {
 			);
 		});
 	}
+
+	/**
+	 * @internal
+	 */
+	public function addStorageWrapper(): void {
+		Filesystem::addStorageWrapper('ecloud-accounts', [$this, 'addStorageWrapperCallback'], -10);
+	}
+
+	/**
+	 * @internal
+	 * @param $mountPoint
+	 * @param IStorage $storage
+	 * @return StorageWrapper|IStorage
+	 */
+	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
+		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+		$appdataFolder = 'appdata_' . $instanceId;
+		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
+			return new StorageWrapper([
+				'storage' => $storage,
+				'mountPoint' => $mountPoint,
+			]);
+		}
+
+		return $storage;
+	}
 }
diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/ResetFoldersAfterEnablingFS.php
index 2f3d811f..3c0dbfe4 100644
--- a/lib/Command/ResetFoldersAfterEnablingFS.php
+++ b/lib/Command/ResetFoldersAfterEnablingFS.php
@@ -58,8 +58,9 @@ class CreateUserFilesystem extends Command {
 			$users = [];
 			if ($date) {
 				// Fetch users from LDAP created after the specified date
-				$users = $this->ldapService->getUsersCreatedAfter($date);
 				$output->writeln("Fetching users created after $date...");
+				$users = $this->ldapService->getUsersCreatedAfter($date);
+				
 			} elseif ($userIdsOption) {
 				// Process specific user IDs
 				$userIds = array_map('trim', explode(',', $userIdsOption));
@@ -68,25 +69,26 @@ class CreateUserFilesystem extends Command {
 				}
 				$output->writeln('Processing specified user IDs: ' . implode(', ', $userIds));
 			}
-
+			$output->writeln('Setup started for all eligible users.');
 			foreach ($users as $user) {
 				if (!$user['username']) {
 					continue;
 				}
 
 				$username = $user['username'];
-				$output->writeln("Processing user $username");
-
-				$this->fsservice->callSetupFS($username);
-				$output->writeln("Call setup fs for user: $username");
+				$output->writeln("$username Processing user...");
 
-				$output->writeln("Add user $username in group: ");
-				$isAdded = $this->fsservice->addUserInGroup($username);
-				$output->writeln($isAdded ? "YES": "NO");
+				$output->writeln("Setup FS for user...");
+				$isSetupCompleted = $this->fsservice->callSetupFS($username);
+				$output->writeln($isSetupCompleted ? "YES": "NO");
 
+				$output->writeln("Add user in group...");
+				$isUserInGroup = $this->fsservice->addUserInFilesEnabledGroup($username);
+				$output->writeln($isUserInGroup ? "YES": "NO");
+				$output->writeln("--End--");
 			}
 
-			$output->writeln('Setup completed for eligible users.');
+			$output->writeln('Setup completed for all eligible users.');
 			return Command::SUCCESS;
 		} catch (\Exception $e) {
 			$output->writeln('Error: ' . $e->getMessage());
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 83584199..806d0826 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -12,6 +12,7 @@ use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
 use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
 use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
 use OCA\EcloudAccounts\Service\CaptchaService;
+use OCA\EcloudAccounts\Service\FilesystemService;
 use OCA\EcloudAccounts\Service\HCaptchaService;
 use OCA\EcloudAccounts\Service\NewsLetterService;
 use OCA\EcloudAccounts\Service\UserService;
@@ -45,6 +46,7 @@ class AccountController extends Controller {
 	private IConfig $config;
 	private IInitialState $initialState;
 	private IAppData $appData;
+	private FilesystemService $fsservice;
 	private const SESSION_VERIFIED_USERNAME = 'verified_username';
 	private const SESSION_VERIFIED_DISPLAYNAME = 'verified_displayname';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
@@ -69,7 +71,8 @@ class AccountController extends Controller {
 		IConfig $config,
 		ILogger $logger,
 		IInitialState $initialState,
-		IAppData $appData
+		IAppData $appData,
+		FilesystemService $fsservice
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
@@ -86,6 +89,7 @@ class AccountController extends Controller {
 		$this->request = $request;
 		$this->initialState = $initialState;
 		$this->appData = $appData;
+		$this->fsservice = $fsservice;
 	}
 
 	/**
@@ -209,6 +213,8 @@ class AccountController extends Controller {
 			$this->session->remove(self::CAPTCHA_VERIFIED_CHECK);
 			$ipAddress = $this->request->getRemoteAddress();
 			$this->userService->addUsernameToCommonDataStore($username, $ipAddress, $recoveryEmail);
+			// temporary fix to add user in 'files-enabled' group
+			$this->fsservice->addUserInFilesEnabledGroup($username);
 			$response->setStatus(200);
 			$response->setData(['success' => true]);
 
diff --git a/lib/Filesystem/CacheWrapper.php b/lib/Filesystem/CacheWrapper.php
new file mode 100644
index 00000000..da6e3253
--- /dev/null
+++ b/lib/Filesystem/CacheWrapper.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Filesystem;
+
+use OC\Files\Cache\Wrapper\CacheWrapper as Wrapper;
+use OCP\Constants;
+use OCP\Files\Cache\ICache;
+use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\ForbiddenException;
+use OCP\Files\Search\ISearchQuery;
+
+class CacheWrapper extends Wrapper {
+
+	public function __construct(
+		ICache $cache
+	) {
+		parent::__construct($cache);
+		$this->mask = Constants::PERMISSION_ALL
+			& ~Constants::PERMISSION_READ
+			& ~Constants::PERMISSION_CREATE
+			& ~Constants::PERMISSION_UPDATE
+			& ~Constants::PERMISSION_DELETE;
+	}
+
+	protected function formatCacheEntry($entry) {
+		if (isset($entry['path']) && isset($entry['permissions'])) {
+			try {
+				throw new ForbiddenException('Access denied', false);
+			} catch (ForbiddenException) {
+				$entry['permissions'] &= $this->mask;
+			}
+		}
+		return $entry;
+	}
+
+	public function insert($file, $data) {
+		throw new \Exception('User data cache insert is disabled.');
+	}
+
+	public function update($id, $data) {
+		throw new \Exception('User data cache update is disabled.');
+	}
+
+	public function remove($fileId) {
+		throw new \Exception('User data cache removal is disabled.');
+	}
+
+	public function searchQuery(ISearchQuery $searchQuery) {
+		return [];
+	}
+
+	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
+		return null;
+	}
+}
diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
new file mode 100644
index 00000000..f35a5510
--- /dev/null
+++ b/lib/Filesystem/StorageWrapper.php
@@ -0,0 +1,260 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Filesystem;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Storage\Storage;
+use OC\Files\Storage\Wrapper\Wrapper;
+use OCP\Files\ForbiddenException;
+use OCP\Files\Storage\IStorage;
+use OCP\Files\Storage\IWriteStreamStorage;
+
+class StorageWrapper extends Wrapper implements IWriteStreamStorage {
+	/**
+	 * @param array $parameters
+	 */
+	public function __construct($parameters) {
+		parent::__construct($parameters);
+	}
+
+	/**
+	 * @throws ForbiddenException
+	 */
+	protected function checkFileAccess(string $path, bool $isDir = false): void {
+		throw new ForbiddenException('Access denied', false);
+	}
+
+	/*
+	 * Storage wrapper methods
+	 */
+
+	/**
+	 * see http://php.net/manual/en/function.mkdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function mkdir($path) {
+		$this->checkFileAccess($path, true);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rmdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function rmdir($path) {
+		$this->checkFileAccess($path, true);
+	}
+
+	/**
+	 * check if a file can be created in $path
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isCreatable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file can be read
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isReadable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file can be written to
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isUpdatable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * check if a file can be deleted
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isDeletable($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return false;
+		}
+	}
+
+	public function getPermissions($path) {
+		try {
+			$this->checkFileAccess($path);
+		} catch (ForbiddenException $e) {
+			return $this->mask;
+		}
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_get_contents.php
+	 *
+	 * @param string $path
+	 * @return string
+	 * @throws ForbiddenException
+	 */
+	public function file_get_contents($path) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_put_contents.php
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function file_put_contents($path, $data) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.unlink.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function unlink($path) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rename.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function rename($path1, $path2) {
+		$this->checkFileAccess($path1);
+		$this->checkFileAccess($path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.copy.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function copy($path1, $path2) {
+		$this->checkFileAccess($path1);
+		$this->checkFileAccess($path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.fopen.php
+	 *
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 * @throws ForbiddenException
+	 */
+	public function fopen($path, $mode) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.touch.php
+	 * If the backend does not support the operation, false should be returned
+	 *
+	 * @param string $path
+	 * @param int $mtime
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function touch($path, $mtime = null) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * get a cache instance for the storage
+	 *
+	 * @param string $path
+	 * @param Storage (optional) the storage to pass to the cache
+	 * @return Cache
+	 */
+	public function getCache($path = '', $storage = null) {
+		if (!$storage) {
+			$storage = $this;
+		}
+		$cache = $this->storage->getCache($path, $storage);
+		return new CacheWrapper($cache, $storage);
+	}
+
+	/**
+	 * A custom storage implementation can return an url for direct download of a give file.
+	 *
+	 * For now the returned array can hold the parameter url - in future more attributes might follow.
+	 *
+	 * @param string $path
+	 * @return array
+	 * @throws ForbiddenException
+	 */
+	public function getDirectDownload($path) {
+		$this->checkFileAccess($path);
+	}
+
+	/**
+	 * @param IStorage $sourceStorage
+	 * @param string $sourceInternalPath
+	 * @param string $targetInternalPath
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		$this->checkFileAccess($targetInternalPath);
+	}
+
+	/**
+	 * @param IStorage $sourceStorage
+	 * @param string $sourceInternalPath
+	 * @param string $targetInternalPath
+	 * @return bool
+	 * @throws ForbiddenException
+	 */
+	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		$this->checkFileAccess($targetInternalPath);
+	}
+
+	/**
+	 * @throws ForbiddenException
+	 */
+	public function writeStream(string $path, $stream, ?int $size = null): int {
+		$this->checkFileAccess($path);
+	}
+}
diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index 853f3543..682b04fc 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -6,15 +6,11 @@ namespace OCA\EcloudAccounts\Service;
 
 use OC\User\Manager;
 use OC_Util;
-use OCP\EventDispatcher\GenericEvent;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\ILogger;
-use OCP\IUser;
 use OCP\IUserManager;
-use OCP\User\Events\UserFirstTimeLoggedInEvent;
 
 class FilesystemService {
 	/** @var IUserManager */
@@ -36,39 +32,47 @@ class FilesystemService {
 	}
 
 
-	public function callSetupFS(string $user): void {
+	public function callSetupFS(string $user) {
 
-		$this->logger->error("OC_Util::setupFS called for user: $user");
 		OC_Util::setupFS($user);
-		$this->logger->error("OC_Util::setupFS Done for user: $user");
-		
 		//trigger creation of user home and /files folder
 		$userFolder = \OC::$server->getUserFolder($user);
 
 		try {
-			$this->logger->error("getUserFolder for user: $user");
 			// copy skeleton
 			OC_Util::copySkeleton($user, $userFolder);
+			return true;
 		} catch (NotPermittedException $ex) {
 			// read only uses
-			$this->logger->error("NotPermittedException exception for user: $user");
+			$this->logger->error("Exception for user $user. Error: ".$ex->getMessage());
+			return false;
 		}
 	}
-	public function addUserInGroup($username) {
+	public function addUserInFilesEnabledGroup($username) {
 		$user = $this->userManager->get($username);
 		if (!$user) {
-			$this->logger->error("addUserInGroup for user: $username . User not found.");
+			$this->logger->error("$username User not found.");
 			return false;
 		}
-		$groupName = $this->config->getSystemValue("temporary_group_name");
-		$this->logger->error("addUserInGroup for user in groupname : $groupName .");
+		$groupName = $this->config->getSystemValue("files_enabled_group");
 		if (!$this->groupManager->groupExists($groupName)) {
-			$this->logger->error("addUserInGroup for user: $username . Group not found.");
+			$this->logger->error("$groupName group not exist.");
 			return false;
 		}
 		$group = $this->groupManager->get($groupName);
 		$group->addUser($user);
-		$this->logger->error("addUserInGroup for user: $username . SUCCESS.");
-		return true;/canAccessFilesystem
+		return true;
 	}
+	public function checkFilesGroupAccess($username) {
+		$groupName = $this->config->getSystemValue("files_enabled_group");
+		if (!$this->groupManager->groupExists($groupName)) {
+			$this->logger->error("$groupName group not exist.");
+			return false;
+		}
+		if ($this->groupManager->isInGroup($username, $groupName)) {
+			return true;
+		}
+		return false;
+	}
+
 }
-- 
GitLab


From 6049daee6a6043bb65a44991fb172548bde3b7e5 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 23 Jan 2025 19:06:58 +0530
Subject: [PATCH 147/185] condition added for addStoragewrapper and added group
 whilem account creation

---
 lib/AppInfo/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 4d01c590..fee19ac6 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -55,7 +55,7 @@ class Application extends App implements IBootstrap {
 	private FilesystemService $fsservice;
 	private IUserSession $userSession;
 
-	public function __construct(FilesystemService $fsservice, IUserSession $userSession, array $urlParams = []) {
+	public function __construct(array $urlParams = [], FilesystemService $fsservice, IUserSession $userSession) {
 		parent::__construct(self::APP_ID, $urlParams);
 		$this->fsservice = $fsservice;
 		$this->userSession = $userSession;
-- 
GitLab


From f643debec0d7e7717f6dfd8eb3793eccb2ad0b9c Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 23 Jan 2025 19:34:54 +0530
Subject: [PATCH 148/185] checking for filegroupacces

---
 lib/AppInfo/Application.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index fee19ac6..e992cfe7 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -44,7 +44,6 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
-use OCP\IUserSession;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
@@ -52,20 +51,13 @@ use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
-	private FilesystemService $fsservice;
-	private IUserSession $userSession;
 
-	public function __construct(array $urlParams = [], FilesystemService $fsservice, IUserSession $userSession) {
+	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
-		$this->fsservice = $fsservice;
-		$this->userSession = $userSession;
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$username = $this->userSession->getUser()->getUID();
-		if(!$this->fsservice->checkFilesGroupAccess($username)) {
-			Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
-		}
+		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
@@ -97,7 +89,14 @@ class Application extends App implements IBootstrap {
 	 * @param IStorage $storage
 	 * @return StorageWrapper|IStorage
 	 */
-	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
+	public function addStorageWrapperCallback($mountPoint, IStorage $storage, FilesystemService $fsservice) {
+
+		$user = \OC::$server->getUserSession()->getUser();
+		$username = $user ? $user->getUID() : null;
+				
+		if($username && $fsservice->checkFilesGroupAccess($username)) {
+			return $storage;
+		}
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
 		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
-- 
GitLab


From 2bd2764bdd2d00d3cebcf024564adf71fd995e07 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 23 Jan 2025 20:22:40 +0530
Subject: [PATCH 149/185] checking for filegroupacces

---
 .../{ResetFoldersAfterEnablingFS.php => CreateUserFilesystem.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/Command/{ResetFoldersAfterEnablingFS.php => CreateUserFilesystem.php} (100%)

diff --git a/lib/Command/ResetFoldersAfterEnablingFS.php b/lib/Command/CreateUserFilesystem.php
similarity index 100%
rename from lib/Command/ResetFoldersAfterEnablingFS.php
rename to lib/Command/CreateUserFilesystem.php
-- 
GitLab


From 320886937ccbf272a305ee01aa9596b3d6f28af8 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 02:54:09 +0530
Subject: [PATCH 150/185] changed group name

---
 lib/Service/FilesystemService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index 682b04fc..7b2797af 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -54,7 +54,7 @@ class FilesystemService {
 			$this->logger->error("$username User not found.");
 			return false;
 		}
-		$groupName = $this->config->getSystemValue("files_enabled_group");
+		$groupName = $this->config->getSystemValue("files_access_group_name");
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("$groupName group not exist.");
 			return false;
@@ -64,7 +64,7 @@ class FilesystemService {
 		return true;
 	}
 	public function checkFilesGroupAccess($username) {
-		$groupName = $this->config->getSystemValue("files_enabled_group");
+		$groupName = $this->config->getSystemValue("files_access_group_name");
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("$groupName group not exist.");
 			return false;
-- 
GitLab


From 8d68867f080a1b1b65aa60b888a6ac84818fbe66 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 03:03:58 +0530
Subject: [PATCH 151/185] added server fix

---
 lib/AppInfo/Application.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index e992cfe7..f4a4a82a 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -44,6 +44,7 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
+use OCP\Server;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
@@ -89,11 +90,13 @@ class Application extends App implements IBootstrap {
 	 * @param IStorage $storage
 	 * @return StorageWrapper|IStorage
 	 */
-	public function addStorageWrapperCallback($mountPoint, IStorage $storage, FilesystemService $fsservice) {
+	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
+		
 
 		$user = \OC::$server->getUserSession()->getUser();
 		$username = $user ? $user->getUID() : null;
-				
+		
+		$fsservice = Server::get(FilesystemService::class);
 		if($username && $fsservice->checkFilesGroupAccess($username)) {
 			return $storage;
 		}
-- 
GitLab


From c558c418eff7b3137e75eaf27c9c9dc4674ca99f Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 11:16:22 +0530
Subject: [PATCH 152/185] File access logger added

---
 lib/AppInfo/Application.php       | 4 +++-
 lib/Service/FilesystemService.php | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index f4a4a82a..ee30512d 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -58,6 +58,7 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
+		\OC::$server->logger->error("addStorageWrapper called...");
 		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
@@ -95,11 +96,12 @@ class Application extends App implements IBootstrap {
 
 		$user = \OC::$server->getUserSession()->getUser();
 		$username = $user ? $user->getUID() : null;
-		
 		$fsservice = Server::get(FilesystemService::class);
 		if($username && $fsservice->checkFilesGroupAccess($username)) {
+			\OC::$server->logger->error("File access allowed for $username...");
 			return $storage;
 		}
+		\OC::$server->logger->error("File access not allowed for $username...");
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
 		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index 7b2797af..c8dbdf1d 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -65,13 +65,16 @@ class FilesystemService {
 	}
 	public function checkFilesGroupAccess($username) {
 		$groupName = $this->config->getSystemValue("files_access_group_name");
+		
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("$groupName group not exist.");
 			return false;
 		}
 		if ($this->groupManager->isInGroup($username, $groupName)) {
+			$this->logger->error("$username is in $groupName group.");
 			return true;
 		}
+		$this->logger->error("$username is not in $groupName group.");
 		return false;
 	}
 
-- 
GitLab


From f36c99a4692a59d33206e0b95bf4f692e3f94150 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 11:29:46 +0530
Subject: [PATCH 153/185] File access logger added

---
 lib/AppInfo/Application.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index ee30512d..3a77ac3c 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -98,10 +98,8 @@ class Application extends App implements IBootstrap {
 		$username = $user ? $user->getUID() : null;
 		$fsservice = Server::get(FilesystemService::class);
 		if($username && $fsservice->checkFilesGroupAccess($username)) {
-			\OC::$server->logger->error("File access allowed for $username...");
 			return $storage;
 		}
-		\OC::$server->logger->error("File access not allowed for $username...");
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
 		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
-- 
GitLab


From 063324930e8cf3ad1cfe0d00c28abc9d6bec7eb9 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 12:21:10 +0530
Subject: [PATCH 154/185] File access logger added

---
 lib/AppInfo/Application.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 3a77ac3c..c0cc9482 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -58,7 +58,6 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		\OC::$server->logger->error("addStorageWrapper called...");
 		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-- 
GitLab


From 72a5c5a69c0c7154d0ac0e4b8a097620bc6a12e7 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 12:29:15 +0530
Subject: [PATCH 155/185] Add in Group first

---
 lib/Command/CreateUserFilesystem.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index 3c0dbfe4..08c85942 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -78,13 +78,14 @@ class CreateUserFilesystem extends Command {
 				$username = $user['username'];
 				$output->writeln("$username Processing user...");
 
-				$output->writeln("Setup FS for user...");
-				$isSetupCompleted = $this->fsservice->callSetupFS($username);
-				$output->writeln($isSetupCompleted ? "YES": "NO");
-
 				$output->writeln("Add user in group...");
 				$isUserInGroup = $this->fsservice->addUserInFilesEnabledGroup($username);
 				$output->writeln($isUserInGroup ? "YES": "NO");
+				
+				$output->writeln("Setup FS for user...");
+				$isSetupCompleted = $this->fsservice->callSetupFS($username);
+				$output->writeln($isSetupCompleted ? "YES": "NO");
+				
 				$output->writeln("--End--");
 			}
 
-- 
GitLab


From 09241fd4c1c2bd6624da61dc6691ee400caee665 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 12:35:40 +0530
Subject: [PATCH 156/185] check if user in group

---
 lib/Command/CreateUserFilesystem.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index 08c85942..998e6c3c 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -78,13 +78,16 @@ class CreateUserFilesystem extends Command {
 				$username = $user['username'];
 				$output->writeln("$username Processing user...");
 
-				$output->writeln("Add user in group...");
 				$isUserInGroup = $this->fsservice->addUserInFilesEnabledGroup($username);
-				$output->writeln($isUserInGroup ? "YES": "NO");
-				
+				$output->writeln("Checking if user in group");
+				if (!$isUserInGroup) {
+					$output->writeln("user not in group. Adding...");
+					$result = $this->fsservice->addUserInFilesEnabledGroup($username);
+					$output->writeln($result ? "Added in group sucessfully.": "Failed to add in Group");
+				}
 				$output->writeln("Setup FS for user...");
 				$isSetupCompleted = $this->fsservice->callSetupFS($username);
-				$output->writeln($isSetupCompleted ? "YES": "NO");
+				$output->writeln($isSetupCompleted ? "User Setup sucessfully": "Failed to setup");
 				
 				$output->writeln("--End--");
 			}
-- 
GitLab


From cc050325bb81926425e3e2e98eb5bca5b507686e Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 13:44:22 +0530
Subject: [PATCH 157/185] restrict at Storagewrapper

---
 lib/Filesystem/StorageWrapper.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
index f35a5510..71f20a31 100644
--- a/lib/Filesystem/StorageWrapper.php
+++ b/lib/Filesystem/StorageWrapper.php
@@ -7,15 +7,26 @@ namespace OCA\EcloudAccounts\Filesystem;
 use OC\Files\Cache\Cache;
 use OC\Files\Storage\Storage;
 use OC\Files\Storage\Wrapper\Wrapper;
+use OCA\EcloudAccounts\Service\FilesystemService;
 use OCP\Files\ForbiddenException;
 use OCP\Files\Storage\IStorage;
 use OCP\Files\Storage\IWriteStreamStorage;
+use OCP\Server;
 
 class StorageWrapper extends Wrapper implements IWriteStreamStorage {
+	public $isrestricted = true;
 	/**
 	 * @param array $parameters
 	 */
 	public function __construct($parameters) {
+		$mountPoint = $parameters['mountPoint'] ?? null;
+		if (preg_match('#/([^/]+)/files/#', $mountPoint, $matches)) {
+			$username = $matches[1];
+			$fsservice = Server::get(FilesystemService::class);
+			if($username && $fsservice->checkFilesGroupAccess($username)) {
+				$this->isrestricted = false;
+			}
+		}
 		parent::__construct($parameters);
 	}
 
@@ -23,7 +34,9 @@ class StorageWrapper extends Wrapper implements IWriteStreamStorage {
 	 * @throws ForbiddenException
 	 */
 	protected function checkFileAccess(string $path, bool $isDir = false): void {
-		throw new ForbiddenException('Access denied', false);
+		if($this->isrestricted) {
+			throw new ForbiddenException('Access denied.', false);
+		}
 	}
 
 	/*
-- 
GitLab


From fbd04bd67f51dc48d9973d4b9d79ca108a7fe52a Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 14:06:54 +0530
Subject: [PATCH 158/185] check

---
 lib/Filesystem/StorageWrapper.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
index 71f20a31..27b778f9 100644
--- a/lib/Filesystem/StorageWrapper.php
+++ b/lib/Filesystem/StorageWrapper.php
@@ -14,19 +14,10 @@ use OCP\Files\Storage\IWriteStreamStorage;
 use OCP\Server;
 
 class StorageWrapper extends Wrapper implements IWriteStreamStorage {
-	public $isrestricted = true;
 	/**
 	 * @param array $parameters
 	 */
 	public function __construct($parameters) {
-		$mountPoint = $parameters['mountPoint'] ?? null;
-		if (preg_match('#/([^/]+)/files/#', $mountPoint, $matches)) {
-			$username = $matches[1];
-			$fsservice = Server::get(FilesystemService::class);
-			if($username && $fsservice->checkFilesGroupAccess($username)) {
-				$this->isrestricted = false;
-			}
-		}
 		parent::__construct($parameters);
 	}
 
@@ -34,8 +25,18 @@ class StorageWrapper extends Wrapper implements IWriteStreamStorage {
 	 * @throws ForbiddenException
 	 */
 	protected function checkFileAccess(string $path, bool $isDir = false): void {
-		if($this->isrestricted) {
-			throw new ForbiddenException('Access denied.', false);
+		$isrestricted = true;
+		$mountPoint = $path ?? null;
+		\OC::$server->getLogger()->error("mountPoint:: $mountPoint");
+		if (preg_match('#/([^/]+)/?#', $mountPoint, $matches)) {
+			$username = $matches[1];
+			$fsservice = Server::get(FilesystemService::class);
+			if($username && $fsservice->checkFilesGroupAccess($username)) {
+				$isrestricted = false;
+			}
+		}
+		if($isrestricted) {
+			throw new ForbiddenException('Access denied.'.$isrestricted, false);
 		}
 	}
 
-- 
GitLab


From 6312ddc8965576c88b8d25e34672be2858195bcd Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 14:19:13 +0530
Subject: [PATCH 159/185] reverted

---
 lib/AppInfo/Application.php       |  1 +
 lib/Filesystem/StorageWrapper.php | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index c0cc9482..f4a4a82a 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -95,6 +95,7 @@ class Application extends App implements IBootstrap {
 
 		$user = \OC::$server->getUserSession()->getUser();
 		$username = $user ? $user->getUID() : null;
+		
 		$fsservice = Server::get(FilesystemService::class);
 		if($username && $fsservice->checkFilesGroupAccess($username)) {
 			return $storage;
diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
index 27b778f9..f35a5510 100644
--- a/lib/Filesystem/StorageWrapper.php
+++ b/lib/Filesystem/StorageWrapper.php
@@ -7,11 +7,9 @@ namespace OCA\EcloudAccounts\Filesystem;
 use OC\Files\Cache\Cache;
 use OC\Files\Storage\Storage;
 use OC\Files\Storage\Wrapper\Wrapper;
-use OCA\EcloudAccounts\Service\FilesystemService;
 use OCP\Files\ForbiddenException;
 use OCP\Files\Storage\IStorage;
 use OCP\Files\Storage\IWriteStreamStorage;
-use OCP\Server;
 
 class StorageWrapper extends Wrapper implements IWriteStreamStorage {
 	/**
@@ -25,19 +23,7 @@ class StorageWrapper extends Wrapper implements IWriteStreamStorage {
 	 * @throws ForbiddenException
 	 */
 	protected function checkFileAccess(string $path, bool $isDir = false): void {
-		$isrestricted = true;
-		$mountPoint = $path ?? null;
-		\OC::$server->getLogger()->error("mountPoint:: $mountPoint");
-		if (preg_match('#/([^/]+)/?#', $mountPoint, $matches)) {
-			$username = $matches[1];
-			$fsservice = Server::get(FilesystemService::class);
-			if($username && $fsservice->checkFilesGroupAccess($username)) {
-				$isrestricted = false;
-			}
-		}
-		if($isrestricted) {
-			throw new ForbiddenException('Access denied.'.$isrestricted, false);
-		}
+		throw new ForbiddenException('Access denied', false);
 	}
 
 	/*
-- 
GitLab


From 9bbe992afc19e9cbb8b152975ef9956bd1112d36 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 14:55:07 +0530
Subject: [PATCH 160/185] reverted

---
 lib/AppInfo/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index f4a4a82a..f95dca33 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -58,7 +58,7 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
+		// Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
-- 
GitLab


From 5d51e39c08ebba3b64a82b2868fd45c70bbbbf0e Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 17:15:54 +0530
Subject: [PATCH 161/185] added check at addstroragewrappercallaback

---
 lib/AppInfo/Application.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index f95dca33..9a542298 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -58,7 +58,7 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		// Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
+		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
@@ -92,10 +92,19 @@ class Application extends App implements IBootstrap {
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
 		
-
+		$username = null;
 		$user = \OC::$server->getUserSession()->getUser();
-		$username = $user ? $user->getUID() : null;
-		
+		if($user) {
+			$username = $user->getUID();
+		} else {
+			if (preg_match('#/([^/]+)/#', $mountPoint, $matches)) {
+				$username = $matches[1];
+			}
+
+		}
+		\OC::$server->getLogger()->error("--> addStorageWrapperCallback mountPoint:: ".$mountPoint);
+		\OC::$server->getLogger()->error("--> addStorageWrapperCallback username:: ".$username);
+
 		$fsservice = Server::get(FilesystemService::class);
 		if($username && $fsservice->checkFilesGroupAccess($username)) {
 			return $storage;
-- 
GitLab


From f923c31c2aba716075d79238618d007d6a24616e Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 17:53:38 +0530
Subject: [PATCH 162/185] Revamp code

---
 lib/AppInfo/Application.php | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 9a542298..91646c03 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -90,25 +90,16 @@ class Application extends App implements IBootstrap {
 	 * @param IStorage $storage
 	 * @return StorageWrapper|IStorage
 	 */
-	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
-		
-		$username = null;
-		$user = \OC::$server->getUserSession()->getUser();
-		if($user) {
-			$username = $user->getUID();
-		} else {
-			if (preg_match('#/([^/]+)/#', $mountPoint, $matches)) {
-				$username = $matches[1];
-			}
-
-		}
-		\OC::$server->getLogger()->error("--> addStorageWrapperCallback mountPoint:: ".$mountPoint);
-		\OC::$server->getLogger()->error("--> addStorageWrapperCallback username:: ".$username);
+	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
+		$username = $this->getUsernameFromMountPoint($mountPoint);
+		\OC::$server->getLogger()->error("--> addStorageWrapperCallback mountPoint:: " . $mountPoint);
+		\OC::$server->getLogger()->error("--> addStorageWrapperCallback username:: " . $username);
 
 		$fsservice = Server::get(FilesystemService::class);
-		if($username && $fsservice->checkFilesGroupAccess($username)) {
+		if ($username && $fsservice->checkFilesGroupAccess($username)) {
 			return $storage;
 		}
+
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
 		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
@@ -120,4 +111,17 @@ class Application extends App implements IBootstrap {
 
 		return $storage;
 	}
+
+	private function getUsernameFromMountPoint($mountPoint): ?string {
+		$user = \OC::$server->getUserSession()->getUser();
+		if ($user) {
+			return $user->getUID();
+		}
+
+		if (preg_match('#/([^/]+)/#', $mountPoint, $matches)) {
+			return $matches[1];
+		}
+
+		return null;
+	}
 }
-- 
GitLab


From 5dcd13c1f7538b56b9d8f5c317235ce376c3dbf6 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Fri, 24 Jan 2025 18:04:43 +0530
Subject: [PATCH 163/185] added new logs

---
 lib/AppInfo/Application.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 91646c03..ff4414af 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -91,6 +91,7 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
+		\OC::$server->getLogger()->error("--> addStorageWrapperCallback original mountPoint:: " . $mountPoint);
 		$username = $this->getUsernameFromMountPoint($mountPoint);
 		\OC::$server->getLogger()->error("--> addStorageWrapperCallback mountPoint:: " . $mountPoint);
 		\OC::$server->getLogger()->error("--> addStorageWrapperCallback username:: " . $username);
-- 
GitLab


From 938defa17492103108bc0f8754ee8d892de997dd Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Mon, 27 Jan 2025 14:46:03 +0530
Subject: [PATCH 164/185] Log errors and exceptions to console in fs command

---
 lib/Command/CreateUserFilesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index 998e6c3c..e450cd42 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -94,7 +94,7 @@ class CreateUserFilesystem extends Command {
 
 			$output->writeln('Setup completed for all eligible users.');
 			return Command::SUCCESS;
-		} catch (\Exception $e) {
+		} catch (\Throwable $e) {
 			$output->writeln('Error: ' . $e->getMessage());
 			return Command::FAILURE;
 		}
-- 
GitLab


From 852983982d4a28ed4675798b1a7514bbca5262aa Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Mon, 27 Jan 2025 15:27:50 +0530
Subject: [PATCH 165/185] cleanup code

---
 lib/AppInfo/Application.php          | 3 ---
 lib/Command/CreateUserFilesystem.php | 3 +--
 lib/Service/FilesystemService.php    | 3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index ff4414af..bd5b1fce 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -91,10 +91,7 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
-		\OC::$server->getLogger()->error("--> addStorageWrapperCallback original mountPoint:: " . $mountPoint);
 		$username = $this->getUsernameFromMountPoint($mountPoint);
-		\OC::$server->getLogger()->error("--> addStorageWrapperCallback mountPoint:: " . $mountPoint);
-		\OC::$server->getLogger()->error("--> addStorageWrapperCallback username:: " . $username);
 
 		$fsservice = Server::get(FilesystemService::class);
 		if ($username && $fsservice->checkFilesGroupAccess($username)) {
diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index e450cd42..25ba5b98 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -76,12 +76,11 @@ class CreateUserFilesystem extends Command {
 				}
 
 				$username = $user['username'];
-				$output->writeln("$username Processing user...");
+				$output->writeln("$username Processing user");
 
 				$isUserInGroup = $this->fsservice->addUserInFilesEnabledGroup($username);
 				$output->writeln("Checking if user in group");
 				if (!$isUserInGroup) {
-					$output->writeln("user not in group. Adding...");
 					$result = $this->fsservice->addUserInFilesEnabledGroup($username);
 					$output->writeln($result ? "Added in group sucessfully.": "Failed to add in Group");
 				}
diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index c8dbdf1d..3f92291c 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -51,7 +51,6 @@ class FilesystemService {
 	public function addUserInFilesEnabledGroup($username) {
 		$user = $this->userManager->get($username);
 		if (!$user) {
-			$this->logger->error("$username User not found.");
 			return false;
 		}
 		$groupName = $this->config->getSystemValue("files_access_group_name");
@@ -71,10 +70,8 @@ class FilesystemService {
 			return false;
 		}
 		if ($this->groupManager->isInGroup($username, $groupName)) {
-			$this->logger->error("$username is in $groupName group.");
 			return true;
 		}
-		$this->logger->error("$username is not in $groupName group.");
 		return false;
 	}
 
-- 
GitLab


From 12275ec201eb515d08c26ce0cc35c985d9caf949 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 28 Jan 2025 01:01:59 +0530
Subject: [PATCH 166/185] changes

---
 lib/AppInfo/Application.php          | 31 ++++++++++++---------------
 lib/Command/CreateUserFilesystem.php | 32 +++++++++++++++-------------
 lib/Service/FilesystemService.php    | 11 +++++-----
 3 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index bd5b1fce..3b9912df 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -91,13 +91,6 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
-		$username = $this->getUsernameFromMountPoint($mountPoint);
-
-		$fsservice = Server::get(FilesystemService::class);
-		if ($username && $fsservice->checkFilesGroupAccess($username)) {
-			return $storage;
-		}
-
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
 		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
@@ -106,20 +99,24 @@ class Application extends App implements IBootstrap {
 				'mountPoint' => $mountPoint,
 			]);
 		}
+		$username = $this->getUsernameFromMountPoint($mountPoint);
+
+		$fsservice = Server::get(FilesystemService::class);
+		if ($username && $fsservice->checkFilesGroupAccess($username)) {
+			return $storage;
+		}
 
 		return $storage;
 	}
 
 	private function getUsernameFromMountPoint($mountPoint): ?string {
-		$user = \OC::$server->getUserSession()->getUser();
-		if ($user) {
-			return $user->getUID();
-		}
-
-		if (preg_match('#/([^/]+)/#', $mountPoint, $matches)) {
-			return $matches[1];
-		}
-
-		return null;
+		// Remove the leading slash if it's there
+		$mountPoint = ltrim($mountPoint, '/');
+		
+		// Split the mount point by '/'
+		$parts = explode('/', $mountPoint);
+		
+		// If the first part exists, return it as the username
+		return isset($parts[0]) ? $parts[0] : null;
 	}
 }
diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index 25ba5b98..aec6eb52 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -13,11 +13,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class CreateUserFilesystem extends Command {
 	private LDAPConnectionService $ldapService;
-	private FilesystemService $fsservice;
+	private FilesystemService $fsService;
 
-	public function __construct(LDAPConnectionService $ldapService, FilesystemService $fsservice) {
+	public function __construct(LDAPConnectionService $ldapService, FilesystemService $fsService) {
 		$this->ldapService = $ldapService;
-		$this->fsservice = $fsservice;
+		$this->fsService = $fsService;
 		parent::__construct();
 	}
 	/**
@@ -59,8 +59,12 @@ class CreateUserFilesystem extends Command {
 			if ($date) {
 				// Fetch users from LDAP created after the specified date
 				$output->writeln("Fetching users created after $date...");
-				$users = $this->ldapService->getUsersCreatedAfter($date);
-				
+				try {
+					$users = $this->ldapService->getUsersCreatedAfter($date);
+				} catch (\Exception $e) {
+					$output->writeln('Error fetching users from LDAP: ' . $e->getMessage());
+					return Command::FAILURE;
+				}
 			} elseif ($userIdsOption) {
 				// Process specific user IDs
 				$userIds = array_map('trim', explode(',', $userIdsOption));
@@ -77,18 +81,16 @@ class CreateUserFilesystem extends Command {
 
 				$username = $user['username'];
 				$output->writeln("$username Processing user");
-
-				$isUserInGroup = $this->fsservice->addUserInFilesEnabledGroup($username);
-				$output->writeln("Checking if user in group");
+	
+				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
+				$output->writeln("Checking $username is in group...");
 				if (!$isUserInGroup) {
-					$result = $this->fsservice->addUserInFilesEnabledGroup($username);
-					$output->writeln($result ? "Added in group sucessfully.": "Failed to add in Group");
+					$result = $this->fsService->addUserInFilesEnabledGroup($username);
+					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
 				}
-				$output->writeln("Setup FS for user...");
-				$isSetupCompleted = $this->fsservice->callSetupFS($username);
-				$output->writeln($isSetupCompleted ? "User Setup sucessfully": "Failed to setup");
-				
-				$output->writeln("--End--");
+				$output->writeln("Setup FS for user $username ");
+				$isSetupCompleted = $this->fsService->callSetupFS($username);
+				$output->writeln($isSetupCompleted ? "$username User setup successfully" : "$username is failed while setup");
 			}
 
 			$output->writeln('Setup completed for all eligible users.');
diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index 3f92291c..4ca74874 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -32,7 +32,7 @@ class FilesystemService {
 	}
 
 
-	public function callSetupFS(string $user) {
+	public function callSetupFS(string $user): bool {
 
 		OC_Util::setupFS($user);
 		//trigger creation of user home and /files folder
@@ -44,16 +44,15 @@ class FilesystemService {
 			return true;
 		} catch (NotPermittedException $ex) {
 			// read only uses
-			$this->logger->error("Exception for user $user. Error: ".$ex->getMessage());
 			return false;
 		}
 	}
-	public function addUserInFilesEnabledGroup($username) {
+	public function addUserInFilesEnabledGroup($username): bool {
 		$user = $this->userManager->get($username);
 		if (!$user) {
 			return false;
 		}
-		$groupName = $this->config->getSystemValue("files_access_group_name");
+		$groupName = $this->config->getSystemValue('files_access_group_name', '');
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("$groupName group not exist.");
 			return false;
@@ -62,8 +61,8 @@ class FilesystemService {
 		$group->addUser($user);
 		return true;
 	}
-	public function checkFilesGroupAccess($username) {
-		$groupName = $this->config->getSystemValue("files_access_group_name");
+	public function checkFilesGroupAccess($username): bool {
+		$groupName = $this->config->getSystemValue('files_access_group_name', '');
 		
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("$groupName group not exist.");
-- 
GitLab


From 7d9acc14a452f64386baf9c1ef6cda322de2c5df Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 28 Jan 2025 01:13:57 +0530
Subject: [PATCH 167/185] some changes as per feedback

---
 lib/AppInfo/Application.php          | 14 ++++++++------
 lib/Command/CreateUserFilesystem.php |  6 +++---
 lib/Controller/AccountController.php |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 3b9912df..b49dcedf 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -91,6 +91,14 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
+		
+		$username = $this->getUsernameFromMountPoint($mountPoint);
+
+		$fsService = Server::get(FilesystemService::class);
+		if ($username && $fsService->checkFilesGroupAccess($username)) {
+			return $storage;
+		}
+
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
 		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
@@ -99,12 +107,6 @@ class Application extends App implements IBootstrap {
 				'mountPoint' => $mountPoint,
 			]);
 		}
-		$username = $this->getUsernameFromMountPoint($mountPoint);
-
-		$fsservice = Server::get(FilesystemService::class);
-		if ($username && $fsservice->checkFilesGroupAccess($username)) {
-			return $storage;
-		}
 
 		return $storage;
 	}
diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index aec6eb52..f2d5cec1 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -80,17 +80,17 @@ class CreateUserFilesystem extends Command {
 				}
 
 				$username = $user['username'];
-				$output->writeln("$username Processing user");
+				$output->writeln("$username Processing user.");
 	
 				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
-				$output->writeln("Checking $username is in group...");
+				$output->writeln("Checking $username is in group.");
 				if (!$isUserInGroup) {
 					$result = $this->fsService->addUserInFilesEnabledGroup($username);
 					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
 				}
 				$output->writeln("Setup FS for user $username ");
 				$isSetupCompleted = $this->fsService->callSetupFS($username);
-				$output->writeln($isSetupCompleted ? "$username User setup successfully" : "$username is failed while setup");
+				$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
 			}
 
 			$output->writeln('Setup completed for all eligible users.');
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
index 806d0826..774e9122 100644
--- a/lib/Controller/AccountController.php
+++ b/lib/Controller/AccountController.php
@@ -46,7 +46,7 @@ class AccountController extends Controller {
 	private IConfig $config;
 	private IInitialState $initialState;
 	private IAppData $appData;
-	private FilesystemService $fsservice;
+	private FilesystemService $fsService;
 	private const SESSION_VERIFIED_USERNAME = 'verified_username';
 	private const SESSION_VERIFIED_DISPLAYNAME = 'verified_displayname';
 	private const CAPTCHA_VERIFIED_CHECK = 'captcha_verified';
@@ -72,7 +72,7 @@ class AccountController extends Controller {
 		ILogger $logger,
 		IInitialState $initialState,
 		IAppData $appData,
-		FilesystemService $fsservice
+		FilesystemService $fsService
 	) {
 		parent::__construct($AppName, $request);
 		$this->appName = $AppName;
@@ -89,7 +89,7 @@ class AccountController extends Controller {
 		$this->request = $request;
 		$this->initialState = $initialState;
 		$this->appData = $appData;
-		$this->fsservice = $fsservice;
+		$this->fsService = $fsService;
 	}
 
 	/**
@@ -214,7 +214,7 @@ class AccountController extends Controller {
 			$ipAddress = $this->request->getRemoteAddress();
 			$this->userService->addUsernameToCommonDataStore($username, $ipAddress, $recoveryEmail);
 			// temporary fix to add user in 'files-enabled' group
-			$this->fsservice->addUserInFilesEnabledGroup($username);
+			$this->fsService->addUserInFilesEnabledGroup($username);
 			$response->setStatus(200);
 			$response->setData(['success' => true]);
 
-- 
GitLab


From fec1582366dcd3d185c62bf6731ffbba5282a5f1 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 28 Jan 2025 13:44:04 +0530
Subject: [PATCH 168/185] feedback work

---
 lib/Command/CreateUserFilesystem.php  | 5 +++--
 lib/Service/LDAPConnectionService.php | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index f2d5cec1..36f60fea 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -80,14 +80,15 @@ class CreateUserFilesystem extends Command {
 				}
 
 				$username = $user['username'];
-				$output->writeln("$username Processing user.");
+				$output->writeln("Processing user $username.");
 	
-				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
 				$output->writeln("Checking $username is in group.");
+				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
 				if (!$isUserInGroup) {
 					$result = $this->fsService->addUserInFilesEnabledGroup($username);
 					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
 				}
+				
 				$output->writeln("Setup FS for user $username ");
 				$isSetupCompleted = $this->fsService->callSetupFS($username);
 				$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 7aa63157..b3ca40b9 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -134,7 +134,7 @@ class LDAPConnectionService {
 		$baseDn = implode(',', $this->getLDAPBaseUsers());
 		$filter = sprintf('(createTimestamp>=%s)', $formattedDate);
 	
-		$searchResult = ldap_search($conn, $baseDn, $filter, ['dn', 'username', 'createTimestamp']);
+		$searchResult = ldap_search($conn, $baseDn, $filter, ['username']);
 		if (!$searchResult) {
 			$this->closeLDAPConnection($conn);
 			throw new Exception('LDAP search failed for createTimestamp after: ' . $date);
@@ -147,9 +147,7 @@ class LDAPConnectionService {
 		if ($entries['count'] > 0) {
 			for ($i = 0; $i < $entries['count']; $i++) {
 				$users[] = [
-					'dn' => $entries[$i]['dn'],
 					'username' => $entries[$i]['username'][0] ?? null,
-					'createTimestamp' => $entries[$i]['createtimestamp'][0] ?? null,
 				];
 			}
 		}
-- 
GitLab


From c120b062ee8501c356b4d01261de147fd306e555 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Tue, 28 Jan 2025 13:45:25 +0530
Subject: [PATCH 169/185] changd to \OC::->get

---
 lib/AppInfo/Application.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b49dcedf..652b5d05 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -44,7 +44,6 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
-use OCP\Server;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
@@ -94,7 +93,7 @@ class Application extends App implements IBootstrap {
 		
 		$username = $this->getUsernameFromMountPoint($mountPoint);
 
-		$fsService = Server::get(FilesystemService::class);
+		$fsService = \OC::$server->get(FilesystemService::class);
 		if ($username && $fsService->checkFilesGroupAccess($username)) {
 			return $storage;
 		}
-- 
GitLab


From 5c283ecdc3bfb9a62214ac49f8a4e73899c4b29e Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 00:29:43 +0530
Subject: [PATCH 170/185] added condition

---
 lib/AppInfo/Application.php | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 652b5d05..8b8e6f69 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -90,34 +90,39 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
-		
+		// Get the username from the mount point
 		$username = $this->getUsernameFromMountPoint($mountPoint);
 
-		$fsService = \OC::$server->get(FilesystemService::class);
-		if ($username && $fsService->checkFilesGroupAccess($username)) {
-			return $storage;
-		}
-
+		// Only perform the access check if the mount point is not part of the appdata folder
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
-		if ($mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
-			return new StorageWrapper([
-				'storage' => $storage,
-				'mountPoint' => $mountPoint,
-			]);
+
+		// Check if the mountPoint is not appdata and if we need to check the user's group access
+		if ($username && $mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
+			$fsService = \OC::$server->get(FilesystemService::class);
+			// Perform the group access check
+			if (!$fsService->checkFilesGroupAccess($username)) {
+				// If access is denied, wrap the storage
+				return new StorageWrapper([
+					'storage' => $storage,
+					'mountPoint' => $mountPoint,
+				]);
+			}
 		}
 
+		// Return the storage directly if access is allowed or the mountPoint is part of appdata
 		return $storage;
 	}
 
 	private function getUsernameFromMountPoint($mountPoint): ?string {
 		// Remove the leading slash if it's there
 		$mountPoint = ltrim($mountPoint, '/');
-		
+
 		// Split the mount point by '/'
 		$parts = explode('/', $mountPoint);
-		
+
 		// If the first part exists, return it as the username
 		return isset($parts[0]) ? $parts[0] : null;
 	}
+
 }
-- 
GitLab


From 4ed93d55617f1d9be18ecba2da3b7115b90fa57c Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 01:25:49 +0530
Subject: [PATCH 171/185] added batchsize

---
 lib/Command/CreateUserFilesystem.php | 52 ++++++++++++++++++----------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index 36f60fea..ecb45552 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -48,12 +48,13 @@ class CreateUserFilesystem extends Command {
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$date = $input->getOption('date');
 		$userIdsOption = $input->getOption('user_ids');
-
+		$batchSize = 1000;  // Define the batch size
+		
 		if (!$date && !$userIdsOption) {
 			$output->writeln('Either the --date or --user_ids option is required.');
 			return Command::INVALID;
 		}
-
+	
 		try {
 			$users = [];
 			if ($date) {
@@ -73,27 +74,40 @@ class CreateUserFilesystem extends Command {
 				}
 				$output->writeln('Processing specified user IDs: ' . implode(', ', $userIds));
 			}
+			
 			$output->writeln('Setup started for all eligible users.');
-			foreach ($users as $user) {
-				if (!$user['username']) {
-					continue;
-				}
-
-				$username = $user['username'];
-				$output->writeln("Processing user $username.");
 	
-				$output->writeln("Checking $username is in group.");
-				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
-				if (!$isUserInGroup) {
-					$result = $this->fsService->addUserInFilesEnabledGroup($username);
-					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
+			// Process in batches
+			$batchCount = 0;
+			foreach (array_chunk($users, $batchSize) as $userBatch) {
+				$batchCount++;
+				$output->writeln("Processing batch $batchCount...");
+	
+				foreach ($userBatch as $user) {
+					if (!$user['username']) {
+						continue;
+					}
+	
+					$username = $user['username'];
+					$output->writeln("Processing user $username.");
+	
+					$output->writeln("Checking $username is in group.");
+					$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
+					if (!$isUserInGroup) {
+						$result = $this->fsService->addUserInFilesEnabledGroup($username);
+						$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
+					}
+	
+					$output->writeln("Setup FS for user $username ");
+					$isSetupCompleted = $this->fsService->callSetupFS($username);
+					$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
 				}
-				
-				$output->writeln("Setup FS for user $username ");
-				$isSetupCompleted = $this->fsService->callSetupFS($username);
-				$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
+	
+				$output->writeln("Waiting for 2 seconds before processing the next batch...");
+				sleep(2); // Delay for 2 seconds
+				$output->writeln("Resuming to next batch.");
 			}
-
+	
 			$output->writeln('Setup completed for all eligible users.');
 			return Command::SUCCESS;
 		} catch (\Throwable $e) {
-- 
GitLab


From 2a1530a2f297876bd37b5a892926ae02681d7230 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 01:42:52 +0530
Subject: [PATCH 172/185] batches added in ldap

---
 lib/Command/CreateUserFilesystem.php  | 65 ++++++++++---------
 lib/Service/LDAPConnectionService.php | 90 +++++++++++++++++++++++----
 2 files changed, 111 insertions(+), 44 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index ecb45552..aaee6b86 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -48,20 +48,30 @@ class CreateUserFilesystem extends Command {
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$date = $input->getOption('date');
 		$userIdsOption = $input->getOption('user_ids');
-		$batchSize = 1000;  // Define the batch size
-		
+	
 		if (!$date && !$userIdsOption) {
 			$output->writeln('Either the --date or --user_ids option is required.');
 			return Command::INVALID;
 		}
 	
 		try {
+			$batchSize = 500; // Define the batch size
 			$users = [];
+	
 			if ($date) {
-				// Fetch users from LDAP created after the specified date
-				$output->writeln("Fetching users created after $date...");
+				// Fetch users from LDAP created after the specified date in batches
+				$output->writeln("Fetching users created after $date in batches of $batchSize...");
 				try {
-					$users = $this->ldapService->getUsersCreatedAfter($date);
+					$cookie = null; // Initialize LDAP pagination cookie
+					do {
+						// Fetch a batch of users
+						$currentBatch = $this->ldapService->getUsersCreatedAfter($date, $batchSize, $cookie);
+						$users = array_merge($users, $currentBatch);
+	
+						$output->writeln(sprintf("Fetched %d users in this batch. Total fetched: %d", count($currentBatch), count($users)));
+	
+					} while ($cookie !== null && $cookie !== '');
+	
 				} catch (\Exception $e) {
 					$output->writeln('Error fetching users from LDAP: ' . $e->getMessage());
 					return Command::FAILURE;
@@ -74,46 +84,35 @@ class CreateUserFilesystem extends Command {
 				}
 				$output->writeln('Processing specified user IDs: ' . implode(', ', $userIds));
 			}
-			
-			$output->writeln('Setup started for all eligible users.');
 	
-			// Process in batches
-			$batchCount = 0;
-			foreach (array_chunk($users, $batchSize) as $userBatch) {
-				$batchCount++;
-				$output->writeln("Processing batch $batchCount...");
-	
-				foreach ($userBatch as $user) {
-					if (!$user['username']) {
-						continue;
-					}
-	
-					$username = $user['username'];
-					$output->writeln("Processing user $username.");
+			// Process users in chunks
+			$output->writeln('Setup started for all eligible users.');
+			foreach ($users as $user) {
+				if (!$user['username']) {
+					continue;
+				}
 	
-					$output->writeln("Checking $username is in group.");
-					$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
-					if (!$isUserInGroup) {
-						$result = $this->fsService->addUserInFilesEnabledGroup($username);
-						$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
-					}
+				$username = $user['username'];
+				$output->writeln("Processing user $username.");
 	
-					$output->writeln("Setup FS for user $username ");
-					$isSetupCompleted = $this->fsService->callSetupFS($username);
-					$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
+				$output->writeln("Checking $username is in group.");
+				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
+				if (!$isUserInGroup) {
+					$result = $this->fsService->addUserInFilesEnabledGroup($username);
+					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
 				}
 	
-				$output->writeln("Waiting for 2 seconds before processing the next batch...");
-				sleep(2); // Delay for 2 seconds
-				$output->writeln("Resuming to next batch.");
+				$output->writeln("Setup FS for user $username ");
+				$isSetupCompleted = $this->fsService->callSetupFS($username);
+				$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
 			}
 	
 			$output->writeln('Setup completed for all eligible users.');
 			return Command::SUCCESS;
+	
 		} catch (\Throwable $e) {
 			$output->writeln('Error: ' . $e->getMessage());
 			return Command::FAILURE;
 		}
 	}
-
 }
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index b3ca40b9..31289e6d 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -122,7 +122,7 @@ class LDAPConnectionService {
 
 		$this->closeLDAPConnection($conn);
 	}
-	public function getUsersCreatedAfter(string $date): array {
+	public function getUsersCreatedAfter11(string $date, int $batchSize = 500, &$cookie = ''): array {
 		if (!$this->isLDAPEnabled()) {
 			throw new Exception('LDAP backend is not enabled');
 		}
@@ -134,25 +134,93 @@ class LDAPConnectionService {
 		$baseDn = implode(',', $this->getLDAPBaseUsers());
 		$filter = sprintf('(createTimestamp>=%s)', $formattedDate);
 	
-		$searchResult = ldap_search($conn, $baseDn, $filter, ['username']);
-		if (!$searchResult) {
-			$this->closeLDAPConnection($conn);
-			throw new Exception('LDAP search failed for createTimestamp after: ' . $date);
-		}
+		$users = [];
+	
+		do {
+			// Set the paged result control
+			ldap_control_paged_result($conn, $batchSize, true, $cookie);
+	
+			$searchResult = ldap_search($conn, $baseDn, $filter, ['username']);
+			if (!$searchResult) {
+				$this->closeLDAPConnection($conn);
+				throw new Exception('LDAP search failed for createTimestamp after: ' . $date);
+			}
+	
+			$entries = ldap_get_entries($conn, $searchResult);
+			if ($entries['count'] > 0) {
+				for ($i = 0; $i < $entries['count']; $i++) {
+					$users[] = [
+						'username' => $entries[$i]['username'][0] ?? null,
+					];
+				}
+			}
+	
+			// Get the pagination cookie
+			ldap_control_paged_result_response($conn, $searchResult, $cookie);
+	
+		} while ($cookie !== null && $cookie !== '');
 	
-		$entries = ldap_get_entries($conn, $searchResult);
 		$this->closeLDAPConnection($conn);
 	
+		return $users;
+	}
+	
+	public function getUsersCreatedAfter(string $date, int $batchSize = 500, &$cookie = null): array {
+		if (!$this->isLDAPEnabled()) {
+			throw new Exception('LDAP backend is not enabled');
+		}
+	
+		// Convert the provided date to LDAP Generalized Time format: YYYYMMDDHHMMSSZ
+		$formattedDate = (new \DateTime($date))->format('YmdHis') . 'Z';
+	
+		$conn = $this->getLDAPConnection();
+		$baseDn = implode(',', $this->getLDAPBaseUsers());
+		$filter = sprintf('(createTimestamp>=%s)', $formattedDate);
+		$attributes = ['username'];
+
 		$users = [];
-		if ($entries['count'] > 0) {
-			for ($i = 0; $i < $entries['count']; $i++) {
+	
+		// Initialize cookie for pagination if not already set
+		$cookie = $cookie ?? '';
+	
+		do {
+			$controls = [
+				[
+					'oid' => LDAP_CONTROL_PAGEDRESULTS,
+					'value' => ['size' => $batchSize, 'cookie' => $cookie],
+				],
+			];
+	
+			// Set pagination controls on the LDAP query
+			ldap_set_option($conn, LDAP_OPT_SERVER_CONTROLS, $controls);
+	
+			$searchResult = ldap_search($conn, $baseDn, $filter, $attributes);
+	
+			if (!$searchResult) {
+				throw new Exception('LDAP search failed: ' . ldap_error($conn));
+			}
+	
+			$entries = ldap_get_entries($conn, $searchResult);
+	
+			// Add users to the result array
+			foreach ($entries as $entry) {
+				if (!is_array($entry) || !isset($entry['username'][0])) {
+					continue;
+				}
 				$users[] = [
-					'username' => $entries[$i]['username'][0] ?? null,
+					'username' => $entry['username'][0]
 				];
 			}
-		}
+	
+			// Retrieve updated cookie for pagination
+			$responseControls = [];
+			ldap_get_option($conn, LDAP_OPT_SERVER_CONTROLS, $responseControls);
+	
+			$cookie = $responseControls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
+		} while (!empty($cookie));
 	
 		return $users;
 	}
+	
 
 }
-- 
GitLab


From 00763ee5066e06774af2733eb069031d514d9e0c Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 10:52:29 +0530
Subject: [PATCH 173/185] fetched ldap records

---
 lib/Command/CreateUserFilesystem.php  | 12 +---
 lib/Service/LDAPConnectionService.php | 89 +++++++--------------------
 2 files changed, 25 insertions(+), 76 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index aaee6b86..d35510c7 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -62,16 +62,8 @@ class CreateUserFilesystem extends Command {
 				// Fetch users from LDAP created after the specified date in batches
 				$output->writeln("Fetching users created after $date in batches of $batchSize...");
 				try {
-					$cookie = null; // Initialize LDAP pagination cookie
-					do {
-						// Fetch a batch of users
-						$currentBatch = $this->ldapService->getUsersCreatedAfter($date, $batchSize, $cookie);
-						$users = array_merge($users, $currentBatch);
-	
-						$output->writeln(sprintf("Fetched %d users in this batch. Total fetched: %d", count($currentBatch), count($users)));
-	
-					} while ($cookie !== null && $cookie !== '');
-	
+					$users = $this->ldapService->getUsersCreatedAfter($date);
+					$output->writeln("Total users fetched: " . count($users));
 				} catch (\Exception $e) {
 					$output->writeln('Error fetching users from LDAP: ' . $e->getMessage());
 					return Command::FAILURE;
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 31289e6d..bfa71920 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -122,50 +122,8 @@ class LDAPConnectionService {
 
 		$this->closeLDAPConnection($conn);
 	}
-	public function getUsersCreatedAfter11(string $date, int $batchSize = 500, &$cookie = ''): array {
-		if (!$this->isLDAPEnabled()) {
-			throw new Exception('LDAP backend is not enabled');
-		}
-	
-		// Convert the provided date to LDAP Generalized Time format: YYYYMMDDHHMMSSZ
-		$formattedDate = (new \DateTime($date))->format('YmdHis') . 'Z';
-	
-		$conn = $this->getLDAPConnection();
-		$baseDn = implode(',', $this->getLDAPBaseUsers());
-		$filter = sprintf('(createTimestamp>=%s)', $formattedDate);
 	
-		$users = [];
-	
-		do {
-			// Set the paged result control
-			ldap_control_paged_result($conn, $batchSize, true, $cookie);
-	
-			$searchResult = ldap_search($conn, $baseDn, $filter, ['username']);
-			if (!$searchResult) {
-				$this->closeLDAPConnection($conn);
-				throw new Exception('LDAP search failed for createTimestamp after: ' . $date);
-			}
-	
-			$entries = ldap_get_entries($conn, $searchResult);
-			if ($entries['count'] > 0) {
-				for ($i = 0; $i < $entries['count']; $i++) {
-					$users[] = [
-						'username' => $entries[$i]['username'][0] ?? null,
-					];
-				}
-			}
-	
-			// Get the pagination cookie
-			ldap_control_paged_result_response($conn, $searchResult, $cookie);
-	
-		} while ($cookie !== null && $cookie !== '');
-	
-		$this->closeLDAPConnection($conn);
-	
-		return $users;
-	}
-	
-	public function getUsersCreatedAfter(string $date, int $batchSize = 500, &$cookie = null): array {
+	public function getUsersCreatedAfter(string $date, int $batchSize = 500): array {
 		if (!$this->isLDAPEnabled()) {
 			throw new Exception('LDAP backend is not enabled');
 		}
@@ -179,44 +137,43 @@ class LDAPConnectionService {
 		$attributes = ['username'];
 
 		$users = [];
-	
-		// Initialize cookie for pagination if not already set
-		$cookie = $cookie ?? '';
+		$cookie = '';
 	
 		do {
-			$controls = [
+			// Set pagination control
+			ldap_set_option($conn, LDAP_OPT_SERVER_CONTROLS, [
 				[
 					'oid' => LDAP_CONTROL_PAGEDRESULTS,
-					'value' => ['size' => $batchSize, 'cookie' => $cookie],
-				],
-			];
-	
-			// Set pagination controls on the LDAP query
-			ldap_set_option($conn, LDAP_OPT_SERVER_CONTROLS, $controls);
+					'value' => ['size' => $batchSize, 'cookie' => $cookie]
+				]
+			]);
 	
+			// Perform search
 			$searchResult = ldap_search($conn, $baseDn, $filter, $attributes);
-	
 			if (!$searchResult) {
 				throw new Exception('LDAP search failed: ' . ldap_error($conn));
 			}
 	
+			// Retrieve results
 			$entries = ldap_get_entries($conn, $searchResult);
-	
-			// Add users to the result array
-			foreach ($entries as $entry) {
-				if (!is_array($entry) || !isset($entry['username'][0])) {
-					continue;
+			if ($entries['count'] > 0) {
+				foreach ($entries as $entry) {
+					if (!is_array($entry) || !isset($entry['uid'][0])) {
+						continue;
+					}
+					$users[] = [
+						'username' => $entry['username'][0],
+					];
 				}
-				$users[] = [
-					'username' => $entry['username'][0]
-				];
 			}
 	
-			// Retrieve updated cookie for pagination
-			$responseControls = [];
-			ldap_get_option($conn, LDAP_OPT_SERVER_CONTROLS, $responseControls);
+			// Retrieve updated pagination cookie
+			$cookie = '';
+			ldap_parse_result($conn, $searchResult, $errcode, null, null, null, $controls);
+			if (isset($controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
+				$cookie = $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'];
+			}
 	
-			$cookie = $responseControls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
 		} while (!empty($cookie));
 	
 		return $users;
-- 
GitLab


From 0d0a5428240b10a54d4dcab7a4d68f0e26db493d Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 10:53:54 +0530
Subject: [PATCH 174/185] fetched ldap records

---
 lib/Service/LDAPConnectionService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index bfa71920..56273728 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -158,7 +158,7 @@ class LDAPConnectionService {
 			$entries = ldap_get_entries($conn, $searchResult);
 			if ($entries['count'] > 0) {
 				foreach ($entries as $entry) {
-					if (!is_array($entry) || !isset($entry['uid'][0])) {
+					if (!is_array($entry) || !isset($entry['username'][0])) {
 						continue;
 					}
 					$users[] = [
-- 
GitLab


From d9b79ca39a41a1adf949ac4227090b221248073d Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 10:57:09 +0530
Subject: [PATCH 175/185] pass by reference issue

---
 lib/Service/LDAPConnectionService.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 56273728..8e65cc68 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -168,11 +168,12 @@ class LDAPConnectionService {
 			}
 	
 			// Retrieve updated pagination cookie
-			$cookie = '';
-			ldap_parse_result($conn, $searchResult, $errcode, null, null, null, $controls);
-			if (isset($controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) {
-				$cookie = $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'];
-			}
+			$matchedDn = $errorMessage = $referrals = null;
+			$controls = [];
+
+			ldap_parse_result($conn, $searchResult, $errcode, $matchedDn, $errorMessage, $referrals, $controls);
+
+			$cookie = $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
 	
 		} while (!empty($cookie));
 	
-- 
GitLab


From a271b585ee1eb330fedc0753e674a81126856a61 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 11:21:18 +0530
Subject: [PATCH 176/185] now setup fs will only happen if user is not in grou

---
 lib/Command/CreateUserFilesystem.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
index d35510c7..92a8f3a8 100644
--- a/lib/Command/CreateUserFilesystem.php
+++ b/lib/Command/CreateUserFilesystem.php
@@ -92,11 +92,14 @@ class CreateUserFilesystem extends Command {
 				if (!$isUserInGroup) {
 					$result = $this->fsService->addUserInFilesEnabledGroup($username);
 					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
+					if($result) {
+						$output->writeln("Setup FS for user $username ");
+						$isSetupCompleted = $this->fsService->callSetupFS($username);
+						$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
+					}
+				} else {
+					$output->writeln("$username is already in group.");
 				}
-	
-				$output->writeln("Setup FS for user $username ");
-				$isSetupCompleted = $this->fsService->callSetupFS($username);
-				$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
 			}
 	
 			$output->writeln('Setup completed for all eligible users.');
-- 
GitLab


From 1986167d1e3257f12fa8649ed1d97dc0297839f7 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 12:47:43 +0530
Subject: [PATCH 177/185] iterations one by one

---
 lib/Service/LDAPConnectionService.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 8e65cc68..9de9cdcf 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -151,28 +151,31 @@ class LDAPConnectionService {
 			// Perform search
 			$searchResult = ldap_search($conn, $baseDn, $filter, $attributes);
 			if (!$searchResult) {
-				throw new Exception('LDAP search failed: ' . ldap_error($conn));
+				throw new \Exception('LDAP search failed: ' . ldap_error($conn));
 			}
 	
-			// Retrieve results
-			$entries = ldap_get_entries($conn, $searchResult);
-			if ($entries['count'] > 0) {
-				foreach ($entries as $entry) {
-					if (!is_array($entry) || !isset($entry['username'][0])) {
-						continue;
-					}
+			// Iterate entries one by one
+			$entry = ldap_first_entry($conn, $searchResult);
+			while ($entry) {
+				$username = ldap_get_values($conn, $entry, 'uid')[0] ?? null;
+				$createTimestamp = ldap_get_values($conn, $entry, 'createTimestamp')[0] ?? null;
+	
+				if ($username) {
 					$users[] = [
-						'username' => $entry['username'][0],
+						'username' => $username,
+						'createTimestamp' => $createTimestamp,
 					];
 				}
+	
+				// Move to next entry
+				$entry = ldap_next_entry($conn, $entry);
 			}
 	
 			// Retrieve updated pagination cookie
 			$matchedDn = $errorMessage = $referrals = null;
 			$controls = [];
-
+	
 			ldap_parse_result($conn, $searchResult, $errcode, $matchedDn, $errorMessage, $referrals, $controls);
-
 			$cookie = $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
 	
 		} while (!empty($cookie));
-- 
GitLab


From 32112de760f39f1e864c78e4cde36913a376ee37 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 12:48:59 +0530
Subject: [PATCH 178/185] iterations one by one #2

---
 lib/Service/LDAPConnectionService.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 9de9cdcf..423aa57f 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -151,19 +151,17 @@ class LDAPConnectionService {
 			// Perform search
 			$searchResult = ldap_search($conn, $baseDn, $filter, $attributes);
 			if (!$searchResult) {
-				throw new \Exception('LDAP search failed: ' . ldap_error($conn));
+				throw new Exception('LDAP search failed: ' . ldap_error($conn));
 			}
 	
 			// Iterate entries one by one
 			$entry = ldap_first_entry($conn, $searchResult);
 			while ($entry) {
-				$username = ldap_get_values($conn, $entry, 'uid')[0] ?? null;
-				$createTimestamp = ldap_get_values($conn, $entry, 'createTimestamp')[0] ?? null;
+				$username = ldap_get_values($conn, $entry, 'username')[0] ?? null;
 	
 				if ($username) {
 					$users[] = [
-						'username' => $username,
-						'createTimestamp' => $createTimestamp,
+						'username' => $username
 					];
 				}
 	
-- 
GitLab


From 570ae65f5c7ecdc2d5bf7d5c0d117d6f3ca9941b Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Wed, 29 Jan 2025 13:41:56 +0530
Subject: [PATCH 179/185] Change to guard clauses for filesystem wrapper

---
 lib/AppInfo/Application.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 8b8e6f69..61b17c62 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -90,28 +90,26 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
-		// Get the username from the mount point
-		$username = $this->getUsernameFromMountPoint($mountPoint);
 
 		// Only perform the access check if the mount point is not part of the appdata folder
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 		$appdataFolder = 'appdata_' . $instanceId;
+		
+		if ($mountPoint === '/' || strpos($mountPoint, '/' . $appdataFolder) === 0) {
+			return $storage;
+		}
 
-		// Check if the mountPoint is not appdata and if we need to check the user's group access
-		if ($username && $mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
-			$fsService = \OC::$server->get(FilesystemService::class);
-			// Perform the group access check
-			if (!$fsService->checkFilesGroupAccess($username)) {
-				// If access is denied, wrap the storage
-				return new StorageWrapper([
-					'storage' => $storage,
-					'mountPoint' => $mountPoint,
-				]);
-			}
+		// Get the username from the mount point
+		$username = $this->getUsernameFromMountPoint($mountPoint);
+		$fsService = \OC::$server->get(FilesystemService::class);
+		if ($fsService->checkFilesGroupAccess($username)) {
+			return $storage;
 		}
 
-		// Return the storage directly if access is allowed or the mountPoint is part of appdata
-		return $storage;
+		return new StorageWrapper([
+			'storage' => $storage,
+			'mountPoint' => $mountPoint,
+		]);
 	}
 
 	private function getUsernameFromMountPoint($mountPoint): ?string {
-- 
GitLab


From 51e42173d0d943683ff6a3c37c7665f59a601e53 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Wed, 29 Jan 2025 23:54:37 +0530
Subject: [PATCH 180/185] reverted changes

---
 appinfo/info.xml                      |   1 -
 lib/AppInfo/Application.php           |  54 ------
 lib/Command/CreateUserFilesystem.php  | 113 -----------
 lib/Filesystem/CacheWrapper.php       |  57 ------
 lib/Filesystem/StorageWrapper.php     | 260 --------------------------
 lib/Service/FilesystemService.php     |  25 +--
 lib/Service/LDAPConnectionService.php |  60 ------
 7 files changed, 1 insertion(+), 569 deletions(-)
 delete mode 100644 lib/Command/CreateUserFilesystem.php
 delete mode 100644 lib/Filesystem/CacheWrapper.php
 delete mode 100644 lib/Filesystem/StorageWrapper.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 78b4b2cb..88fad061 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -28,6 +28,5 @@
         <command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
         <command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
         <command>OCA\EcloudAccounts\Command\MapActiveAttributetoLDAP</command>
-        <command>OCA\EcloudAccounts\Command\CreateUserFilesystem</command>
     </commands>
 </info>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 61b17c62..24c5f795 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,15 +26,12 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
-use OC\Files\Filesystem;
-use OCA\EcloudAccounts\Filesystem\StorageWrapper;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCA\EcloudAccounts\Middleware\AccountMiddleware;
-use OCA\EcloudAccounts\Service\FilesystemService;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
 use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\AppFramework\App;
@@ -42,12 +39,10 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\Files\Storage\IStorage;
 use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
-use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
@@ -57,7 +52,6 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 		$context->registerEventListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
@@ -75,52 +69,4 @@ class Application extends App implements IBootstrap {
 			);
 		});
 	}
-
-	/**
-	 * @internal
-	 */
-	public function addStorageWrapper(): void {
-		Filesystem::addStorageWrapper('ecloud-accounts', [$this, 'addStorageWrapperCallback'], -10);
-	}
-
-	/**
-	 * @internal
-	 * @param $mountPoint
-	 * @param IStorage $storage
-	 * @return StorageWrapper|IStorage
-	 */
-	public function addStorageWrapperCallback($mountPoint, IStorage $storage): IStorage {
-
-		// Only perform the access check if the mount point is not part of the appdata folder
-		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
-		$appdataFolder = 'appdata_' . $instanceId;
-		
-		if ($mountPoint === '/' || strpos($mountPoint, '/' . $appdataFolder) === 0) {
-			return $storage;
-		}
-
-		// Get the username from the mount point
-		$username = $this->getUsernameFromMountPoint($mountPoint);
-		$fsService = \OC::$server->get(FilesystemService::class);
-		if ($fsService->checkFilesGroupAccess($username)) {
-			return $storage;
-		}
-
-		return new StorageWrapper([
-			'storage' => $storage,
-			'mountPoint' => $mountPoint,
-		]);
-	}
-
-	private function getUsernameFromMountPoint($mountPoint): ?string {
-		// Remove the leading slash if it's there
-		$mountPoint = ltrim($mountPoint, '/');
-
-		// Split the mount point by '/'
-		$parts = explode('/', $mountPoint);
-
-		// If the first part exists, return it as the username
-		return isset($parts[0]) ? $parts[0] : null;
-	}
-
 }
diff --git a/lib/Command/CreateUserFilesystem.php b/lib/Command/CreateUserFilesystem.php
deleted file mode 100644
index 92a8f3a8..00000000
--- a/lib/Command/CreateUserFilesystem.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Command;
-
-use OCA\EcloudAccounts\Service\FilesystemService;
-use OCA\EcloudAccounts\Service\LDAPConnectionService;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class CreateUserFilesystem extends Command {
-	private LDAPConnectionService $ldapService;
-	private FilesystemService $fsService;
-
-	public function __construct(LDAPConnectionService $ldapService, FilesystemService $fsService) {
-		$this->ldapService = $ldapService;
-		$this->fsService = $fsService;
-		parent::__construct();
-	}
-	/**
-	 * run: occ ecloud-accounts:create-folders --date='2024-12-01 00:00:00'
-	 *       occ ecloud-accounts:create-folders --user_ids='user1,user2,user3'
-	 * @return void
-	 */
-	protected function configure(): void {
-		$this
-			->setName('ecloud-accounts:create-folders')
-			->setDescription('Create Folders for users created after a specific date or for specific user IDs')
-			->addOption(
-				'date',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Date in YYYY-MM-DD HH-MM-SS format (e.g., 2024-12-01 00:00:00)',
-				null
-			)
-			->addOption(
-				'user_ids',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Comma-separated list of user IDs to process (e.g., user1,user2,user3)',
-				null
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$date = $input->getOption('date');
-		$userIdsOption = $input->getOption('user_ids');
-	
-		if (!$date && !$userIdsOption) {
-			$output->writeln('Either the --date or --user_ids option is required.');
-			return Command::INVALID;
-		}
-	
-		try {
-			$batchSize = 500; // Define the batch size
-			$users = [];
-	
-			if ($date) {
-				// Fetch users from LDAP created after the specified date in batches
-				$output->writeln("Fetching users created after $date in batches of $batchSize...");
-				try {
-					$users = $this->ldapService->getUsersCreatedAfter($date);
-					$output->writeln("Total users fetched: " . count($users));
-				} catch (\Exception $e) {
-					$output->writeln('Error fetching users from LDAP: ' . $e->getMessage());
-					return Command::FAILURE;
-				}
-			} elseif ($userIdsOption) {
-				// Process specific user IDs
-				$userIds = array_map('trim', explode(',', $userIdsOption));
-				foreach ($userIds as $userId) {
-					$users[] = ['username' => $userId];
-				}
-				$output->writeln('Processing specified user IDs: ' . implode(', ', $userIds));
-			}
-	
-			// Process users in chunks
-			$output->writeln('Setup started for all eligible users.');
-			foreach ($users as $user) {
-				if (!$user['username']) {
-					continue;
-				}
-	
-				$username = $user['username'];
-				$output->writeln("Processing user $username.");
-	
-				$output->writeln("Checking $username is in group.");
-				$isUserInGroup = $this->fsService->checkFilesGroupAccess($username);
-				if (!$isUserInGroup) {
-					$result = $this->fsService->addUserInFilesEnabledGroup($username);
-					$output->writeln($result ? "$username added to group successfully." : "$username failed to add to group.");
-					if($result) {
-						$output->writeln("Setup FS for user $username ");
-						$isSetupCompleted = $this->fsService->callSetupFS($username);
-						$output->writeln($isSetupCompleted ? "$username User setup successfully." : "$username setup is failed!");
-					}
-				} else {
-					$output->writeln("$username is already in group.");
-				}
-			}
-	
-			$output->writeln('Setup completed for all eligible users.');
-			return Command::SUCCESS;
-	
-		} catch (\Throwable $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return Command::FAILURE;
-		}
-	}
-}
diff --git a/lib/Filesystem/CacheWrapper.php b/lib/Filesystem/CacheWrapper.php
deleted file mode 100644
index da6e3253..00000000
--- a/lib/Filesystem/CacheWrapper.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Filesystem;
-
-use OC\Files\Cache\Wrapper\CacheWrapper as Wrapper;
-use OCP\Constants;
-use OCP\Files\Cache\ICache;
-use OCP\Files\Cache\ICacheEntry;
-use OCP\Files\ForbiddenException;
-use OCP\Files\Search\ISearchQuery;
-
-class CacheWrapper extends Wrapper {
-
-	public function __construct(
-		ICache $cache
-	) {
-		parent::__construct($cache);
-		$this->mask = Constants::PERMISSION_ALL
-			& ~Constants::PERMISSION_READ
-			& ~Constants::PERMISSION_CREATE
-			& ~Constants::PERMISSION_UPDATE
-			& ~Constants::PERMISSION_DELETE;
-	}
-
-	protected function formatCacheEntry($entry) {
-		if (isset($entry['path']) && isset($entry['permissions'])) {
-			try {
-				throw new ForbiddenException('Access denied', false);
-			} catch (ForbiddenException) {
-				$entry['permissions'] &= $this->mask;
-			}
-		}
-		return $entry;
-	}
-
-	public function insert($file, $data) {
-		throw new \Exception('User data cache insert is disabled.');
-	}
-
-	public function update($id, $data) {
-		throw new \Exception('User data cache update is disabled.');
-	}
-
-	public function remove($fileId) {
-		throw new \Exception('User data cache removal is disabled.');
-	}
-
-	public function searchQuery(ISearchQuery $searchQuery) {
-		return [];
-	}
-
-	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
-		return null;
-	}
-}
diff --git a/lib/Filesystem/StorageWrapper.php b/lib/Filesystem/StorageWrapper.php
deleted file mode 100644
index f35a5510..00000000
--- a/lib/Filesystem/StorageWrapper.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Filesystem;
-
-use OC\Files\Cache\Cache;
-use OC\Files\Storage\Storage;
-use OC\Files\Storage\Wrapper\Wrapper;
-use OCP\Files\ForbiddenException;
-use OCP\Files\Storage\IStorage;
-use OCP\Files\Storage\IWriteStreamStorage;
-
-class StorageWrapper extends Wrapper implements IWriteStreamStorage {
-	/**
-	 * @param array $parameters
-	 */
-	public function __construct($parameters) {
-		parent::__construct($parameters);
-	}
-
-	/**
-	 * @throws ForbiddenException
-	 */
-	protected function checkFileAccess(string $path, bool $isDir = false): void {
-		throw new ForbiddenException('Access denied', false);
-	}
-
-	/*
-	 * Storage wrapper methods
-	 */
-
-	/**
-	 * see http://php.net/manual/en/function.mkdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function mkdir($path) {
-		$this->checkFileAccess($path, true);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rmdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function rmdir($path) {
-		$this->checkFileAccess($path, true);
-	}
-
-	/**
-	 * check if a file can be created in $path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isCreatable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if a file can be read
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isReadable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if a file can be written to
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isUpdatable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if a file can be deleted
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isDeletable($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function getPermissions($path) {
-		try {
-			$this->checkFileAccess($path);
-		} catch (ForbiddenException $e) {
-			return $this->mask;
-		}
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_get_contents.php
-	 *
-	 * @param string $path
-	 * @return string
-	 * @throws ForbiddenException
-	 */
-	public function file_get_contents($path) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_put_contents.php
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function file_put_contents($path, $data) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.unlink.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function unlink($path) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rename.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function rename($path1, $path2) {
-		$this->checkFileAccess($path1);
-		$this->checkFileAccess($path2);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.copy.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function copy($path1, $path2) {
-		$this->checkFileAccess($path1);
-		$this->checkFileAccess($path2);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.fopen.php
-	 *
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 * @throws ForbiddenException
-	 */
-	public function fopen($path, $mode) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.touch.php
-	 * If the backend does not support the operation, false should be returned
-	 *
-	 * @param string $path
-	 * @param int $mtime
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function touch($path, $mtime = null) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param Storage (optional) the storage to pass to the cache
-	 * @return Cache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		$cache = $this->storage->getCache($path, $storage);
-		return new CacheWrapper($cache, $storage);
-	}
-
-	/**
-	 * A custom storage implementation can return an url for direct download of a give file.
-	 *
-	 * For now the returned array can hold the parameter url - in future more attributes might follow.
-	 *
-	 * @param string $path
-	 * @return array
-	 * @throws ForbiddenException
-	 */
-	public function getDirectDownload($path) {
-		$this->checkFileAccess($path);
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->checkFileAccess($targetInternalPath);
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 * @throws ForbiddenException
-	 */
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->checkFileAccess($targetInternalPath);
-	}
-
-	/**
-	 * @throws ForbiddenException
-	 */
-	public function writeStream(string $path, $stream, ?int $size = null): int {
-		$this->checkFileAccess($path);
-	}
-}
diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index 4ca74874..46d6a542 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -4,9 +4,6 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\Service;
 
-use OC\User\Manager;
-use OC_Util;
-use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\ILogger;
@@ -21,31 +18,11 @@ class FilesystemService {
 	private $logger;
 	/** @var IGroupManager */
 	private $groupManager;
-	/** @var Manager */
-	private $manager;
-	public function __construct(IUserManager $userManager, IConfig $config, ILogger $logger, Manager $manager, IGroupManager $groupManager) {
+	public function __construct(IUserManager $userManager, IConfig $config, ILogger $logger, IGroupManager $groupManager) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->groupManager = $groupManager;
-		$this->manager = $manager;
-	}
-
-
-	public function callSetupFS(string $user): bool {
-
-		OC_Util::setupFS($user);
-		//trigger creation of user home and /files folder
-		$userFolder = \OC::$server->getUserFolder($user);
-
-		try {
-			// copy skeleton
-			OC_Util::copySkeleton($user, $userFolder);
-			return true;
-		} catch (NotPermittedException $ex) {
-			// read only uses
-			return false;
-		}
 	}
 	public function addUserInFilesEnabledGroup($username): bool {
 		$user = $this->userManager->get($username);
diff --git a/lib/Service/LDAPConnectionService.php b/lib/Service/LDAPConnectionService.php
index 423aa57f..f7609941 100644
--- a/lib/Service/LDAPConnectionService.php
+++ b/lib/Service/LDAPConnectionService.php
@@ -122,64 +122,4 @@ class LDAPConnectionService {
 
 		$this->closeLDAPConnection($conn);
 	}
-	
-	public function getUsersCreatedAfter(string $date, int $batchSize = 500): array {
-		if (!$this->isLDAPEnabled()) {
-			throw new Exception('LDAP backend is not enabled');
-		}
-	
-		// Convert the provided date to LDAP Generalized Time format: YYYYMMDDHHMMSSZ
-		$formattedDate = (new \DateTime($date))->format('YmdHis') . 'Z';
-	
-		$conn = $this->getLDAPConnection();
-		$baseDn = implode(',', $this->getLDAPBaseUsers());
-		$filter = sprintf('(createTimestamp>=%s)', $formattedDate);
-		$attributes = ['username'];
-
-		$users = [];
-		$cookie = '';
-	
-		do {
-			// Set pagination control
-			ldap_set_option($conn, LDAP_OPT_SERVER_CONTROLS, [
-				[
-					'oid' => LDAP_CONTROL_PAGEDRESULTS,
-					'value' => ['size' => $batchSize, 'cookie' => $cookie]
-				]
-			]);
-	
-			// Perform search
-			$searchResult = ldap_search($conn, $baseDn, $filter, $attributes);
-			if (!$searchResult) {
-				throw new Exception('LDAP search failed: ' . ldap_error($conn));
-			}
-	
-			// Iterate entries one by one
-			$entry = ldap_first_entry($conn, $searchResult);
-			while ($entry) {
-				$username = ldap_get_values($conn, $entry, 'username')[0] ?? null;
-	
-				if ($username) {
-					$users[] = [
-						'username' => $username
-					];
-				}
-	
-				// Move to next entry
-				$entry = ldap_next_entry($conn, $entry);
-			}
-	
-			// Retrieve updated pagination cookie
-			$matchedDn = $errorMessage = $referrals = null;
-			$controls = [];
-	
-			ldap_parse_result($conn, $searchResult, $errcode, $matchedDn, $errorMessage, $referrals, $controls);
-			$cookie = $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '';
-	
-		} while (!empty($cookie));
-	
-		return $users;
-	}
-	
-
 }
-- 
GitLab


From 8739d409dbf1ac6bb7a1802541c483693d3d52bf Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 30 Jan 2025 18:43:52 +0530
Subject: [PATCH 181/185] temp change

---
 lib/AppInfo/Application.php         |  4 +++-
 lib/Listeners/TempEventListener.php | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 lib/Listeners/TempEventListener.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 24c5f795..0995e03f 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
+use OCA\EcloudAccounts\Listener\TempEventListener;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
@@ -43,6 +44,7 @@ use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
+use OCP\User\Events\UserLoggedInEvent;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
@@ -57,7 +59,7 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
 		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
-	
+		$context->registerEventListener(UserLoggedInEvent::class, TempEventListener::class);
 		$context->registerMiddleware(AccountMiddleware::class);
 	}
 
diff --git a/lib/Listeners/TempEventListener.php b/lib/Listeners/TempEventListener.php
new file mode 100644
index 00000000..7b344f3f
--- /dev/null
+++ b/lib/Listeners/TempEventListener.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\EcloudAccounts\Listeners;
+
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\ILogger;
+
+class TempEventListener implements IEventListener {
+
+	private $logger;
+
+	public function __construct(ILogger $logger) {
+		$this->logger = $logger;
+	}
+
+	public function handle(Event $event): void {
+		$this->logger->error("YES WE CAN DO THIS...");
+	}
+}
-- 
GitLab


From 157362c0a4dcd897006f6a54b2cc8b08caecea5e Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 30 Jan 2025 18:44:41 +0530
Subject: [PATCH 182/185] temp change

---
 lib/AppInfo/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 0995e03f..6204a5fe 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,7 +26,7 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
-use OCA\EcloudAccounts\Listener\TempEventListener;
+use OCA\EcloudAccounts\Listeners\TempEventListener;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
-- 
GitLab


From e80ed703b55ab2c07416919ef4e46cee68252363 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 30 Jan 2025 18:54:12 +0530
Subject: [PATCH 183/185] temp change

---
 lib/AppInfo/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 6204a5fe..e856389e 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -26,10 +26,10 @@ declare(strict_types=1);
 
 namespace OCA\EcloudAccounts\AppInfo;
 
-use OCA\EcloudAccounts\Listeners\TempEventListener;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
+use OCA\EcloudAccounts\Listeners\TempEventListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCA\EcloudAccounts\Middleware\AccountMiddleware;
-- 
GitLab


From ca1180071fa51b766122ce76eb76592d9ef7fd47 Mon Sep 17 00:00:00 2001
From: theronakpatel <eronax59@gmail.com>
Date: Thu, 30 Jan 2025 19:36:48 +0530
Subject: [PATCH 184/185] reverted temp listener

---
 lib/AppInfo/Application.php         |  4 +---
 lib/Listeners/TempEventListener.php | 22 ----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 lib/Listeners/TempEventListener.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index e856389e..24c5f795 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -29,7 +29,6 @@ namespace OCA\EcloudAccounts\AppInfo;
 use OCA\EcloudAccounts\Listeners\BeforeTemplateRenderedListener;
 use OCA\EcloudAccounts\Listeners\BeforeUserDeletedListener;
 use OCA\EcloudAccounts\Listeners\PasswordUpdatedListener;
-use OCA\EcloudAccounts\Listeners\TempEventListener;
 use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCA\EcloudAccounts\Middleware\AccountMiddleware;
@@ -44,7 +43,6 @@ use OCP\IUserManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
-use OCP\User\Events\UserLoggedInEvent;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'ecloud-accounts';
@@ -59,7 +57,7 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(UserChangedEvent::class, UserChangedListener::class);
 		$context->registerEventListener(StateChanged::class, TwoFactorStateChangedListener::class);
 		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
-		$context->registerEventListener(UserLoggedInEvent::class, TempEventListener::class);
+	
 		$context->registerMiddleware(AccountMiddleware::class);
 	}
 
diff --git a/lib/Listeners/TempEventListener.php b/lib/Listeners/TempEventListener.php
deleted file mode 100644
index 7b344f3f..00000000
--- a/lib/Listeners/TempEventListener.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OCA\EcloudAccounts\Listeners;
-
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\ILogger;
-
-class TempEventListener implements IEventListener {
-
-	private $logger;
-
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		$this->logger->error("YES WE CAN DO THIS...");
-	}
-}
-- 
GitLab


From 4f39e1d0efccbb6bc34798169f8139995676acbd Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak.patel@e.email>
Date: Mon, 3 Feb 2025 05:21:07 +0000
Subject: [PATCH 185/185] Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: Fahim Salam Chowdhury <fahim@e.email>
---
 lib/Service/FilesystemService.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/Service/FilesystemService.php b/lib/Service/FilesystemService.php
index 46d6a542..3ac7f25b 100644
--- a/lib/Service/FilesystemService.php
+++ b/lib/Service/FilesystemService.php
@@ -18,26 +18,31 @@ class FilesystemService {
 	private $logger;
 	/** @var IGroupManager */
 	private $groupManager;
+
 	public function __construct(IUserManager $userManager, IConfig $config, ILogger $logger, IGroupManager $groupManager) {
 		$this->userManager = $userManager;
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->groupManager = $groupManager;
 	}
+
 	public function addUserInFilesEnabledGroup($username): bool {
 		$user = $this->userManager->get($username);
 		if (!$user) {
 			return false;
 		}
+
 		$groupName = $this->config->getSystemValue('files_access_group_name', '');
 		if (!$this->groupManager->groupExists($groupName)) {
 			$this->logger->error("$groupName group not exist.");
 			return false;
 		}
+
 		$group = $this->groupManager->get($groupName);
 		$group->addUser($user);
 		return true;
 	}
+
 	public function checkFilesGroupAccess($username): bool {
 		$groupName = $this->config->getSystemValue('files_access_group_name', '');
 		
@@ -45,9 +50,11 @@ class FilesystemService {
 			$this->logger->error("$groupName group not exist.");
 			return false;
 		}
+
 		if ($this->groupManager->isInGroup($username, $groupName)) {
 			return true;
 		}
+
 		return false;
 	}
 
-- 
GitLab