Merge remote-tracking branch 'origin/development' into feature/CONNEC…

…TOR-51/dashboard
ConductionNL · Dec 6, 2024 · 00dbf1c · 00dbf1c
2 parents a5f79b8 + f61236c
commit 00dbf1c
Show file tree

Hide file tree

Showing 16 changed files with 318 additions and 62 deletions.
diff --git a/.github/workflows/pull-request-from-branch-check.yaml b/.github/workflows/pull-request-from-branch-check.yaml
@@ -1,18 +1,18 @@
 name: Main Branch Protection
 
-on:
-  pull_request:
-    branches:
-      - main
+#on:
+#  pull_request:
+#    branches:
+#      - main
 
-jobs:
-  check-branch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check branch
-        run: |
-          if [[ ${GITHUB_HEAD_REF} != development ]] && [[ ${GITHUB_HEAD_REF} != documentation ]] && ! [[ ${GITHUB_HEAD_REF} =~ ^hotfix/ ]]; 
-          then
-            echo "Error: Pull request must come from 'development', 'documentation' or 'hotfix/' branch"
-            exit 1
-          fi
+#jobs:
+#  check-branch:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check branch
+#        run: |
+#          if [[ ${GITHUB_HEAD_REF} != development ]] && [[ ${GITHUB_HEAD_REF} != documentation ]] && ! [[ ${GITHUB_HEAD_REF} =~ ^hotfix/ ]]; 
+#          then
+#            echo "Error: Pull request must come from 'development', 'documentation' or 'hotfix/' branch"
+#            exit 1
+#          fi
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -13,7 +13,7 @@ The OpenConnector Nextcloud app provides a ESB-framework to work together in an
 - 🆓 Map and translate API calls
 
     ]]></description>
-	<version>0.1.16</version>
+	<version>0.1.20</version>
 	<licence>agpl</licence>
 	<category>integration</category>
 	<author mail="[email protected]" homepage="https://www.conduction.nl/">Conduction</author>

diff --git a/configurations/sharepoint-woo/mappings/sharepoint-woo-verzoek-to-publications.json b/configurations/sharepoint-woo/mappings/sharepoint-woo-verzoek-to-publications.json
@@ -3,9 +3,28 @@
 	"description": "",
 	"version": "0.0.1",
 	"mapping": {
-		"title": "Name"
-	},
-	"unset": [],
-	"cast": [],
+        "title": "d.woo_x005f_titel",
+        "description": "d.woo_x005f_beschrijving",
+        "summary": "d.woo_x005f_samenvatting",
+        "category": "d.woo_x005f_categorie",
+        "published": "{% if d['woo_x005f_publicatiedatum']|default %}{{ d['woo_x005f_publicatiedatum']|date('Y-m-d') }}{% endif %}",
+        "modified": "d.vti_x005f_nexttolasttimemodified",
+        "attachments": "[ {% for file in fileUrls %} { {% if file['Name']|default %}\"title\": \"{{ file['Name'] }}\",{% endif %}{% if file['d']['document_x005f_label']|default %}\"labels\": [\"{{ file['d']['document_x005f_label'] }}\"],{% endif %}{% if file['__metadata']['uri']|default %}\"downloadUrl\": {\"accessUrl\": \"{{ file['__metadata']['uri']~'/$value' }}\", \"source\": \"1\"}{% endif %} }{{ loop.last ? '' : ',' }} {% endfor %} ]",
+        "status": "Concept",
+        "catalog": "",
+        "publicationType": ""
+    },
+    "unset": [],
+    "cast": {
+        "title": "unsetIfValue==d.woo_x005f_titel",
+        "description": "unsetIfValue==d.woo_x005f_beschrijving",
+        "summary": "unsetIfValue==d.woo_x005f_samenvatting",
+        "category": "unsetIfValue==d.woo_x005f_categorie",
+        "published": "unsetIfValue==",
+        "modified": "unsetIfValue==d.vti_x005f_nexttolasttimemodified",
+        "attachments": "jsonToArray",
+        "publicationType": "unsetIfValue==",
+        "catalog": "unsetIfValue=="
+    },
 	"passThrough": false
