From 0be4d7b2bd1c1761ae56ae12bbe1f6db95bf635e Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 30 Nov 2023 17:20:08 +0100
Subject: [PATCH] MDL-78088 tool_dataprivacy: Enable and return additional info

---
 admin/tool/dataprivacy/db/services.php       | 2 ++
 admin/tool/dataprivacy/version.php           | 2 +-
 admin/tool/mobile/classes/api.php            | 5 +++++
 admin/tool/mobile/tests/externallib_test.php | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/admin/tool/dataprivacy/db/services.php b/admin/tool/dataprivacy/db/services.php
index d683eafeb51..a8b42771735 100644
--- a/admin/tool/dataprivacy/db/services.php
+++ b/admin/tool/dataprivacy/db/services.php
@@ -32,6 +32,7 @@ $functions = [
         'capabilities'  => '',
         'ajax'          => true,
         'loginrequired' => true,
+        'services'      => [MOODLE_OFFICIAL_MOBILE_SERVICE],
     ],
     'tool_dataprivacy_contact_dpo' => [
         'classname'     => 'tool_dataprivacy\external',
@@ -42,6 +43,7 @@ $functions = [
         'capabilities'  => '',
         'ajax'          => true,
         'loginrequired' => true,
+        'services'      => [MOODLE_OFFICIAL_MOBILE_SERVICE],
     ],
     'tool_dataprivacy_mark_complete' => [
         'classname'     => 'tool_dataprivacy\external',
diff --git a/admin/tool/dataprivacy/version.php b/admin/tool/dataprivacy/version.php
index e3fea8caf3d..8257a3eef66 100644
--- a/admin/tool/dataprivacy/version.php
+++ b/admin/tool/dataprivacy/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2023100900;
+$plugin->version   = 2023100901;
 $plugin->requires  = 2023100400;
 $plugin->component = 'tool_dataprivacy';
diff --git a/admin/tool/mobile/classes/api.php b/admin/tool/mobile/classes/api.php
index ea78f4f802c..6af51f5809d 100644
--- a/admin/tool/mobile/classes/api.php
+++ b/admin/tool/mobile/classes/api.php
@@ -388,6 +388,11 @@ class api {
                 $CFG->searchbanner, FORMAT_HTML, $context)[0];
         }
 
+        if (empty($section) || $section === 'privacysettings') {
+            $settings->tool_dataprivacy_contactdataprotectionofficer = get_config('tool_dataprivacy', 'contactdataprotectionofficer');
+            $settings->tool_dataprivacy_showdataretentionsummary = get_config('tool_dataprivacy', 'showdataretentionsummary');
+        }
+
         return $settings;
     }
 
diff --git a/admin/tool/mobile/tests/externallib_test.php b/admin/tool/mobile/tests/externallib_test.php
index 6351a7819bd..27123d4e1fc 100644
--- a/admin/tool/mobile/tests/externallib_test.php
+++ b/admin/tool/mobile/tests/externallib_test.php
@@ -267,6 +267,9 @@ class externallib_test extends externallib_advanced_testcase {
         $expected[] = ['name' => 'searchbannerenable', 'value' => $CFG->searchbannerenable];
         $expected[] = ['name' => 'searchbanner', 'value' => $CFG->searchbanner];
 
+        $expected[] = ['name' => 'tool_dataprivacy_contactdataprotectionofficer', 'value' => get_config('tool_dataprivacy', 'contactdataprotectionofficer')];
+        $expected[] = ['name' => 'tool_dataprivacy_showdataretentionsummary', 'value' => get_config('tool_dataprivacy', 'showdataretentionsummary')];
+
         $this->assertCount(0, $result['warnings']);
         $this->assertEquals($expected, $result['settings']);