Merge pull request #3264 from nextcloud/backport/3232/stable2.2 (e023c4b7) · Commits · e / infra / ecloud / nextcloud-apps / calendar

src/components/AppNavigation/CalendarList/CalendarListItemSharingSearch.vue

+11 −7

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		:user-select="true"
		open-direction="bottom"
		track-by="user"
		label="user"
		label="displayName"
		@search-change="findSharee"
		@change="shareCalendar">
		<span slot="noResult">{{ $t('calendar', 'No users or groups') }}</span>
		@@ -49,6 +49,7 @@ import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/c
		import HttpClient from '@nextcloud/axios'
		import debounce from 'debounce'
		import { generateOcsUrl } from '@nextcloud/router'
		import { urldecode } from '../../../utils/url'

		export default {
		name: 'CalendarListItemSharingSearch',
		@@ -80,8 +81,6 @@ export default {
		* @param {Boolean} data.isCircle is this a circle-group ?
		*/
		shareCalendar({ user, displayName, uri, isGroup, isCircle }) {
		uri = decodeURI(uri)
		user = decodeURI(user)
		this.$store.dispatch('shareCalendar', {
		calendar: this.calendar,
		user,
		@@ -146,7 +145,13 @@ export default {
		}

		return results.reduce((list, result) => {
		if (hiddenPrincipals.includes(decodeURI(result.principalScheme))) {
		const isGroup = result.calendarUserType === 'GROUP'

		// TODO: Why do we have to decode those two values?
		const user = urldecode(result[isGroup ? 'groupId' : 'userId'])
		const decodedPrincipalScheme = urldecode(result.principalScheme)

		if (hiddenPrincipals.includes(decodedPrincipalScheme)) {
		return list
		}
		if (hiddenUrls.includes(result.url)) {
		@@ -158,12 +163,11 @@ export default {
		return list
		}

		const isGroup = result.calendarUserType === 'GROUP'
		list.push({
		user: result[isGroup ? 'groupId' : 'userId'],
		user,
		displayName: result.displayname,
		icon: isGroup ? 'icon-group' : 'icon-user',
		uri: result.principalScheme,
		uri: decodedPrincipalScheme,
		isGroup,
		isCircle: false,
		isNoUser: isGroup,

src/utils/url.js

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/**
		* @copyright Copyright (c) 2021 Richard Steinmetz <richard@steinmetz.cloud>
		*
		* @author Richard Steinmetz <richard@steinmetz.cloud>
		*
		* @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/>.
		*
		*/

		/**
		* Works like urldecode() from php
		*
		* @see https://www.php.net/manual/en/function.urldecode.php
		* @param {string} url The url to be decoded
		* @returns {string} The decoded url
		*/
		export function urldecode(url) {
		return decodeURIComponent(url.replace(/\+/g, ' '))
		}

tests/javascript/unit/utils/url.test.js

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		/**
		* @copyright Copyright (c) 2021 Richard Steinmetz <richard@steinmetz.cloud>
		*
		* @author Richard Steinmetz <richard@steinmetz.cloud>
		*
		* @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 { urldecode } from '../../../../src/utils/url'

		describe('utils/url test suite', () => {
		it('should decode urls encoded by php', () => {
		const testData = [
		['my+group+%2B%26%3F%25', 'my group +&?%'],
		['my%2520+group', 'my%20 group'],
		['group%20with%20spaces', 'group with spaces'],
		]

		for (const [encoded, expected] of testData) {
		const decoded = urldecode(encoded)
		expect(decoded).toEqual(expected)
		}
		})
		})