Merge pull request #22338 from nextcloud/backport/22322/stable18

[stable18] Only copy the link when updating a share or no password was forced
nextcloud · Aug 21, 2020 · f80eaee · f80eaee
2 parents e1647c6 + 7fa81cb
commit f80eaee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -681,7 +681,11 @@ export default {
 				// Execute the copy link method
 				// freshly created share component
 				// ! somehow does not works on firefox !
-				component.copyLink()
+				if (update || !this.config.enforcePasswordForPublicLink) {
+					// Only copy the link when the password was not forced,
+					// otherwise the user needs to copy/paste the password before finishing the share.
+					component.copyLink()
+				}
 
 			} catch ({ response }) {
 				const message = response.data.ocs.meta.message