consumer pages

composer.json

@@ -35,6 +35,7 @@
 		"elasticsearch/elasticsearch": "^v8.14.0",
 		"guzzlehttp/guzzle": "^7.0",
 		"symfony/uid": "^6.4",
+		"symfony/yaml": "^6.4",
 		"twig/twig": "^3.14"
 	},
 	"require-dev": {

lib/Controller/SourcesController.php

@@ -180,8 +180,7 @@ public function destroy(int $id): JSONResponse
     public function logs(int $id): JSONResponse
     {
         try {
-            $source = $this->sourceMapper->find($id);
-            $callLogs = $this->callLogMapper->findAll(null, null, ['source_id' => $source->getId()]);
+            $callLogs = $this->callLogMapper->findAll(null, null, ['source_id' =>  $id]);
             return new JSONResponse($callLogs);
         } catch (DoesNotExistException $e) {
             return new JSONResponse(['error' => 'Source not found'], 404);

lib/Cron/ActionTask.php

@@ -76,7 +76,7 @@ public function run($argument)
         }
 
         // if the next run is in the the future, we don't need to do anything
-        if ($job->getNextRun() && $job->getNextRun() > $this->time->getTime()) {
+        if ($job->getNextRun() && $job->getNextRun() > new DateTime()) {
             return;
         }
 

lib/Db/CallLog.php

@@ -16,6 +16,8 @@ class CallLog extends Entity implements JsonSerializable
     protected ?int $sourceId = null;
     protected ?int $actionId = null;
     protected ?int $synchronizationId = null;
+    protected ?string $userId = null;
+    protected ?string $sessionId = null;
     protected ?DateTime $expires = null;
     protected ?DateTime $created = null;
 
@@ -28,6 +30,8 @@ public function __construct() {
         $this->addType('sourceId', 'integer');
         $this->addType('actionId', 'integer');
         $this->addType('synchronizationId', 'integer');
+        $this->addType('userId', 'string');
+        $this->addType('sessionId', 'string');
         $this->addType('expires', 'datetime');
         $this->addType('created', 'datetime');
     }
@@ -73,9 +77,11 @@ public function jsonSerialize(): array
             'response' => $this->response,
             'sourceId' => $this->sourceId,
             'actionId' => $this->actionId,
-            'synchronizationId' => $this->synchronizationId,
-            'expires' => isset($this->expires) ? $this->expires->format('c') : null,
-            'created' => isset($this->created) ? $this->created->format('c') : null,
+            'synchronizationId' => $this->synchronizationId,            
+            'userId' => $this->userId,
+            'sessionId' => $this->sessionId,
+            'expires' => $this->expires,
+            'created' => $this->created,
         ];
     }
 }

lib/Db/Consumer.php

@@ -20,8 +20,6 @@ class Consumer extends Entity implements JsonSerializable
     protected ?string $uuid = null;
 	protected ?string $name = null; // The name of the consumer	
 	protected ?string $description = null; // The description of the consumer
-	protected ?string $reference = null; // The reference of the consumer
-	protected ?string $version = '0.0.0'; // The version of the consumer
     protected ?array $domains = []; // The domains the consumer is allowed to run from
     protected ?array $ips = []; // The ips the consumer is allowed to run from
     protected ?string $authorizationType = null; // The authorization type of the consumer, should be one of the following: 'none', 'basic', 'bearer', 'apiKey', 'oauth2', 'jwt'. Keep in mind that the consumer needs to be able to handle the authorization type.
@@ -37,8 +35,6 @@ public function __construct() {
         $this->addType('uuid', 'string');
 		$this->addType('name', 'string');
 		$this->addType('description', 'string');
-		$this->addType('reference', 'string');
-		$this->addType('version', 'string');
 		$this->addType('domains', 'json');
 		$this->addType('ips', 'json');
 		$this->addType('authorizationType', 'string');
@@ -100,8 +96,6 @@ public function jsonSerialize(): array
             'uuid' => $this->uuid,
 			'name' => $this->name,
 			'description' => $this->description,
-			'reference' => $this->reference,
-			'version' => $this->version,
 			'domains' => $this->domains,
 			'ips' => $this->ips,
 			'authorizationType' => $this->authorizationType,

lib/Db/ConsumerMapper.php

@@ -117,9 +117,9 @@ public function updateFromArray(int $id, array $object): Consumer
 		$obj->hydrate($object);
 
 		// Set or update the version
-		$version = explode('.', $obj->getVersion());
-		$version[2] = (int)$version[2] + 1;
-		$obj->setVersion(implode('.', $version));
+		// $version = explode('.', $obj->getVersion());
+		// $version[2] = (int)$version[2] + 1;
+		// $obj->setVersion(implode('.', $version));
 
 		return $this->update($obj);
 	}

