From ff5c4323d7f07039b91a255904c737d6b25aa712 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 6 Dec 2023 13:11:57 +0530
Subject: [PATCH 01/71] console result

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 7eb6c9238..b1e05e02d 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,6 +114,9 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+				/* eslint-disable no-console */
+				console.log(davPromise)
+				/* eslint-enable no-console */
 				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
 
 				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
-- 
GitLab


From 9476197227f6c4d58d179bab0994df15cb5d21a9 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 6 Dec 2023 13:37:32 +0530
Subject: [PATCH 02/71] console result

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index b1e05e02d..26ba1a033 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -142,7 +142,9 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearchByDisplaynameOrEmail(query)
+				results = await principalPropertySearch([{
+					name: ['http://sabredav.org/ns', 'email-address'],
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From 9e374f07a451a83f52e9c35092fbb2ac193ad4bb Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 6 Dec 2023 13:40:09 +0530
Subject: [PATCH 03/71] console result

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 26ba1a033..b0adad66a 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import { principalPropertySearch } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
-- 
GitLab


From 43f0b19eb83ac5f9e2b67ae4fa17c33afbf43394 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 13:29:11 +0530
Subject: [PATCH 04/71] search fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index b0adad66a..692f8a7ec 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearch } from '../../../services/caldavService.js'
+import client from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -142,7 +142,7 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearch([{
+				results = await client.principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
 			} catch (error) {
-- 
GitLab


From ee1ba67d98af2a554ae12fcd40d529b4ae2b1e2c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 14:28:43 +0530
Subject: [PATCH 05/71] search fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 692f8a7ec..33d31d26b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -46,6 +46,7 @@
 <script>
 import { NcSelect } from '@nextcloud/vue'
 import client from '../../../services/caldavService.js'
+import DavClient from '@nextcloud/cdav-library'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -142,7 +143,7 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await client.principalPropertySearch([{
+				results = await DavClient.principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
 			} catch (error) {
-- 
GitLab


From 5120ca1211108fce178f5f289b16ccef08f53e50 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 14:30:54 +0530
Subject: [PATCH 06/71] search fix

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 33d31d26b..4e3837f12 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,6 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import client from '../../../services/caldavService.js'
 import DavClient from '@nextcloud/cdav-library'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
-- 
GitLab


From 0f013f84e728d677ff973525f03f600c86eb47bf Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 15:17:54 +0530
Subject: [PATCH 07/71] search fix

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 4e3837f12..6b7fd288e 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -122,7 +122,6 @@ export default {
 				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
 					...davResults,
-					...ocsResults,
 				]
 
 				this.isLoading = false
-- 
GitLab


From f7e277205139893e8335f4580a8159ba68301909 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 15:20:03 +0530
Subject: [PATCH 08/71] search fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 6b7fd288e..81eb3c451 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -117,9 +117,8 @@ export default {
 				/* eslint-disable no-console */
 				console.log(davPromise)
 				/* eslint-enable no-console */
-				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-
-				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
+				
+				const [davResults] = await Promise.all([davPromise])
 				this.usersOrGroups = [
 					...davResults,
 				]
-- 
GitLab


From 7da4813d6cfc49cd50828e3cc5a959556c9b8d79 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 15:21:13 +0530
Subject: [PATCH 09/71] search fix

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 81eb3c451..27a558ffb 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -117,7 +117,6 @@ export default {
 				/* eslint-disable no-console */
 				console.log(davPromise)
 				/* eslint-enable no-console */
-				
 				const [davResults] = await Promise.all([davPromise])
 				this.usersOrGroups = [
 					...davResults,
-- 
GitLab


From 887a40f53eb0ae102933500fb8de810d5535e2ed Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 14 Dec 2023 15:38:09 +0530
Subject: [PATCH 10/71] search fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 27a558ffb..91d0d792b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -142,6 +142,9 @@ export default {
 				results = await DavClient.principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
+				/* eslint-disable no-console */
+				console.log(results)
+				/* eslint-enable no-console */
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From d1ea55fd955d2c9e5727f79942ee50fbac9366df Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 12:56:42 +0530
Subject: [PATCH 11/71] search with email log

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 91d0d792b..146b5a82f 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -142,13 +142,13 @@ export default {
 				results = await DavClient.principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
-				/* eslint-disable no-console */
-				console.log(results)
-				/* eslint-enable no-console */
 			} catch (error) {
 				return []
 			}
-
+			/* eslint-disable no-console */
+			    console.log('testt')
+				console.log(results)
+				/* eslint-enable no-console */
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
-- 
GitLab


From 71dbaa42b6e8574d74ebff491cbfabcaa68fd61d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 12:59:15 +0530
Subject: [PATCH 12/71] search with email

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 146b5a82f..1eb1959fa 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -147,8 +147,8 @@ export default {
 			}
 			/* eslint-disable no-console */
 			    console.log('testt')
-				console.log(results)
-				/* eslint-enable no-console */
+			console.log(results)
+			/* eslint-enable no-console */
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
-- 
GitLab


From 9b4676bbec2974fdfc6c20c27aa3acb52adb13b1 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 13:10:32 +0530
Subject: [PATCH 13/71] search with email

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 1eb1959fa..114754ec5 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import DavClient from '@nextcloud/cdav-library'
+import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -139,9 +139,7 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await DavClient.principalPropertySearch([{
-					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query, 'anyof')
+				results = await principalPropertySearchByDisplaynameOrEmail(query)
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From bd554eac337595786be5bbffcf4ef14744052440 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 19:37:42 +0530
Subject: [PATCH 14/71] calendar group search

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 114754ec5..4a910bf19 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import client from '../../../services/cdav.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -139,7 +139,9 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearchByDisplaynameOrEmail(query)
+				results = await client.principalPropertySearch([{
+					name: ['http://sabredav.org/ns', 'email-address'],
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From f80baa61d06754f948da26582efcdedc2a9c6add Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 19:47:27 +0530
Subject: [PATCH 15/71] calendar group search

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 4a910bf19..db61f6fa5 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import client from '../../../services/cdav.js'
+import client from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
-- 
GitLab


From 3b7b04e291fec7e0063368e5c25f3f26d5b5f199 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 19:52:22 +0530
Subject: [PATCH 16/71] seach by email

---
 src/services/caldavService.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/services/caldavService.js b/src/services/caldavService.js
index 6130fb53d..5defbe1fc 100644
--- a/src/services/caldavService.js
+++ b/src/services/caldavService.js
@@ -282,3 +282,8 @@ export {
 	advancedPrincipalPropertySearch,
 	findPrincipalByUrl,
 }
+
+export default new DavClient({
+	rootUrl: generateRemoteUrl('dav'),
+}, xhrProvider)
+
-- 
GitLab


From 2d8f95513b7fb183282b8bab842faf8d681e933c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 19:55:40 +0530
Subject: [PATCH 17/71] seach by email

---
 .../EditCalendarModal/SharingSearch.vue       |  2 +-
 src/services/caldavService.js                 |  5 --
 src/services/cdav.js                          | 52 +++++++++++++++++++
 3 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 src/services/cdav.js

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index db61f6fa5..4a910bf19 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import client from '../../../services/caldavService.js'
+import client from '../../../services/cdav.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
diff --git a/src/services/caldavService.js b/src/services/caldavService.js
index 5defbe1fc..6130fb53d 100644
--- a/src/services/caldavService.js
+++ b/src/services/caldavService.js
@@ -282,8 +282,3 @@ export {
 	advancedPrincipalPropertySearch,
 	findPrincipalByUrl,
 }
-
-export default new DavClient({
-	rootUrl: generateRemoteUrl('dav'),
-}, xhrProvider)
-
diff --git a/src/services/cdav.js b/src/services/cdav.js
new file mode 100644
index 000000000..5d5a1a248
--- /dev/null
+++ b/src/services/cdav.js
@@ -0,0 +1,52 @@
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import DavClient from '@nextcloud/cdav-library'
+import { generateRemoteUrl } from '@nextcloud/router'
+import { getRequestToken } from '@nextcloud/auth'
+
+/**
+ *
+ */
+function xhrProvider() {
+	const headers = {
+		'X-Requested-With': 'XMLHttpRequest',
+		requesttoken: getRequestToken(),
+	}
+	const xhr = new XMLHttpRequest()
+	const oldOpen = xhr.open
+
+	// override open() method to add headers
+	xhr.open = function() {
+		const result = oldOpen.apply(this, arguments)
+		for (const name in headers) {
+			xhr.setRequestHeader(name, headers[name])
+		}
+		return result
+	}
+	OC.registerXHRForErrorProcessing(xhr)
+	return xhr
+}
+
+export default new DavClient({
+	rootUrl: generateRemoteUrl('dav'),
+}, xhrProvider)
-- 
GitLab


From 17a2f35dd8cb16b52f78ec1483d76f14914e0d7a Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 22:00:24 +0530
Subject: [PATCH 18/71] seach by email

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 4a910bf19..ba375d7c0 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,9 +114,6 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				/* eslint-disable no-console */
-				console.log(davPromise)
-				/* eslint-enable no-console */
 				const [davResults] = await Promise.all([davPromise])
 				this.usersOrGroups = [
 					...davResults,
@@ -145,10 +142,6 @@ export default {
 			} catch (error) {
 				return []
 			}
-			/* eslint-disable no-console */
-			    console.log('testt')
-			console.log(results)
-			/* eslint-enable no-console */
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
-- 
GitLab


From 98ffd95c38d5ed8ed3125dc0659236b479d4667c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 22:12:58 +0530
Subject: [PATCH 19/71] seach by email

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index ba375d7c0..35c8f0069 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,6 +114,10 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+				/* eslint-disable no-console */
+				console.log('testt')
+				console.log(davPromise)
+				/* eslint-enable no-console */
 				const [davResults] = await Promise.all([davPromise])
 				this.usersOrGroups = [
 					...davResults,
-- 
GitLab


From e309dfee11cb9d50ec5313392bb8558627db29a9 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Tue, 19 Dec 2023 22:24:24 +0530
Subject: [PATCH 20/71] seach by email

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 35c8f0069..173118d2f 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -168,7 +168,11 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
-
+				/* eslint-disable no-console */
+				console.log('name')
+				console.log(result.displayname)
+				console.log(decodedPrincipalScheme)
+				/* eslint-enable no-console */
 				list.push({
 					user,
 					displayName: result.displayname,
-- 
GitLab


From 1cd210669e0545bd7ea99687f1d5c872b1e8814c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 21 Dec 2023 15:53:37 +0530
Subject: [PATCH 21/71] lint fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 173118d2f..d892455d2 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -168,11 +168,6 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
-				/* eslint-disable no-console */
-				console.log('name')
-				console.log(result.displayname)
-				console.log(decodedPrincipalScheme)
-				/* eslint-enable no-console */
 				list.push({
 					user,
 					displayName: result.displayname,
@@ -182,6 +177,11 @@ export default {
 					isNoUser: isGroup,
 					search: query,
 				})
+				/* eslint-disable no-console */
+				console.log('name')
+				console.log(result.displayname)
+				console.log(list)
+				/* eslint-enable no-console */
 				return list
 			}, [])
 		},
-- 
GitLab


From c35a3f282594a41222bb7eda19733d3617001ab0 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 11:01:31 +0530
Subject: [PATCH 22/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index d892455d2..14df11e4b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,13 +114,15 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
 				/* eslint-disable no-console */
 				console.log('testt')
 				console.log(davPromise)
 				/* eslint-enable no-console */
-				const [davResults] = await Promise.all([davPromise])
+				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
 					...davResults,
+					...ocsResults,
 				]
 
 				this.isLoading = false
@@ -177,11 +179,6 @@ export default {
 					isNoUser: isGroup,
 					search: query,
 				})
-				/* eslint-disable no-console */
-				console.log('name')
-				console.log(result.displayname)
-				console.log(list)
-				/* eslint-enable no-console */
 				return list
 			}, [])
 		},
-- 
GitLab


From 9ae0f49d7f656252c082fea53ee0d8a96a20a7bd Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 11:08:43 +0530
Subject: [PATCH 23/71] added code back

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 14df11e4b..f51a8ea46 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -118,6 +118,7 @@ export default {
 				/* eslint-disable no-console */
 				console.log('testt')
 				console.log(davPromise)
+				console.log(ocsPromise)
 				/* eslint-enable no-console */
 				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
-- 
GitLab


From 4343d942ea1df9705b3f7b46e75c42698d0e329a Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 11:26:50 +0530
Subject: [PATCH 24/71] added code back

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index f51a8ea46..14df11e4b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -118,7 +118,6 @@ export default {
 				/* eslint-disable no-console */
 				console.log('testt')
 				console.log(davPromise)
-				console.log(ocsPromise)
 				/* eslint-enable no-console */
 				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
-- 
GitLab


From b0bd5a6d43025f51c74425d61d4538f022c915b4 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 11:34:10 +0530
Subject: [PATCH 25/71] added code back

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 14df11e4b..69f118b26 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,7 +114,6 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
 				/* eslint-disable no-console */
 				console.log('testt')
 				console.log(davPromise)
-- 
GitLab


From 130fb4bf393b3ebc3b9147b0590db9d451028f16 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 11:36:54 +0530
Subject: [PATCH 26/71] added code back

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 69f118b26..14df11e4b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,6 +114,7 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
 				/* eslint-disable no-console */
 				console.log('testt')
 				console.log(davPromise)
-- 
GitLab


From 6865ca1274bfe747ee8682887e2bea0d58072e3e Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 11:41:37 +0530
Subject: [PATCH 27/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 14df11e4b..f73661cc5 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -115,10 +115,6 @@ export default {
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
 				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-				/* eslint-disable no-console */
-				console.log('testt')
-				console.log(davPromise)
-				/* eslint-enable no-console */
 				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
 					...davResults,
-- 
GitLab


From f76d55aa9e83d59286195bf5144777d55e349840 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 12:06:08 +0530
Subject: [PATCH 28/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index f73661cc5..1fb5ee21a 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -113,9 +113,8 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
 				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
+				const [ocsResults] = await Promise.all([ocsPromise])
 				this.usersOrGroups = [
 					...davResults,
 					...ocsResults,
-- 
GitLab


From 48ca3fac512993fd400d6358d3ce1f375ccc5bad Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 12:07:23 +0530
Subject: [PATCH 29/71] added code back

---
 src/components/AppNavigation/EditCalendarModal/SharingSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 1fb5ee21a..35af7dd62 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -116,7 +116,6 @@ export default {
 				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
 				const [ocsResults] = await Promise.all([ocsPromise])
 				this.usersOrGroups = [
-					...davResults,
 					...ocsResults,
 				]
 
-- 
GitLab


From d33943cb3a8167913dacad494f2200264a6d6834 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 12:22:33 +0530
Subject: [PATCH 30/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 35af7dd62..be608a158 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import client from '../../../services/cdav.js'
+import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -136,9 +136,7 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await client.principalPropertySearch([{
-					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query, 'anyof')
+				results = await principalPropertySearchByDisplaynameOrEmail(query)
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From ceeba8df7181dd31538d6567fb872da5e8e1b8e1 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 12:23:36 +0530
Subject: [PATCH 31/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index be608a158..dc1dda433 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -113,9 +113,11 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
+				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
 				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-				const [ocsResults] = await Promise.all([ocsPromise])
+				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
+					...davResults,
 					...ocsResults,
 				]
 
-- 
GitLab


From 07ad766766db929314e34a1ba9e2ba20b39cae90 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 12:29:06 +0530
Subject: [PATCH 32/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index dc1dda433..d54a0ad0c 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -115,6 +115,11 @@ export default {
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
 				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
+				/* eslint-disable no-console */
+				console.log('name')
+				console.log(davPromise)
+				console.log(ocsPromise)
+				/* eslint-enable no-console */
 				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
 				this.usersOrGroups = [
 					...davResults,
-- 
GitLab


From 3fea2a8941d479fc4dac4b857bd08b3fd7c0e90d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 13:01:25 +0530
Subject: [PATCH 33/71] added code back

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index d54a0ad0c..32aceb583 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import client from '../../../services/cdav.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -143,7 +143,9 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearchByDisplaynameOrEmail(query)
+				results = await client.principalPropertySearch([{
+					name: ['http://sabredav.org/ns', 'email-address'],
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From b1fe50d1b0a77d56c17c004809da47d61de740c9 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 14:14:01 +0530
Subject: [PATCH 34/71] seach

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 32aceb583..d97d85bef 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -145,7 +145,7 @@ export default {
 			try {
 				results = await client.principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query, 'anyof')
+				}], query)
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From e4134d82b0f24c1e140b9d99971a8d5e4b6192aa Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 14:28:30 +0530
Subject: [PATCH 35/71] seach

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 +++---
 src/services/caldavService.js                               | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index d97d85bef..22066fe8c 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import client from '../../../services/cdav.js'
+import { principalPropertySearch } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -143,9 +143,9 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await client.principalPropertySearch([{
+				results = results = await 	principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query)
+				}], query,'anyof')
 			} catch (error) {
 				return []
 			}
diff --git a/src/services/caldavService.js b/src/services/caldavService.js
index 6130fb53d..5eeb72a78 100644
--- a/src/services/caldavService.js
+++ b/src/services/caldavService.js
@@ -255,6 +255,10 @@ const advancedPrincipalPropertySearch = async (query) => {
 	return getClient().advancedPrincipalPropertySearch(query)
 }
 
+const principalPropertySearch = async (props, match, test) => {
+	return getClient().principalPropertySearch(props, match, test)
+}
+
 /**
  * Finds one principal by it's URL
  *
@@ -280,5 +284,6 @@ export {
 	getCurrentUserPrincipal,
 	principalPropertySearchByDisplaynameOrEmail,
 	advancedPrincipalPropertySearch,
+	principalPropertySearch,
 	findPrincipalByUrl,
 }
-- 
GitLab


From 7d36967e8c932c0810f3ee36e76375f29d337e7e Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 14:30:41 +0530
Subject: [PATCH 36/71] seach

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 22066fe8c..9c56e45b5 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -143,9 +143,9 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = results = await 	principalPropertySearch([{
+				results = results = await principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query,'anyof')
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From 1e6f4f9a8ab30582c913edf833a4f87e561149b6 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 14:39:57 +0530
Subject: [PATCH 37/71] autocomplete check

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 9c56e45b5..640e28e5b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -114,16 +114,13 @@ export default {
 
 			if (query.length > 0) {
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
 				/* eslint-disable no-console */
 				console.log('name')
 				console.log(davPromise)
-				console.log(ocsPromise)
 				/* eslint-enable no-console */
-				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
+				const [davResults] = await Promise.all([davPromise])
 				this.usersOrGroups = [
 					...davResults,
-					...ocsResults,
 				]
 
 				this.isLoading = false
-- 
GitLab


From 8285b7ae6bcd3a63da4ed15eb71e3931cb30c518 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 14:45:26 +0530
Subject: [PATCH 38/71] autocomplete check

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 640e28e5b..cce862323 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -146,6 +146,10 @@ export default {
 			} catch (error) {
 				return []
 			}
+			/* eslint-disable no-console */
+				console.log('results')
+				console.log(results)
+				/* eslint-enable no-console */
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
-- 
GitLab


From 363833f1fe2323bd4888376bb4392d2eb18ebdca Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 14:47:45 +0530
Subject: [PATCH 39/71] autocomplete check

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index cce862323..ce49407d9 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -147,9 +147,9 @@ export default {
 				return []
 			}
 			/* eslint-disable no-console */
-				console.log('results')
-				console.log(results)
-				/* eslint-enable no-console */
+			console.log('results')
+			console.log(results)
+			/* eslint-enable no-console */
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
-- 
GitLab


From 9be9bed85510345d50a05bd06fb26eaa873cdbb8 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Fri, 22 Dec 2023 15:00:12 +0530
Subject: [PATCH 40/71] autocomplete check

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index ce49407d9..db2e1675c 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -118,7 +118,7 @@ export default {
 				console.log('name')
 				console.log(davPromise)
 				/* eslint-enable no-console */
-				const [davResults] = await Promise.all([davPromise])
+				const [davResults] = await davPromise
 				this.usersOrGroups = [
 					...davResults,
 				]
-- 
GitLab


From f8c934a9c0552d18f681638ca09aa968813ec5bf Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 23 Dec 2023 00:46:55 +0530
Subject: [PATCH 41/71] code fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index db2e1675c..ff33c37fb 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -140,7 +140,7 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = results = await principalPropertySearch([{
+				results =  await principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
 			} catch (error) {
-- 
GitLab


From 627dfb59da48728c432fae3fc2f5b3645203cc7c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 23 Dec 2023 00:48:45 +0530
Subject: [PATCH 42/71] code fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index ff33c37fb..0d6329af5 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -140,7 +140,7 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results =  await principalPropertySearch([{
+				results = await principalPropertySearch([{
 					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
 			} catch (error) {
-- 
GitLab


From 8ffc6d7e8819aef4d89604ea1cc2657ad2b44e12 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 23 Dec 2023 01:22:14 +0530
Subject: [PATCH 43/71] code fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 0d6329af5..8b9e9c5c2 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -141,8 +141,8 @@ export default {
 			let results
 			try {
 				results = await principalPropertySearch([{
-					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query, 'anyof')
+					name: ['http://dav.org/ns', 'displayname'],
+				}, { name: ['http://sabredav.org/ns', 'email-address'] }], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From f564e3e90794bf0c5efa2f74dab8aca50061b72c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 23 Dec 2023 01:39:29 +0530
Subject: [PATCH 44/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 8b9e9c5c2..77d40f4f9 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -141,7 +141,7 @@ export default {
 			let results
 			try {
 				results = await principalPropertySearch([{
-					name: ['http://dav.org/ns', 'displayname'],
+					name: ['DAV:', 'displayname'],
 				}, { name: ['http://sabredav.org/ns', 'email-address'] }], query, 'anyof')
 			} catch (error) {
 				return []
-- 
GitLab


From af1ca1cee46d87dece1e8e28da35d684945d8051 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 23 Dec 2023 01:52:55 +0530
Subject: [PATCH 45/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 77d40f4f9..712dd532b 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -142,7 +142,7 @@ export default {
 			try {
 				results = await principalPropertySearch([{
 					name: ['DAV:', 'displayname'],
-				}, { name: ['http://sabredav.org/ns', 'email-address'] }], query, 'anyof')
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-- 
GitLab


From 0a58a46bf1e5a897a17d47fa8937be9b2be51d9e Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Sat, 23 Dec 2023 01:57:42 +0530
Subject: [PATCH 46/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 712dd532b..911f097e9 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -146,10 +146,6 @@ export default {
 			} catch (error) {
 				return []
 			}
-			/* eslint-disable no-console */
-			console.log('results')
-			console.log(results)
-			/* eslint-enable no-console */
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
-- 
GitLab


From cc834d6c43754202997cca66ad88525f0e2fdb92 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 10:11:18 +0530
Subject: [PATCH 47/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 911f097e9..da095c4cf 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -177,6 +177,10 @@ export default {
 					isNoUser: isGroup,
 					search: query,
 				})
+				/* eslint-disable no-console */
+				console.log('list')
+				console.log(list)
+				/* eslint-enable no-console */
 				return list
 			}, [])
 		},
-- 
GitLab


From 7d5c9e3948b9d344eda3958f950821b4c0a598dc Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 10:19:01 +0530
Subject: [PATCH 48/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index da095c4cf..e1764e9a3 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -113,6 +113,9 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
+				/* eslint-disable no-console */
+				console.log('all good')
+				/* eslint-enable no-console */
 				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
 				/* eslint-disable no-console */
 				console.log('name')
-- 
GitLab


From f5df1b0a5e6ea8ea0d3e90688d7afefefe846dd9 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 10:30:19 +0530
Subject: [PATCH 49/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index e1764e9a3..e012d6d8c 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -144,7 +144,7 @@ export default {
 			let results
 			try {
 				results = await principalPropertySearch([{
-					name: ['DAV:', 'displayname'],
+					name: ['http://sabredav.org/ns', 'email-address'],
 				}], query, 'anyof')
 			} catch (error) {
 				return []
-- 
GitLab


From 733264730a3a9dd9ac150c155991c994c84ecfbc Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 10:44:53 +0530
Subject: [PATCH 50/71] fix issue

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index e012d6d8c..3d2c9ee19 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -122,9 +122,13 @@ export default {
 				console.log(davPromise)
 				/* eslint-enable no-console */
 				const [davResults] = await davPromise
-				this.usersOrGroups = [
-					...davResults,
-				]
+				if (Array.isArray(davResults)) {
+					this.usersOrGroups = [...davResults]
+				} else {
+					// Handle the case when davResults is not an array
+					// Maybe set this.usersOrGroups to an empty array or a default value
+					this.usersOrGroups = []
+				}
 
 				this.isLoading = false
 				this.inputGiven = true
-- 
GitLab


From b55af570191cd57ee24b6258ca044f1d7ed57c33 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 10:55:32 +0530
Subject: [PATCH 51/71] seach fix

---
 .../EditCalendarModal/SharingSearch.vue       | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 3d2c9ee19..f351c347e 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -113,21 +113,12 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				/* eslint-disable no-console */
-				console.log('all good')
-				/* eslint-enable no-console */
-				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				/* eslint-disable no-console */
-				console.log('name')
-				console.log(davPromise)
-				/* eslint-enable no-console */
-				const [davResults] = await davPromise
-				if (Array.isArray(davResults)) {
+				try {
+					const davResults = await this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
 					this.usersOrGroups = [...davResults]
-				} else {
-					// Handle the case when davResults is not an array
-					// Maybe set this.usersOrGroups to an empty array or a default value
-					this.usersOrGroups = []
+				} catch (error) {
+					console.error('Error fetching data:', error)
+					this.usersOrGroups = [] // or handle error as needed
 				}
 
 				this.isLoading = false
-- 
GitLab


From 5f2523304885a1b1e742d3d28c9d275359743c92 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:02:53 +0530
Subject: [PATCH 52/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index f351c347e..ccedb7d8f 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -120,7 +120,10 @@ export default {
 					console.error('Error fetching data:', error)
 					this.usersOrGroups = [] // or handle error as needed
 				}
-
+				/* eslint-disable no-console */
+				console.log('usersOrGroups')
+				console.log(this.usersOrGroups)
+				/* eslint-enable no-console */
 				this.isLoading = false
 				this.inputGiven = true
 			} else {
-- 
GitLab


From 0792616db24f34af476a4be9466083e0ad0621e3 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:15:00 +0530
Subject: [PATCH 53/71] seach fix

---
 .../EditCalendarModal/SharingSearch.vue       | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index ccedb7d8f..7eb6c9238 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearch } from '../../../services/caldavService.js'
+import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -113,17 +113,15 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				try {
-					const davResults = await this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-					this.usersOrGroups = [...davResults]
-				} catch (error) {
-					console.error('Error fetching data:', error)
-					this.usersOrGroups = [] // or handle error as needed
-				}
-				/* eslint-disable no-console */
-				console.log('usersOrGroups')
-				console.log(this.usersOrGroups)
-				/* eslint-enable no-console */
+				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
+
+				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
+				this.usersOrGroups = [
+					...davResults,
+					...ocsResults,
+				]
+
 				this.isLoading = false
 				this.inputGiven = true
 			} else {
@@ -141,12 +139,11 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearch([{
-					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query, 'anyof')
+				results = await principalPropertySearchByDisplaynameOrEmail(query)
 			} catch (error) {
 				return []
 			}
+
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
@@ -169,6 +166,7 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
+
 				list.push({
 					user,
 					displayName: result.displayname,
@@ -178,10 +176,6 @@ export default {
 					isNoUser: isGroup,
 					search: query,
 				})
-				/* eslint-disable no-console */
-				console.log('list')
-				console.log(list)
-				/* eslint-enable no-console */
 				return list
 			}, [])
 		},
-- 
GitLab


From 5114b8612ec6dbc54b6d8dbdef76ee7090b5065c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:19:22 +0530
Subject: [PATCH 54/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 7eb6c9238..c1d4e6bbd 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -121,7 +121,10 @@ export default {
 					...davResults,
 					...ocsResults,
 				]
-
+				/* eslint-disable no-console */
+				console.log('usersOrGroups')
+				console.log(this.usersOrGroups)
+				/* eslint-enable no-console */
 				this.isLoading = false
 				this.inputGiven = true
 			} else {
-- 
GitLab


From 3c00ffbe02b1d4bb7b496ac1a7483425a2dead0f Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:24:08 +0530
Subject: [PATCH 55/71] seach fix

---
 .../EditCalendarModal/SharingSearch.vue       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index c1d4e6bbd..ccedb7d8f 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import { principalPropertySearch } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -113,14 +113,13 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-
-				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
-				this.usersOrGroups = [
-					...davResults,
-					...ocsResults,
-				]
+				try {
+					const davResults = await this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+					this.usersOrGroups = [...davResults]
+				} catch (error) {
+					console.error('Error fetching data:', error)
+					this.usersOrGroups = [] // or handle error as needed
+				}
 				/* eslint-disable no-console */
 				console.log('usersOrGroups')
 				console.log(this.usersOrGroups)
@@ -142,11 +141,12 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearchByDisplaynameOrEmail(query)
+				results = await principalPropertySearch([{
+					name: ['http://sabredav.org/ns', 'email-address'],
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
@@ -169,7 +169,6 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
-
 				list.push({
 					user,
 					displayName: result.displayname,
@@ -179,6 +178,10 @@ export default {
 					isNoUser: isGroup,
 					search: query,
 				})
+				/* eslint-disable no-console */
+				console.log('list')
+				console.log(list)
+				/* eslint-enable no-console */
 				return list
 			}, [])
 		},
-- 
GitLab


From f701d9b5f8a6ff8fd291bdee049058dfa3dc9399 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:35:15 +0530
Subject: [PATCH 56/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index ccedb7d8f..1c7541a3a 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -157,7 +157,10 @@ export default {
 				// TODO: Why do we have to decode those two values?
 				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
-
+				/* eslint-disable no-console */
+				console.log('usersOrGroups')
+				console.log(result)
+				/* eslint-enable no-console */
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
 					return list
 				}
-- 
GitLab


From a01d7b4957f11b07bde61b3ef61f53224deb7960 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:40:53 +0530
Subject: [PATCH 57/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 1c7541a3a..ce26b5580 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -155,7 +155,7 @@ export default {
 				const isGroup = result.calendarUserType === 'GROUP'
 
 				// TODO: Why do we have to decode those two values?
-				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
+				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
 				/* eslint-disable no-console */
 				console.log('usersOrGroups')
@@ -173,7 +173,7 @@ export default {
 					return list
 				}
 				list.push({
-					user,
+					result.email,
 					displayName: result.displayname,
 					uri: decodedPrincipalScheme,
 					isGroup,
-- 
GitLab


From cb031fb5d9f9dd9db358000c3c5607b15eb7f8b2 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:44:36 +0530
Subject: [PATCH 58/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index ce26b5580..c3f68e3c4 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -157,10 +157,7 @@ export default {
 				// TODO: Why do we have to decode those two values?
 				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
-				/* eslint-disable no-console */
-				console.log('usersOrGroups')
-				console.log(result)
-				/* eslint-enable no-console */
+
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
 					return list
 				}
@@ -173,7 +170,7 @@ export default {
 					return list
 				}
 				list.push({
-					result.email,
+					user,
 					displayName: result.displayname,
 					uri: decodedPrincipalScheme,
 					isGroup,
-- 
GitLab


From 2307b92c93805b0cecdcca239fe07247e8b5734a Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 11:56:29 +0530
Subject: [PATCH 59/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index c3f68e3c4..cdd23c8aa 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -178,10 +178,6 @@ export default {
 					isNoUser: isGroup,
 					search: query,
 				})
-				/* eslint-disable no-console */
-				console.log('list')
-				console.log(list)
-				/* eslint-enable no-console */
 				return list
 			}, [])
 		},
-- 
GitLab


From 5c2f224a3614b05b51bc50d025020c6a8367ca1d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 12:05:48 +0530
Subject: [PATCH 60/71] seach fix

---
 .../EditCalendarModal/SharingSearch.vue       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index cdd23c8aa..c1d4e6bbd 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearch } from '../../../services/caldavService.js'
+import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -113,13 +113,14 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				try {
-					const davResults = await this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-					this.usersOrGroups = [...davResults]
-				} catch (error) {
-					console.error('Error fetching data:', error)
-					this.usersOrGroups = [] // or handle error as needed
-				}
+				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
+
+				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
+				this.usersOrGroups = [
+					...davResults,
+					...ocsResults,
+				]
 				/* eslint-disable no-console */
 				console.log('usersOrGroups')
 				console.log(this.usersOrGroups)
@@ -141,12 +142,11 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearch([{
-					name: ['http://sabredav.org/ns', 'email-address'],
-				}], query, 'anyof')
+				results = await principalPropertySearchByDisplaynameOrEmail(query)
 			} catch (error) {
 				return []
 			}
+
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
@@ -155,7 +155,7 @@ export default {
 				const isGroup = result.calendarUserType === 'GROUP'
 
 				// TODO: Why do we have to decode those two values?
-				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
+				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
 
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
@@ -169,6 +169,7 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
+
 				list.push({
 					user,
 					displayName: result.displayname,
-- 
GitLab


From 7b090c5edd608ba9ed9b54fc3495884a07601b98 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 12:10:15 +0530
Subject: [PATCH 61/71] seach fix

---
 .../EditCalendarModal/SharingSearch.vue       | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index c1d4e6bbd..cdd23c8aa 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { NcSelect } from '@nextcloud/vue'
-import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import { principalPropertySearch } from '../../../services/caldavService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -113,14 +113,13 @@ export default {
 			this.usersOrGroups = []
 
 			if (query.length > 0) {
-				const davPromise = this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
-				const ocsPromise = this.findShareesFromCircles(query, hiddenPrincipalSchemes, hiddenUrls)
-
-				const [davResults, ocsResults] = await Promise.all([davPromise, ocsPromise])
-				this.usersOrGroups = [
-					...davResults,
-					...ocsResults,
-				]
+				try {
+					const davResults = await this.findShareesFromDav(query, hiddenPrincipalSchemes, hiddenUrls)
+					this.usersOrGroups = [...davResults]
+				} catch (error) {
+					console.error('Error fetching data:', error)
+					this.usersOrGroups = [] // or handle error as needed
+				}
 				/* eslint-disable no-console */
 				console.log('usersOrGroups')
 				console.log(this.usersOrGroups)
@@ -142,11 +141,12 @@ export default {
 		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
 			let results
 			try {
-				results = await principalPropertySearchByDisplaynameOrEmail(query)
+				results = await principalPropertySearch([{
+					name: ['http://sabredav.org/ns', 'email-address'],
+				}], query, 'anyof')
 			} catch (error) {
 				return []
 			}
-
 			return results.reduce((list, result) => {
 				if (['ROOM', 'RESOURCE'].includes(result.calendarUserType)) {
 					return list
@@ -155,7 +155,7 @@ export default {
 				const isGroup = result.calendarUserType === 'GROUP'
 
 				// TODO: Why do we have to decode those two values?
-				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
+				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
 
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
@@ -169,7 +169,6 @@ export default {
 				if (!['GROUP', 'INDIVIDUAL'].includes(result.calendarUserType)) {
 					return list
 				}
-
 				list.push({
 					user,
 					displayName: result.displayname,
-- 
GitLab


From 91fd40c0185368df9aa746e26b759ddfa9ea6a2c Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 12:52:33 +0530
Subject: [PATCH 62/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index cdd23c8aa..11fccdde4 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -171,7 +171,7 @@ export default {
 				}
 				list.push({
 					user,
-					displayName: result.displayname,
+					displayName: user,
 					uri: decodedPrincipalScheme,
 					isGroup,
 					isCircle: false,
-- 
GitLab


From 02f67560e48d0aaaba254d7aaad300344b7fd3df Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:01:40 +0530
Subject: [PATCH 63/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 11fccdde4..31b487bd6 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -120,10 +120,6 @@ export default {
 					console.error('Error fetching data:', error)
 					this.usersOrGroups = [] // or handle error as needed
 				}
-				/* eslint-disable no-console */
-				console.log('usersOrGroups')
-				console.log(this.usersOrGroups)
-				/* eslint-enable no-console */
 				this.isLoading = false
 				this.inputGiven = true
 			} else {
-- 
GitLab


From 18cd5003d4d38040c749220734ba0620c53a762b Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:22:13 +0530
Subject: [PATCH 64/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 31b487bd6..d730dd0c2 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -151,7 +151,7 @@ export default {
 				const isGroup = result.calendarUserType === 'GROUP'
 
 				// TODO: Why do we have to decode those two values?
-				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
+				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
 
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
-- 
GitLab


From 17455b499a0b5a51aa4648246ccb245ffba7a8b4 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:30:01 +0530
Subject: [PATCH 65/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index d730dd0c2..31b487bd6 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -151,7 +151,7 @@ export default {
 				const isGroup = result.calendarUserType === 'GROUP'
 
 				// TODO: Why do we have to decode those two values?
-				const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
+				const user = urldecode(result[isGroup ? 'groupId' : 'email'])
 				const decodedPrincipalScheme = urldecode(result.principalScheme)
 
 				if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
-- 
GitLab


From 5509e07f62497db860712a57aa309d37d116afba Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:38:24 +0530
Subject: [PATCH 66/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 31b487bd6..2199655d2 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -167,8 +167,9 @@ export default {
 				}
 				list.push({
 					user,
-					displayName: user,
+					displayName: result.displayname,
 					uri: decodedPrincipalScheme,
+					icon: 'icon-circle',
 					isGroup,
 					isCircle: false,
 					isNoUser: isGroup,
-- 
GitLab


From 556a1e5164d1f0045c8b731257904d24e71a4c1a Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:46:15 +0530
Subject: [PATCH 67/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 2199655d2..beca7b01d 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -32,7 +32,7 @@
 			:placeholder="$t('calendar', 'Share with users or groups')"
 			class="sharing-search__select"
 			:class="{ 'showContent': inputGiven, 'icon-loading': isLoading }"
-			:user-select="true"
+			:user-select="false"
 			open-direction="above"
 			track-by="user"
 			label="displayName"
-- 
GitLab


From 295591744ac2829ec8793b5e6eb08e4995b4a7e9 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:51:59 +0530
Subject: [PATCH 68/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index beca7b01d..58c500f5f 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -167,7 +167,7 @@ export default {
 				}
 				list.push({
 					user,
-					displayName: result.displayname,
+					displayName: user,
 					uri: decodedPrincipalScheme,
 					icon: 'icon-circle',
 					isGroup,
-- 
GitLab


From 0ac546d03e9a4b45c1777802169f75a65c921006 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:56:54 +0530
Subject: [PATCH 69/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 58c500f5f..7d826b629 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -32,7 +32,7 @@
 			:placeholder="$t('calendar', 'Share with users or groups')"
 			class="sharing-search__select"
 			:class="{ 'showContent': inputGiven, 'icon-loading': isLoading }"
-			:user-select="false"
+			:user-select="true"
 			open-direction="above"
 			track-by="user"
 			label="displayName"
-- 
GitLab


From 769c27d40f808535aa63c9f9072f761808643151 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 13:57:33 +0530
Subject: [PATCH 70/71] seach fix

---
 src/services/cdav.js | 52 --------------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 src/services/cdav.js

diff --git a/src/services/cdav.js b/src/services/cdav.js
deleted file mode 100644
index 5d5a1a248..000000000
--- a/src/services/cdav.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import DavClient from '@nextcloud/cdav-library'
-import { generateRemoteUrl } from '@nextcloud/router'
-import { getRequestToken } from '@nextcloud/auth'
-
-/**
- *
- */
-function xhrProvider() {
-	const headers = {
-		'X-Requested-With': 'XMLHttpRequest',
-		requesttoken: getRequestToken(),
-	}
-	const xhr = new XMLHttpRequest()
-	const oldOpen = xhr.open
-
-	// override open() method to add headers
-	xhr.open = function() {
-		const result = oldOpen.apply(this, arguments)
-		for (const name in headers) {
-			xhr.setRequestHeader(name, headers[name])
-		}
-		return result
-	}
-	OC.registerXHRForErrorProcessing(xhr)
-	return xhr
-}
-
-export default new DavClient({
-	rootUrl: generateRemoteUrl('dav'),
-}, xhrProvider)
-- 
GitLab


From 85a78ede2a47262be6cdbdd4d652cdf59cc8f788 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 25 Dec 2023 14:04:41 +0530
Subject: [PATCH 71/71] seach fix

---
 .../AppNavigation/EditCalendarModal/SharingSearch.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
index 7d826b629..58c500f5f 100644
--- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
+++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue
@@ -32,7 +32,7 @@
 			:placeholder="$t('calendar', 'Share with users or groups')"
 			class="sharing-search__select"
 			:class="{ 'showContent': inputGiven, 'icon-loading': isLoading }"
-			:user-select="true"
+			:user-select="false"
 			open-direction="above"
 			track-by="user"
 			label="displayName"
-- 
GitLab