Extract enforce-password modal incl. closing logic

owncloud · May 23, 2022 · a60dff0 · a60dff0
1 parent e7011b7
commit a60dff0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -374,7 +374,6 @@ export default defineComponent({
 
       if (this.isPasswordEnforcedFor(link)) {
         showQuickLinkPasswordModal({ store: this.$store }, async (newPassword) => {
-          this.hideModal()
           this.createLink({ params: { ...paramsToCreate, password: newPassword }, onError })
         })
       } else {
@@ -387,7 +386,6 @@ export default defineComponent({
 
       if (!link.password && this.isPasswordEnforcedFor(link)) {
         showQuickLinkPasswordModal({ store: this.$store }, async (newPassword) => {
-          this.hideModal()
           this.updatePublicLink({ params: { ...params, password: newPassword }, onSuccess })
         })
       } else {

diff --git a/packages/web-app-files/src/quickActions.js b/packages/web-app-files/src/quickActions.js
@@ -30,7 +30,17 @@ export function showQuickLinkPasswordModal(ctx, onConfirm) {
     inputLabel: $gettext('Password'),
     onCancel: () => ctx.store.dispatch('hideModal'),
     inputDescription: $gettext('Passwords for links are required.'),
-    onConfirm: (password) => onConfirm(password),
+    onConfirm: async (password) => {
+      if (!password || password.trim() === '') {
+        ctx.store.dispatch('showMessage', {
+          title: $gettext('Password cannot be empty'),
+          status: 'danger'
+        })
+      } else {
+        await ctx.store.dispatch('hideModal')
+        onConfirm(password)
+      }
+    },
     onInput: (password) => {
       if (password.trim() === '') {
         return ctx.store.dispatch('setModalInputErrorMessage', $gettext('Password cannot be empty'))
@@ -61,13 +71,6 @@ export default {
 
       if (passwordEnforced) {
         return showQuickLinkPasswordModal(ctx, async (password) => {
-          if (!password || password.trim() === '') {
-            return ctx.store.dispatch('showMessage', {
-              title: $gettext('Password cannot be empty'),
-              status: 'danger'
-            })
-          }
-          ctx.store.dispatch('hideModal')
           await createQuicklink({ ...ctx, resource: ctx.item, password })
           await ctx.store.dispatch('Files/sidebar/openWithPanel', 'sharing-item')
         })