lib/Db/JobLog.php

@@ -9,19 +9,20 @@
 class JobLog extends Entity implements JsonSerializable
 {
     protected ?string $uuid = null;
-	protected string $level = 'INFO'; // log level
-	protected string $message = 'success'; // log message
-	protected ?string $jobId = null; // the id of the job in the job
-	protected ?string $jobListId = null; // the id of the job in the job list
-	protected ?string $jobClass = 'OCA\OpenConnector\Action\PingAction';
-	protected ?array $arguments = null;
-	protected ?int $executionTime = 3600; // the execution time in seconds
-	protected ?string $userId = null; // the user which the job is running for security reasons
-	protected ?array $stackTrace = []; // stack trace
-	protected ?DateTime $expires = null; // when the log will be cleared
-	protected ?DateTime $lastRun = null; // the last time the job was run
-	protected ?DateTime $nextRun = null; // the next time the job will be run
-	protected ?DateTime $created = null; // the date and time the job was created
+    protected string $level = 'INFO';
+    protected string $message = 'success';
+    protected ?string $jobId = null;
+    protected ?string $jobListId = null;
+    protected ?string $jobClass = 'OCA\OpenConnector\Action\PingAction';
+    protected ?array $arguments = null;
+    protected ?int $executionTime = 3600;
+    protected ?string $userId = null;
+    protected ?string $sessionId = null;
+    protected ?array $stackTrace = [];
+    protected ?DateTime $expires = null;
+    protected ?DateTime $lastRun = null;
+    protected ?DateTime $nextRun = null;
+    protected ?DateTime $created = null;
 
     public function __construct() {
         $this->addType('uuid', 'string');
@@ -33,6 +34,7 @@ public function __construct() {
         $this->addType('arguments', 'json');
         $this->addType('executionTime', 'integer');
         $this->addType('userId', 'string');
+        $this->addType('sessionId', 'string');
         $this->addType('stackTrace', 'json');
         $this->addType('expires', 'datetime');
         $this->addType('lastRun', 'datetime');
@@ -83,6 +85,7 @@ public function jsonSerialize(): array
             'arguments' => $this->arguments,
             'executionTime' => $this->executionTime,
             'userId' => $this->userId,
+            'sessionId' => $this->sessionId,
             'stackTrace' => $this->stackTrace,
             'expires' => isset($this->expires) ? $this->expires->format('c') : null,
             'lastRun' => isset($this->lastRun) ? $this->lastRun->format('c') : null,

lib/Db/SynchronizationContractLog.php

@@ -13,6 +13,8 @@ class SynchronizationContractLog extends Entity implements JsonSerializable
     protected ?string $synchronizationContractId = null;
     protected ?array $source = [];
     protected ?array $target = [];
+    protected ?string $userId = null;
+    protected ?string $sessionId = null;
     protected ?DateTime $expires = null;
     protected ?DateTime $created = null;
 
@@ -22,6 +24,8 @@ public function __construct() {
         $this->addType('synchronizationContractId', 'string');
         $this->addType('source', 'json');
         $this->addType('target', 'json');
+        $this->addType('userId', 'string');
+        $this->addType('sessionId', 'string');
         $this->addType('expires', 'datetime');
         $this->addType('created', 'datetime');
     }
@@ -65,6 +69,8 @@ public function jsonSerialize(): array
             'synchronizationContractId' => $this->synchronizationContractId,
             'source' => $this->source,
             'target' => $this->target,
+            'userId' => $this->userId,
+            'sessionId' => $this->sessionId,
             'expires' => $this->expires,
             'created' => $this->created,
         ];