feat(files_sharing): add `new file request` option #46007

skjnldsv · 2024-06-20T12:03:37Z

closes #45446

apps/files_sharing/lib/Controller/ShareAPIController.php

lib/private/DB/QueryBuilder/QueryBuilder.php

lib/private/Share20/ShareAttributes.php

lib/public/Share/IShareProviderWithNotification.php

apps/sharebymail/lib/ShareByMailProvider.php

+				if ($passwordExpire === false || $share->getSendPasswordByTalk()) {
+					$send = $this->sendPassword($share, $share->getPassword());
+					if ($passwordEnforced && $send === false) {
+						$this->sendPasswordToOwner($share, $share->getPassword());


apps/sharebymail/lib/ShareByMailProvider.php

apps/files_sharing/lib/Controller/ShareAPIController.php

apps/sharebymail/lib/ShareByMailProvider.php

+				$passwordExpire = $this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false);
+				$passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
+				if ($passwordExpire === false || $share->getSendPasswordByTalk()) {
+					$send = $this->sendPassword($share, $share->getPassword(), $validEmails);


apps/sharebymail/lib/ShareByMailProvider.php

+
+		// The "Reply-To" is set to the sharer if an mail address is configured
+		// also the default footer contains a "Do not reply" which needs to be adjusted.
+		$initiatorEmail = $initiatorUser->getEMailAddress();


apps/sharebymail/lib/ShareByMailProvider.php

lib/private/DB/Connection.php

apps/files_sharing/lib/Controller/ShareAPIController.php

apps/files_sharing/src/components/NewFileRequestDialog/FileRequestDatePassword.vue

apps/files_sharing/src/components/NewFileRequestDialog/FileRequestFinish.vue

apps/files_sharing/src/components/NewFileRequestDialog.vue

apps/sharebymail/lib/ShareByMailProvider.php

come-nc

Reviewed PHP only, all good except from psalm errors to fix. (and openapi)

apps/files_sharing/lib/Controller/ShareAPIController.php

apps/sharebymail/lib/ShareByMailProvider.php

lib/composer/composer/installed.php

apps/files_sharing/src/models/Share.js

apps/files_sharing/src/new/newFileRequest.ts

lib/public/Share/IAttributes.php

susnux · 2024-07-09T10:05:28Z

apps/files_sharing/src/components/NewFileRequestDialog.vue

+			</NcButton>
+
+			<!-- Align right -->
+			<span class="dialog__actions-separator" />


Is this something the designers wanted? Because it breaks consistent style of dialog actions, the idea is to have it look always similar and on the time creating it was said that buttons should always be aligned on one side to not need to search the whole width of the element.

Because if this is something designers wanted we should change the way the dialog works.

I'll let them speak for themselves when I ask for a design review

susnux · 2024-07-09T10:06:51Z

apps/files_sharing/src/components/NewFileRequestDialog.vue

+import { generateOcsUrl } from '@nextcloud/router'
+import { getCapabilities } from '@nextcloud/capabilities'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import { translate, translatePlural } from '@nextcloud/l10n'


Suggested change

import { translate, translatePlural } from '@nextcloud/l10n'

import { n, t } from '@nextcloud/l10n'

We have the aliases, so we can use them. This also allows to not use this.t or this.n which is quite weird syntax as the translation methods are not bound to the component instance but only added as methods to be used in template.

apps/files_sharing/src/components/NewFileRequestDialog.vue

apps/files_sharing/src/components/NewFileRequestDialog/FileRequestIntro.vue

apps/files_sharing/src/components/SharingEntryLink.vue

susnux · 2024-07-09T10:21:52Z

apps/files_sharing/src/new/newFileRequest.ts

+		document.body.appendChild(mountingPoint)
+
+		// Init vue app
+		const NewFileRequestDialog = new Vue({


You can just use spawnDialog helper from @nextcloud/dialogs if you like :)

apps/sharebymail/lib/ShareByMailProvider.php

lib/private/Share20/DefaultShareProvider.php

+
+		// The "Reply-To" is set to the sharer if an mail address is configured
+		// also the default footer contains a "Do not reply" which needs to be adjusted.
+		if ($initiatorUser && $this->settingsManager->replyToInitiator()) {


apps/sharebymail/lib/ShareByMailProvider.php

+			throw new HintException(
+				'Failed to send share by mail',
+				$this->l->t('Failed to send share by email'),
+				$e->getCode(),


apps/sharebymail/lib/ShareByMailProvider.php

-			$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+		if ($initiatorUser && $this->settingsManager->replyToInitiator()) {
+			$initiatorEmail = $initiatorUser->getEMailAddress();
+			if ($initiatorEmail) {


apps/sharebymail/lib/ShareByMailProvider.php

+		// also the default footer contains a "Do not reply" which needs to be adjusted.
+		if ($initiatorUser && $this->settingsManager->replyToInitiator()) {
+			$initiatorEmail = $initiatorUser->getEMailAddress();
+			if ($initiatorEmail) {


susnux

thank you so much!

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

…actor sendMailNotification Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

… storing email arrays Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

nickvergessen · 2024-07-18T10:16:37Z

lib/public/Share/IAttributes.php

 	 * 		],
 	 * 	...
 	 * ]
 	 *
 	 * @return array formatted IAttributes
 	 * @since 25.0.0
+	 * @since 30.0.0, `enabled` was renamed to `value`


@skjnldsv Please document in https://docs.nextcloud.com/server/latest/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.html#id1

(escpecially this "breakage", but also all changes in lib/public/ (even if you type only))

Also FYI @tobiasKaminsky since this is actually used when you want to set the attribute through the OCS API.

which attribute? 🙈

Share attributes for the "Allow download" option on internal shares, not sure if clients make use of that

https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-share-api.html#share-attributes

nextcloud/documentation#12043

`enabled` is now `value`. See nextcloud/server#46007. Signed-off-by: Max <max@nextcloud.com>

skjnldsv self-assigned this Jun 20, 2024

skjnldsv added enhancement 2. developing Work in progress feature: sharing 🍂 2024-Autumn labels Jun 20, 2024

skjnldsv added this to the Nextcloud 30 milestone Jun 20, 2024

sorbaugh removed the 🍂 2024-Autumn label Jul 3, 2024

sorbaugh mentioned this pull request Jul 3, 2024

File request #45446

Closed

skjnldsv force-pushed the feat/files-request branch 2 times, most recently from 839db3d to 88cbafb Compare July 5, 2024 12:32

github-advanced-security bot found potential problems Jul 5, 2024

View reviewed changes

github-advanced-security bot found potential problems Jul 9, 2024

View reviewed changes

skjnldsv commented Jul 9, 2024

View reviewed changes

lib/private/DB/Connection.php Outdated Show resolved Hide resolved

skjnldsv force-pushed the feat/files-request branch from 5078c79 to e1f0d92 Compare July 9, 2024 09:58

susnux reviewed Jul 9, 2024

View reviewed changes

apps/files_sharing/src/components/NewFileRequestDialog.vue Show resolved Hide resolved

github-advanced-security bot found potential problems Jul 9, 2024

View reviewed changes

apps/sharebymail/lib/ShareByMailProvider.php Fixed Show fixed Hide fixed

come-nc approved these changes Jul 9, 2024

View reviewed changes

artonge reviewed Jul 9, 2024

View reviewed changes

apps/files_sharing/src/models/Share.js Show resolved Hide resolved

apps/files_sharing/src/new/newFileRequest.ts Outdated Show resolved Hide resolved

artonge reviewed Jul 9, 2024

View reviewed changes

lib/public/Share/IAttributes.php Show resolved Hide resolved

skjnldsv force-pushed the feat/files-request branch from e1f0d92 to b814a0f Compare July 9, 2024 10:25

susnux reviewed Jul 9, 2024

View reviewed changes

skjnldsv force-pushed the feat/files-request branch from b814a0f to 3eb2316 Compare July 9, 2024 13:38

jancborchardt requested a review from nimishavijay July 10, 2024 12:56

This comment was marked as resolved.

Sign in to view

skjnldsv force-pushed the feat/files-request branch 3 times, most recently from b29a7e6 to 3db5dbf Compare July 11, 2024 08:49

github-advanced-security bot found potential problems Jul 11, 2024

View reviewed changes

skjnldsv force-pushed the feat/files-request branch from 8b5ddaf to e16071a Compare July 11, 2024 13:17

skjnldsv force-pushed the feat/files-request branch from 7d41921 to a8bdf4a Compare July 12, 2024 13:50

Fenn-CS approved these changes Jul 12, 2024

View reviewed changes

skjnldsv force-pushed the feat/files-request branch from 3997925 to 51eeebe Compare July 12, 2024 14:19

skjnldsv enabled auto-merge July 12, 2024 14:20

susnux approved these changes Jul 12, 2024

View reviewed changes

skjnldsv and others added 16 commits July 12, 2024 20:14

chore(files_sharing): rename File drop to File requests

b6f635f

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

feat(files_sharing): add new file request option

443c48a

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

feat(files_sharing): implement IShareProviderWithNotification and ref…

d388370

…actor sendMailNotification Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

chore(files_sharing): refactor mail handling

c253112

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

feat(files_sharing): allow mixed values in share attributes and allow…

75ca494

… storing email arrays Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

fix(files_sharing): adjust NewFileRequestDialog for emails invites

0646280

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

chore(files_sharing): refactor sharing config

208ff80

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

chore(files_sharing): refactor share password mail

5ce4bb3

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

fix: psalm, cs, autoloader and lint

30f9ef4

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

fix: ARateLimit documentation

a65cdd1

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

chore(files_sharing): cleanup NewFileRequestDialog vue

bc5839e

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

fix(files_sharing): phpunit & openapi fixes

967b384

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

chore: compile assets

62defbd

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

fix(files_sharing): adjust IAttributes API and files_versions

9b84831

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

chore(files_sharing): lint & refactor fixes

df42a10

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

fix(files_sharing): fix label usage of file request feature

4b3aa01

Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

skjnldsv force-pushed the feat/files-request branch from 51eeebe to 4b3aa01 Compare July 12, 2024 18:14

skjnldsv merged commit 7773f1b into master Jul 12, 2024
166 checks passed

skjnldsv deleted the feat/files-request branch July 12, 2024 18:35

nickvergessen reviewed Jul 18, 2024

View reviewed changes

max-nextcloud added a commit to nextcloud/text that referenced this pull request Jul 18, 2024

fix(cy): adjust share test to api change

768c3a9

`enabled` is now `value`. See nextcloud/server#46007. Signed-off-by: Max <max@nextcloud.com>

max-nextcloud mentioned this pull request Jul 18, 2024

fix(cy): adjust share test to api change nextcloud/text#6060

Merged

2 tasks

skjnldsv mentioned this pull request Jul 19, 2024

feat: document newly added send-mail and share api changes nextcloud/documentation#12043

Merged

skjnldsv removed the pending documentation This pull request needs an associated documentation update label Jul 19, 2024

blizzz mentioned this pull request Jul 24, 2024

30.0.0 beta 1 #46713

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(files_sharing): add `new file request` option #46007

feat(files_sharing): add `new file request` option #46007

skjnldsv commented Jun 20, 2024

come-nc left a comment

susnux Jul 9, 2024

skjnldsv Jul 9, 2024

This comment was marked as resolved.

susnux Jul 9, 2024

susnux Jul 9, 2024

This comment was marked as resolved.

susnux left a comment

nickvergessen Jul 18, 2024

skjnldsv Jul 18, 2024

juliusknorr Jul 18, 2024

tobiasKaminsky Jul 19, 2024

juliusknorr Jul 19, 2024

skjnldsv Jul 19, 2024

	import { translate, translatePlural } from '@nextcloud/l10n'
	import { n, t } from '@nextcloud/l10n'

feat(files_sharing): add new file request option #46007

feat(files_sharing): add new file request option #46007

Conversation

skjnldsv commented Jun 20, 2024

come-nc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

susnux left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

feat(files_sharing): add `new file request` option #46007

feat(files_sharing): add `new file request` option #46007