diff options
Diffstat (limited to 'apps/federatedfilesharing/src/external.js')
| -rw-r--r-- | apps/federatedfilesharing/src/external.js | 184 |
1 files changed, 80 insertions, 104 deletions
diff --git a/apps/federatedfilesharing/src/external.js b/apps/federatedfilesharing/src/external.js index 5db1c57ffa1..3581a24e95a 100644 --- a/apps/federatedfilesharing/src/external.js +++ b/apps/federatedfilesharing/src/external.js @@ -3,10 +3,16 @@ * SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-or-later */ +import axios, { isAxiosError } from '@nextcloud/axios' +import { showError, showInfo } from '@nextcloud/dialogs' +import { subscribe } from '@nextcloud/event-bus' import { loadState } from '@nextcloud/initial-state' +import { t } from '@nextcloud/l10n' import { generateUrl } from '@nextcloud/router' +import { showRemoteShareDialog } from './services/dialogService.ts' +import logger from './services/logger.ts' -window.OCA.Sharing = window.OCA.Sharing || {} +window.OCA.Sharing = window.OCA.Sharing ?? {} /** * Shows "add external share" dialog. @@ -20,57 +26,41 @@ window.OCA.Sharing = window.OCA.Sharing || {} * @param {Function} callback the callback */ window.OCA.Sharing.showAddExternalDialog = function(share, passwordProtected, callback) { - const remote = share.remote const owner = share.ownerDisplayName || share.owner const name = share.name // Clean up the remote URL for display - const remoteClean = remote + const remote = share.remote .replace(/^https?:\/\//, '') // remove http:// or https:// .replace(/\/$/, '') // remove trailing slash - if (!passwordProtected) { - window.OC.dialogs.confirm( - t( - 'files_sharing', - 'Do you want to add the remote share {name} from {owner}@{remote}?', - { name, owner, remote: remoteClean }, - ), - t('files_sharing', 'Remote share'), - function(result) { - callback(result, share) - }, - true, - ).then(this._adjustDialog) - } else { - window.OC.dialogs.prompt( - t( - 'files_sharing', - 'Do you want to add the remote share {name} from {owner}@{remote}?', - { name, owner, remote: remoteClean }, - ), - t('files_sharing', 'Remote share'), - function(result, password) { - share.password = password - callback(result, share) - }, - true, - t('files_sharing', 'Remote share password'), - true, - ).then(this._adjustDialog) - } + showRemoteShareDialog(name, owner, remote, passwordProtected) + // eslint-disable-next-line n/no-callback-literal + .then((password) => callback(true, { ...share, password })) + // eslint-disable-next-line n/no-callback-literal + .catch(() => callback(false, share)) } -window.OCA.Sharing._adjustDialog = function() { - const $dialog = $('.oc-dialog:visible') - const $buttons = $dialog.find('button') - // hack the buttons - $dialog.find('.ui-icon').remove() - $buttons.eq(1).text(t('core', 'Cancel')) - $buttons.eq(2).text(t('files_sharing', 'Add remote share')) -} +window.addEventListener('DOMContentLoaded', () => { + processIncomingShareFromUrl() + + if (loadState('federatedfilesharing', 'notificationsEnabled', true) !== true) { + // No notification app, display the modal + processSharesToConfirm() + } -const reloadFilesList = function() { + subscribe('notifications:action:executed', ({ action, notification }) => { + if (notification.app === 'files_sharing' && notification.object_type === 'remote_share' && action.type === 'POST') { + // User accepted a remote share reload + reloadFilesList() + } + }) +}) + +/** + * Reload the files list to show accepted shares + */ +function reloadFilesList() { if (!window?.OCP?.Files?.Router?.goToRoute) { // No router, just reload the page window.location.reload() @@ -89,35 +79,42 @@ const reloadFilesList = function() { * Process incoming remote share that might have been passed * through the URL */ -const processIncomingShareFromUrl = function() { +function processIncomingShareFromUrl() { const params = window.OC.Util.History.parseUrlQuery() // manually add server-to-server share if (params.remote && params.token && params.name) { - const callbackAddShare = function(result, share) { - const password = share.password || '' - if (result) { - $.post( - generateUrl('apps/federatedfilesharing/askForFederatedShare'), - { - remote: share.remote, - token: share.token, - owner: share.owner, - ownerDisplayName: share.ownerDisplayName || share.owner, - name: share.name, - password, - }, - ).done(function(data) { - if (data.hasOwnProperty('legacyMount')) { - reloadFilesList() - } else { - window.OC.Notification.showTemporary(data.message) - } - }).fail(function(data) { - window.OC.Notification.showTemporary(JSON.parse(data.responseText).message) - }) + const callbackAddShare = (result, share) => { + if (result === false) { + return } + + axios.post( + generateUrl('apps/federatedfilesharing/askForFederatedShare'), + { + remote: share.remote, + token: share.token, + owner: share.owner, + ownerDisplayName: share.ownerDisplayName || share.owner, + name: share.name, + password: share.password || '', + }, + ).then(({ data }) => { + if (Object.hasOwn(data, 'legacyMount')) { + reloadFilesList() + } else { + showInfo(data.message) + } + }).catch((error) => { + logger.error('Error while processing incoming share', { error }) + + if (isAxiosError(error) && error.response.data.message) { + showError(error.response.data.message) + } else { + showError(t('federatedfilesharing', 'Incoming share could not be processed')) + } + }) } // clear hash, it is unlikely that it contain any extra parameters @@ -134,44 +131,23 @@ const processIncomingShareFromUrl = function() { /** * Retrieve a list of remote shares that need to be approved */ -const processSharesToConfirm = function() { +async function processSharesToConfirm() { // check for new server-to-server shares which need to be approved - $.get(generateUrl('/apps/files_sharing/api/externalShares'), {}, function(shares) { - let index - for (index = 0; index < shares.length; ++index) { - window.OCA.Sharing.showAddExternalDialog( - shares[index], - false, - function(result, share) { - if (result) { - // Accept - $.post(generateUrl('/apps/files_sharing/api/externalShares'), { id: share.id }) - .then(function() { - reloadFilesList() - }) - } else { - // Delete - $.ajax({ - url: generateUrl('/apps/files_sharing/api/externalShares/' + share.id), - type: 'DELETE', - }) - } - }, - ) - } - }) -} - -processIncomingShareFromUrl() - -if (loadState('federatedfilesharing', 'notificationsEnabled', true) !== true) { - // No notification app, display the modal - processSharesToConfirm() -} - -$('body').on('window.OCA.Notification.Action', function(e) { - if (e.notification.app === 'files_sharing' && e.notification.object_type === 'remote_share' && e.action.type === 'POST') { - // User accepted a remote share reload - reloadFilesList() + const { data: shares } = await axios.get(generateUrl('/apps/files_sharing/api/externalShares')) + for (let index = 0; index < shares.length; ++index) { + window.OCA.Sharing.showAddExternalDialog( + shares[index], + false, + function(result, share) { + if (result === false) { + // Delete + axios.delete(generateUrl('/apps/files_sharing/api/externalShares/' + share.id)) + } else { + // Accept + axios.post(generateUrl('/apps/files_sharing/api/externalShares'), { id: share.id }) + .then(() => reloadFilesList()) + } + }, + ) } -}) +} |