Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d9cfb51a authored by Christoph Wurst's avatar Christoph Wurst
Browse files

Search DAV for principal as display name OR email

parent 0db06bd9
Loading
Loading
Loading
Loading
+413 −69

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@
		"@fullcalendar/timegrid": "4.3.0",
		"@fullcalendar/vue": "4.3.1",
		"@nextcloud/auth": "^1.3.0",
		"@nextcloud/axios": "^1.3.3",
		"@nextcloud/axios": "^1.6.0",
		"@nextcloud/dialogs": "^1.4.0",
		"@nextcloud/initial-state": "^1.1.2",
		"@nextcloud/l10n": "^1.3.0",
@@ -53,7 +53,7 @@
		"@nextcloud/vue": "^2.3.0",
		"autosize": "^4.0.2",
		"calendar-js": "git+https://github.com/nextcloud/calendar-js.git",
		"cdav-library": "github:nextcloud/cdav-library",
		"cdav-library": "github:nextcloud/cdav-library#85dc947f27c554e5cc8caa460ebe361cf6775bb9",
		"closest-css-color": "^0.1.1",
		"color-convert": "^2.0.1",
		"core-js": "^3.6.5",
+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@

<script>
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import { findPrincipalsByDisplayName } from '../../../services/caldavService.js'
import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
import HttpClient from '@nextcloud/axios'
import debounce from 'debounce'
import { generateOcsUrl } from '@nextcloud/router'
@@ -140,7 +140,7 @@ export default {
		async findShareesFromDav(query, hiddenPrincipals, hiddenUrls) {
			let results
			try {
				results = await findPrincipalsByDisplayName(query)
				results = await principalPropertySearchByDisplaynameOrEmail(query)
			} catch (error) {
				return []
			}
+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@
<script>
import Avatar from '@nextcloud/vue/dist/Components/Avatar'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import { findPrincipalsByDisplayName } from '../../../services/caldavService.js'
import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
import HttpClient from '@nextcloud/axios'
import debounce from 'debounce'
import { linkTo } from '@nextcloud/router'
@@ -209,7 +209,7 @@ export default {
		async findAttendeesFromDAV(query) {
			let results
			try {
				results = await findPrincipalsByDisplayName(query)
				results = await principalPropertySearchByDisplaynameOrEmail(query)
			} catch (error) {
				console.debug(error)
				return []
+4 −4
Original line number Diff line number Diff line
@@ -198,11 +198,11 @@ const getCurrentUserPrincipal = () => {
/**
 * Finds calendar principals by displayname
 *
 * @param {String} query The search-term
 * @param {String} term The search-term
 * @returns {Promise<void>}
 */
const findPrincipalsByDisplayName = async(query) => {
	return getClient().principalPropertySearchByDisplayname(query)
const principalPropertySearchByDisplaynameOrEmail = async(term) => {
	return getClient().principalPropertySearchByDisplaynameOrEmail(term)
}

/**
@@ -227,6 +227,6 @@ export {
	enableBirthdayCalendar,
	getBirthdayCalendar,
	getCurrentUserPrincipal,
	findPrincipalsByDisplayName,
	principalPropertySearchByDisplaynameOrEmail,
	findPrincipalByUrl,
}