-}
+}
diff --git a/configurations/sharepoint-woo/mappings/xxllnc-suite-to-publications.json b/configurations/sharepoint-woo/mappings/xxllnc-suite-to-publications.json
@@ -1,14 +1,26 @@
 {
 	"name": "Xxllnc suite to Publication",
-	"description": "",
-	"version": "",
-	"reference": "",
+	"version": "0.0.1",
 	"mapping": {
-		"title": "omschrijving",
-		"summary": "statustoelichting",
-		"description": "statusomschrijving"
-	},
-	"unset": [],
-	"cast": [],
+        "title": "omschrijving",
+        "summary": "zaaktypeomschrijving",
+        "description": "zaaktypeomschrijving",
+        "category": "{% if zaaktypecode|default %}{% set wooVerzoekenEnBesluiten = ['LP00000431', 'B1873', 'cherry'] %}{% set klachtoordelen = ['LP00000091', 'LP00001132', 'LP00000121', 'B0757', 'LP00000832', 'LP00001096'] %}{% if zaaktypecode in wooVerzoekenEnBesluiten %}{{ 'Woo-verzoeken en -besluiten' }}{% elseif zaaktypecode in klachtoordelen %}{{ 'Klachtoordelen' }}{% endif %}{% endif %}",
+        "published": "startdatum",
+        "modified": "{{ 'now'|date('H:i:sTm-d-Y') }}",
+        "attachments": "[{% if files|default %}{% for file in files %} { {% if file['titel']|default %}\"title\": \"{{ file['titel'] }}\",{% endif %}\"labels\": [\"{{ 'Informatieverzoek' }}\"],{% if file['formaat']|default %}\"extension\": \"{{ file['formaat']|split('/')|last }}\",\"type\": \"{{ file['formaat'] }}\",{% endif %}{% if file['inhoud']|default and file['formaat']|default %}\"accessUrl\": \"data:{{ file['formaat'] }};base64,{{ file.inhoud }}\"{% endif %} }{{ loop.last ? '' : ',' }} {% endfor %}{% endif %}]",
+        "status": "Concept"
+    },
+    "unset": [
+        ""
+    ],
+    "cast": {
+        "title": "unsetIfValue==omschrijving",
+        "summary": "unsetIfValue==zaaktypeomschrijving",
+        "description": "unsetIfValue==zaaktypeomschrijving",
+        "category": "unsetIfValue==",
+        "published": "unsetIfValue==startdatum",
+        "attachments": "jsonToArray"
+    },
 	"passThrough": false
 }
diff --git a/configurations/sharepoint-woo/synchronizations/sharepoint-convenanten-to-publications.json b/configurations/sharepoint-woo/synchronizations/sharepoint-convenanten-to-publications.json
@@ -7,12 +7,20 @@
 	"sourceHash": "",
 	"sourceTargetMapping": "1",
 	"sourceConfig": {
-		"idPosition": "UniqueId",
-		"resultsPosition": "d.results",
-		"endpoint": "/Web/GetFolderByServerRelativePath(decodedurl='/WOO/Convenanten')/folders",
-		"headers": [],
-		"query": []
-	},
+        "idPosition": "UniqueId",
+        "resultsPosition": "d.results",
+        "endpoint": "\/Web\/GetFolderByServerRelativePath(decodedurl='\/WOO\/Convenanten')\/folders",
+        "extraDataConfigs.0.dynamicEndpointLocation": "Properties.__deferred.uri",
+        "extraDataConfigs.0.mergeExtraData": "true",
+        "extraDataConfigs.1.dynamicEndpointLocation": "Files.__deferred.uri",
+        "extraDataConfigs.1.mergeExtraData": "true",
+        "extraDataConfigs.1.keyToSetExtraData": "fileUrls",
+        "extraDataConfigs.1.resultsLocation": "d.results",
+        "extraDataConfigs.1.extraDataConfigPerResult.dynamicEndpointLocation": "Properties.__deferred.uri",
+        "extraDataConfigs.1.extraDataConfigPerResult.mergeExtraData": "true",
+        "headers": [],
+        "query": []
+    },
 	"targetId": "1/1",
 	"targetType": "register/schema"
 }
diff --git a/configurations/sharepoint-woo/synchronizations/sharepoint-woo-verzoeken-to-publications.json b/configurations/sharepoint-woo/synchronizations/sharepoint-woo-verzoeken-to-publications.json
@@ -7,11 +7,19 @@
 	"sourceHash": "",
 	"sourceTargetMapping": "1",
 	"sourceConfig": {
-		"idPosition": "UniqueId",
+        "idPosition": "UniqueId",
 		"resultsPosition": "d.results",
 		"endpoint": "/Web/GetFolderByServerRelativePath(decodedurl='/WOO/Woo-verzoeken en -besluiten')/folders",
-		"headers": [],
-		"query": []
+        "extraDataConfigs.0.dynamicEndpointLocation": "Properties.__deferred.uri",
+        "extraDataConfigs.0.mergeExtraData": "true",
+        "extraDataConfigs.1.dynamicEndpointLocation": "Files.__deferred.uri",
+        "extraDataConfigs.1.mergeExtraData": "true",
+        "extraDataConfigs.1.keyToSetExtraData": "fileUrls",
+        "extraDataConfigs.1.resultsLocation": "d.results",
+        "extraDataConfigs.1.extraDataConfigPerResult.dynamicEndpointLocation": "Properties.__deferred.uri",
+        "extraDataConfigs.1.extraDataConfigPerResult.mergeExtraData": "true",
+        "headers": [],
+        "query": []
 	},
 	"targetId": "1/1",
 	"targetType": "register/schema"

