From ecbee00f57d1f26121af4c43dfe0e580f28bb5d8 Mon Sep 17 00:00:00 2001
From: Artem Shelkovnikov <artem.shelkovnikov@elastic.co>
Date: Tue, 31 Dec 2024 17:45:43 +0100
Subject: [PATCH 1/2] Add new native fields for SPO connector - certificate
 authenticate

---
 .../types/native_connectors.ts                | 109 ++++++++++++++++--
 1 file changed, 99 insertions(+), 10 deletions(-)

diff --git a/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts b/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts
index 96af7ea581e6c..7617a1e8c9866 100644
--- a/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts
+++ b/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts
@@ -4242,6 +4242,45 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '',
       },
+      auth_method: {
+        default_value: null,
+        depends_on: [],
+        display: DROPDOWN,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethodLabel',
+          {
+            defaultMessage: 'Authentication Method',
+          }
+        ),
+        options: [
+          {
+            label: translate(
+              'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethod.clientSecretLabel',
+              {
+                defaultMessage: 'Client Secret',
+              }
+            ),
+            value: 'secret',
+          },
+          {
+            label: translate(
+              'searchConnectors.nativeConnectors.sharepoint_online.configuration.authMethod.certificateLabel',
+              {
+                defaultMessage: 'Certificate',
+              }
+            ),
+            value: 'certificate',
+          },
+        ],
+        order: 4,
+        required: true,
+        sensitive: false,
+        tooltip: null,
+        type: STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: 'certificate',
+      },
       secret_value: {
         default_value: null,
         depends_on: [],
@@ -4253,7 +4292,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 4,
+        order: 5,
         required: true,
         sensitive: true,
         tooltip: '',
@@ -4262,6 +4301,56 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '',
       },
+      certificate: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: 'certificate',
+          },
+        ],
+        display: TEXTAREA,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.certificateLabel',
+          {
+            defaultMessage: 'Content of certificate file',
+          }
+        ),
+        options: [],
+        order: 5,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      private_key: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: 'certificate',
+          },
+        ],
+        display: TEXTAREA,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.privateKeyLabel',
+          {
+            defaultMessage: 'Content of private key file',
+          }
+        ),
+        options: [],
+        order: 6,
+        required: true,
+        sensitive: true,
+        tooltip: null,
+        type: STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
       site_collections: {
         default_value: null,
         depends_on: [],
@@ -4273,7 +4362,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 5,
+        order: 7,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4295,7 +4384,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
-        order: 6,
+        order: 8,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
@@ -4315,7 +4404,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 7,
+        order: 9,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4346,7 +4435,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 8,
+        order: 10,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4377,7 +4466,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 9,
+        order: 11,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4408,7 +4497,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 10,
+        order: 12,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4439,7 +4528,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 11,
+        order: 13,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4463,7 +4552,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           { defaultMessage: 'Enumerate all sites?' }
         ),
         options: [],
-        order: 6,
+        order: 8,
         required: false,
         sensitive: false,
         tooltip: translate(
@@ -4489,7 +4578,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 7,
+        order: 9,
         required: false,
         sensitive: false,
         tooltip: translate(

From 3487a3bdc33773ec71515a5d2d6f7b8756a466ee Mon Sep 17 00:00:00 2001
From: Artem Shelkovnikov <artem.shelkovnikov@elastic.co>
Date: Fri, 3 Jan 2025 12:42:30 +0100
Subject: [PATCH 2/2] Update native_connectors.ts

---
 .../types/native_connectors.ts                | 118 +++++++++---------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts b/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts
index 7617a1e8c9866..ba8aff69693d8 100644
--- a/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts
+++ b/src/platform/packages/shared/kbn-search-connectors/types/native_connectors.ts
@@ -4317,7 +4317,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 5,
+        order: 6,
         required: true,
         sensitive: true,
         tooltip: null,
@@ -4342,7 +4342,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 6,
+        order: 7,
         required: true,
         sensitive: true,
         tooltip: null,
@@ -4362,7 +4362,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 7,
+        order: 8,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4378,13 +4378,63 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '*',
       },
+      enumerate_all_sites: {
+        default_value: true,
+        depends_on: [],
+        display: TOGGLE,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
+          { defaultMessage: 'Enumerate all sites?' }
+        ),
+        options: [],
+        order: 9,
+        required: false,
+        sensitive: false,
+        tooltip: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesTooltip',
+          {
+            defaultMessage:
+              'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
+          }
+        ),
+        type: BOOLEAN,
+        ui_restrictions: [],
+        validations: [],
+        value: true,
+      },
+      fetch_subsites: {
+        default_value: false,
+        depends_on: [{ field: 'enumerate_all_sites', value: false }],
+        display: TOGGLE,
+        label: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
+          {
+            defaultMessage: 'Fetch sub-sites of configured sites?',
+          }
+        ),
+        options: [],
+        order: 10,
+        required: false,
+        sensitive: false,
+        tooltip: translate(
+          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesTooltip',
+          {
+            defaultMessage:
+              'Whether subsites of the configured site(s) should be automatically fetched.',
+          }
+        ),
+        type: BOOLEAN,
+        ui_restrictions: [],
+        validations: [],
+        value: true,
+      },
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
         display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
-        order: 8,
+        order: 11,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
@@ -4404,7 +4454,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 9,
+        order: 12,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4435,7 +4485,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 10,
+        order: 13,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4466,7 +4516,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 11,
+        order: 14,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4497,7 +4547,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 12,
+        order: 15,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4528,7 +4578,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           }
         ),
         options: [],
-        order: 13,
+        order: 16,
         required: true,
         sensitive: false,
         tooltip: translate(
@@ -4543,56 +4593,6 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: true,
       },
-      enumerate_all_sites: {
-        default_value: true,
-        depends_on: [],
-        display: TOGGLE,
-        label: translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
-          { defaultMessage: 'Enumerate all sites?' }
-        ),
-        options: [],
-        order: 8,
-        required: false,
-        sensitive: false,
-        tooltip: translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesTooltip',
-          {
-            defaultMessage:
-              'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
-          }
-        ),
-        type: BOOLEAN,
-        ui_restrictions: [],
-        validations: [],
-        value: true,
-      },
-      fetch_subsites: {
-        default_value: false,
-        depends_on: [{ field: 'enumerate_all_sites', value: false }],
-        display: TOGGLE,
-        label: translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
-          {
-            defaultMessage: 'Fetch sub-sites of configured sites?',
-          }
-        ),
-        options: [],
-        order: 9,
-        required: false,
-        sensitive: false,
-        tooltip: translate(
-          'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesTooltip',
-          {
-            defaultMessage:
-              'Whether subsites of the configured site(s) should be automatically fetched.',
-          }
-        ),
-        type: BOOLEAN,
-        ui_restrictions: [],
-        validations: [],
-        value: true,
-      },
     },
     features: {
       [SYNC_RULES]: {