Merge pull request #54 from LibreCodeCoop/feature/add-user-to-group-o…

…f-company-after-cretated

add user to group of company after cretated

README.md

@@ -57,6 +57,7 @@ occ config:system:set auth.bruteforce.protection.enabled --value false --type bo
 occ config:app:set password_policy minLength --value 8
 occ config:system:set force_language --value en
 occ config:system:set knowledgebaseenabled --value false --type boolean
+occ config:system:set overwrite.cli.url --value "https://mycompany.coop"
 
 # Skeleton directory
 # First, go to root folder of Nextcloud

lib/AppInfo/Application.php

@@ -28,12 +28,14 @@
 
 use OCA\Analytics\Datasource\DatasourceEvent;
 use OCA\MyCompany\Listener\AnalyticsDatasourceListener;
+use OCA\MyCompany\Listener\UserCreatedEventListener;
 use OCA\MyCompany\Middleware\InjectionMiddleware;
 use OCA\MyCompany\Provider\PublicShareTemplateProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\User\Events\UserCreatedEvent;
 
 /**
  * @codeCoverageIgnore
@@ -52,5 +54,6 @@ public function register(IRegistrationContext $context): void {
 		$context->registerMiddleWare(InjectionMiddleware::class, true);
 		$context->registerPublicShareTemplateProvider(PublicShareTemplateProvider::class);
 		$context->registerEventListener(DatasourceEvent::class, AnalyticsDatasourceListener::class);
+		$context->registerEventListener(UserCreatedEvent::class, UserCreatedEventListener::class);
 	}
 }

lib/Datasource/AdminAudit.php

@@ -72,14 +72,17 @@ public function readData($option): array {
 		$i = 1;
 		while (($buffer = fgets($fp, 4096)) !== false) {
 			$json = json_decode($buffer, true);
+			if (str_contains($json['message'], '.directory')) {
+				continue;
+			}
 			if (!str_contains($json['message'], 'File accessed')) {
 				continue;
 			}
 			preg_match('/File accessed: "(?<file>.*)"/', $json['message'], $matches);
 			$data[] = [
+				$json['user'],
 				$json['time'],
 				$matches['file'],
-				$json['user'],
 				$json['remoteAddr'],
 				$json['userAgent'],
 				$i,
@@ -89,12 +92,12 @@ public function readData($option): array {
 		fclose($fp);
 
 		$header = [
+			// TRANSLATORS Column name of report that list log entries of app Audit Report. This column will display the user that trigged the log.
+			$this->l10n->t('User'),
 			// TRANSLATORS Column name of report that list log entries of app Audit Report. This column will display the date of log.
 			$this->l10n->t('Date'),
 			// TRANSLATORS Column name of report that list log entries of app Audit Report. This column will display the acessed file.
 			$this->l10n->t('File'),
-			// TRANSLATORS Column name of report that list log entries of app Audit Report. This column will display the user that trigged the log.
-			$this->l10n->t('User'),
 			// TRANSLATORS Column name of report that list log entries of app Audit Report. This column will display the IP of user that trigged the log.
 			$this->l10n->t('IP'),
 			// TRANSLATORS Column name of report that list log entries of app Audit Report. This column will display the user agent of user that trigged the log.

lib/Listener/AnalyticsDatasourceListener.php

@@ -31,6 +31,9 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/**
+ * @template-implements IEventListener<Event|DatasourceEvent>
+ */
 class AnalyticsDatasourceListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof DatasourceEvent)) {

lib/Listener/UserCreatedEventListener.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2023, Vitor Mattos <[email protected]>
+ *
+ * @author Vitor Mattos <[email protected]>
+ *
+ * @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\MyCompany\Listener;
+
+use OCA\MyCompany\Service\CompanyService;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IGroupManager;
+use OCP\User\Events\UserCreatedEvent;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @template-implements IEventListener<Event|UserCreatedEvent>
+ */
+class UserCreatedEventListener implements IEventListener {
+	public function __construct(
+		private IGroupManager $groupManager,
+		private CompanyService $companyService,
+		private LoggerInterface $logger,
+	) {
+	}
+
+	public function handle(Event $event): void {
+		if (!($event instanceof UserCreatedEvent)) {
+			// Unrelated
+			return;
+		}
+		$user = $event->getUser();
+		$group = $this->groupManager->get($this->companyService->getCompanyCode());
+		if ($group === null) {
+			return;
+		}
+		$group->addUser($user);
+	}
+}

tests/psalm-baseline.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="lib/AppInfo/Application.php">
+    <InvalidArgument>
+      <code>AnalyticsDatasourceListener::class</code>
+    </InvalidArgument>
     <UndefinedClass>
       <code>DatasourceEvent</code>
       <code>PublicShareTemplateProvider</code>
@@ -71,12 +74,18 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Listener/AnalyticsDatasourceListener.php">
-    <MissingTemplateParam>
+    <InvalidTemplateParam>
       <code>IEventListener</code>
-    </MissingTemplateParam>
+    </InvalidTemplateParam>
+    <MoreSpecificImplementedParamType>
+      <code>$event</code>
+    </MoreSpecificImplementedParamType>
     <UndefinedClass>
       <code>DatasourceEvent</code>
     </UndefinedClass>
+    <UndefinedDocblockClass>
+      <code>AnalyticsDatasourceListener</code>
+    </UndefinedDocblockClass>
   </file>
   <file src="lib/Middleware/InjectionMiddleware.php">
     <UndefinedClass>