diff --git a/configurations/sharepoint-woo/synchronizations/xxllnc-suite-to-publications.json b/configurations/sharepoint-woo/synchronizations/xxllnc-suite-to-publications.json
@@ -7,13 +7,19 @@
 	"sourceHash": "",
 	"sourceTargetMapping": "1",
 	"sourceConfig": {
-		"idPosition": "id",
-		"resultsPosition": "results",
-		"endpoint": "/tlb/zaaksysteem/api/v1/zaken",
-		"headers": [],
-		"query.startdatum__gte": "2024-07-06",
-		"query.einddatum__lt": "2024-08-01"
-	},
+        "idPosition": "identificatie",
+        "resultsPosition": "results",
+        "endpoint": "\/tlb\/zaaksysteem\/api\/v1\/zaken",
+        "headers": [],
+        "query.startdatum__gte": "2024-08-01",
+        "query.einddatum__lt": "2025-01-01",
+        "usesPagination": "false",
+        "extraDataConfigs.0.staticEndpoint": "/tlb/zaaksysteem/api/v1/zaken/{{ originId }}/informatieobjecten",
+        "extraDataConfigs.0.mergeExtraData": "true",
+        "extraDataConfigs.0.keyToSetExtraData": "files",
+        "extraDataConfigs.0.resultsLocation": "results",
+        "extraDataConfigs.0.extraDataConfigPerResult.staticEndpoint": "/tlb/zaaksysteem/api/v1/informatieobjecten/{{ originId }}"
+    },
 	"targetId": "1/1",
 	"targetType": "register/schema"
 }
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());
@@ -127,6 +136,8 @@ public function run($argument)
             }
         }
 
+		$this->jobLogMapper->update(entity: $jobLog);
+
         // Let's report back about what we have just done
         return $jobLog;
     }

diff --git a/lib/Db/Synchronization.php b/lib/Db/Synchronization.php
@@ -65,6 +65,21 @@ public function __construct() {
 		$this->addType(fieldName:'followUps', type: 'json');
 	}
 
+    /**
+     * Checks through sourceConfig if the source of this sync uses pagination
+     * 
+     * @return bool true if its uses pagination
+     */
+    public function usesPagination(): bool
+    {
+        if (isset($this->sourceConfig['usesPagination']) === true && ($this->sourceConfig['usesPagination'] === false || $this->sourceConfig['usesPagination'] === 'false')) {
+            return false;
+        }
+
+        // By default sources use basic pagination.
+        return true;
+    }
+
 	public function getJsonFields(): array
 	{
 		return array_keys(

diff --git a/lib/Migration/Version1Date20241111144800.php b/lib/Migration/Version1Date20241111144800.php
@@ -101,7 +101,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 			&& $table->hasColumn('source_id') === true && $table->hasColumn('source_hash') === true
 		) {
 			$this->connection->executeQuery("
-				UPDATE openconnector_synchronization_contracts
+				UPDATE oc_openconnector_synchronization_contracts
 				SET origin_id = source_id, origin_hash = source_hash
 				WHERE source_id IS NOT NULL
 			");

diff --git a/lib/Service/AuthenticationService.php b/lib/Service/AuthenticationService.php
@@ -192,6 +192,35 @@ public function fetchOAuthTokens (array $configuration): string
 		return $result['access_token'];
 	}
 
+	/**
+	 * Fetch an access token from the DeCOS non-implementation of OAuth 2.0
+	 *
+	 * @param array $configuration The configuration of the source.
+	 *
+	 * @return string The access token
+	 *
+	 * @throws \GuzzleHttp\Exception\GuzzleException
+	 */
+	public function fetchDecosToken(array $configuration): string
+	{
+		$url = $configuration['tokenUrl'];
+		$tokenLocation = $configuration['tokenLocation'];
+		unset($configuration['tokenUrl']);
+
+		$callConfig['json'] = $configuration;
+
+		$client = new Client();
+		$response = $client->post(uri: $url, options: $callConfig);
+
+		$result = json_decode(json: $response->getBody()->getContents(), associative: true);
+
+		if (isset($tokenLocation) === true) {
+			return $result[$tokenLocation];
+		}
+
+		return $result['token'];
+	}
+
 	/**
 	 * Get RSA key for RS and PS (asymmetrical) encryption.
 	 *
@@ -201,7 +230,7 @@ public function fetchOAuthTokens (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/CallService.php b/lib/Service/CallService.php
@@ -249,6 +249,8 @@ public function call(
 
 		$time_end = microtime(true);
 
+		$body = $response->getBody()->getContents();
+
 		// Let create the data array
 		$data = [
 			'request' => [
@@ -263,7 +265,8 @@ public function call(
 				'size' => $response->getBody()->getSize(),
 				'remoteIp' => $response->getHeaderLine('X-Real-IP') ?: $response->getHeaderLine('X-Forwarded-For') ?: null,
 				'headers' => $response->getHeaders(),
-				'body' => $response->getBody()->getContents(),
+				'body' => mb_check_encoding(value: $body, encoding: 'UTF-8') !== false ? $body : base64_encode($body),
+				'encoding' => mb_check_encoding(value: $body, encoding: 'UTF-8') !== false ? 'UTF-8' : 'base64',
 			]
 		];