Merge pull request #116 from ConductionNL/development

Dev to main synchronization fix
ConductionNL · Dec 4, 2024 · c5f05ef · c5f05ef
2 parents ec6f653 + a7d9268
commit c5f05ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/lib/Cron/ActionTask.php b/lib/Cron/ActionTask.php
@@ -8,6 +8,8 @@
 use OCP\BackgroundJob\TimedJob;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
+use OCP\IUserManager;
+use OCP\IUserSession;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Uid\Uuid;
 use DateInterval;
@@ -30,7 +32,9 @@ public function __construct(
         JobMapper $jobMapper,
         JobLogMapper $jobLogMapper,
         IJobList $jobList,
-        ContainerInterface $containerInterface
+        ContainerInterface $containerInterface,
+		private IUserSession $userSession,
+		private IUserManager $userManager,
     ) {
         parent::__construct($time);
         $this->jobMapper = $jobMapper;
@@ -80,6 +84,11 @@ public function run($argument)
             return;
         }
 
+		if(empty($job->getUserId()) === false && $this->userSession->getUser() === null) {
+			$user = $this->userManager->get($job->getUserId());
+			$this->userSession->setUser($user);
+		}
+
 		$time_start = microtime(true);
 
         $action =  $this->containerInterface->get($job->getJobClass());

diff --git a/lib/Service/AuthenticationService.php b/lib/Service/AuthenticationService.php
@@ -230,7 +230,7 @@ public function fetchDecosToken(array $configuration): string
 	private function getRSJWK(array $configuration): ?JWK
 	{
 		$stamp = microtime().getmypid();
-		$filename = "privatekey-$stamp";
+		$filename = "/var/tmp/privatekey-$stamp";
 		file_put_contents($filename, base64_decode($configuration['secret']));
 		$jwk = null;
 		try {

diff --git a/lib/Service/SynchronizationService.php b/lib/Service/SynchronizationService.php
@@ -320,6 +320,11 @@ public function synchronizeContract(SynchronizationContract $synchronizationCont
             }
         }
 
+		// @TODO: This should be unset through pre-mapping
+		if(isset($object['d']['vti_x005f_dirlateststamp']) === true) {
+			unset($object['d']['vti_x005f_dirlateststamp']);
+		}
+
 
         // Let create a source hash for the object
         $originHash = md5(serialize($object));
@@ -329,7 +334,7 @@ public function synchronizeContract(SynchronizationContract $synchronizationCont
             // The object has not changed and the config has not been updated since last check
 			return $synchronizationContract;
         }
-
+		
         // The object has changed, oke let do mappig and bla die bla
         $synchronizationContract->setOriginHash($originHash);
         $synchronizationContract->setSourceLastChanged(new DateTime());