From 569b2e6253f08f624abe46371dcac3ceb9a5dda6 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 17:20:05 +0200
Subject: [PATCH 01/17] Fix extra empty line displayed

---
 .../web-app-files/src/components/Modals/SetLinkPasswordModal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
index 2b85590812d..943603de028 100644
--- a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
+++ b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
@@ -5,7 +5,6 @@
     type="password"
     :password-policy="inputPasswordPolicy"
     :generate-password-method="inputGeneratePasswordMethod"
-    :fix-message-line="true"
     :placeholder="link.hasPassword ? '●●●●●●●●' : null"
     :error-message="errorMessage"
     class="oc-modal-body-input"

From bcd81993344174c438699160cd2c6ca0ac093706 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 16:38:34 +0200
Subject: [PATCH 02/17] Init

---
 .../src/components/OcModal/OcModal.vue        |   4 -
 .../src/components/CreateLinkModal.vue        | 242 ++++++++++--------
 .../actions/files/useFileActionsCreateLink.ts |  15 +-
 3 files changed, 143 insertions(+), 118 deletions(-)

diff --git a/packages/design-system/src/components/OcModal/OcModal.vue b/packages/design-system/src/components/OcModal/OcModal.vue
index 45339f39197..df5decf40cf 100644
--- a/packages/design-system/src/components/OcModal/OcModal.vue
+++ b/packages/design-system/src/components/OcModal/OcModal.vue
@@ -499,10 +499,6 @@ export default defineComponent({
     line-height: 1.625;
     padding: var(--oc-space-medium) var(--oc-space-medium) 0;
 
-    span {
-      color: var(--oc-color-text-default);
-    }
-
     &-message {
       margin-bottom: var(--oc-space-medium);
       margin-top: var(--oc-space-small);
diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index 122254a6e55..ddf365aa4a9 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -1,46 +1,32 @@
 <template>
-  <div>
-    <oc-list class="role-dropdown-list">
-      <li v-for="(type, i) in availableLinkTypes" :key="`role-dropdown-${i}`">
-        <oc-button
-          :id="`files-role-${getLinkRoleByType(type).id}`"
-          :ref="(el) => (roleRefs[type] = el as RoleRef)"
-          :class="{
-            selected: isSelectedLinkType(type),
-            'oc-background-primary-gradient': isSelectedLinkType(type)
-          }"
-          :appearance="isSelectedLinkType(type) ? 'raw-inverse' : 'raw'"
-          :variation="isSelectedLinkType(type) ? 'primary' : 'passive'"
-          justify-content="space-between"
-          class="oc-p-s"
-          @click="updateSelectedLinkType(type)"
-        >
-          <span class="oc-flex oc-flex-middle">
-            <oc-icon
-              :name="getLinkRoleByType(type).icon"
-              class="oc-pl-s oc-pr-m"
-              variation="inherit"
-            />
-            <span>
-              <span
-                class="role-dropdown-list-option-label oc-text-bold oc-display-block oc-width-1-1"
-                v-text="$gettext(getLinkRoleByType(type).displayName)"
-              />
-              <span v-if="isSelectedLinkType(type)" class="oc-text-small">{{
-                $gettext(getLinkRoleByType(type).description)
-              }}</span>
-            </span>
-          </span>
-          <span class="oc-flex">
-            <oc-radio v-model="selectedType" :option="type" :hide-label="true" />
-          </span>
-        </oc-button>
-      </li>
-    </oc-list>
+  <div class="oc-flex oc-button-justify-content-space-between">
+    <div v-if="advancedMode" class="oc-flex oc-flex-middle">
+      <oc-icon class="oc-mr-s" :name="getLinkRoleByType(selectedType).icon" fill-type="line" />
+      <link-role-dropdown
+        :model-value="selectedType"
+        :available-link-type-options="availableLinkTypes"
+        drop-offset="0"
+        @update:model-value="updateSelectedLinkType"
+      />
+    </div>
+    <div v-else class="oc-flex oc-flex-middle">
+      <oc-icon class="oc-mr-s" :name="getLinkRoleByType(selectedType).icon" fill-type="line" />
+      <span v-text="$gettext(getLinkRoleByType(selectedType).description)" />
+    </div>
+    <oc-button
+      v-if="!advancedMode"
+      gap-size="xsmall"
+      appearance="raw"
+      variation="primary"
+      @click="setAdvancedMode()"
+    >
+      <oc-icon name="settings-3" size="small" fill-type="fill" />
+      <span v-text="$gettext('Options')" />
+    </oc-button>
   </div>
-  <div>
+  <div v-if="!onlyInternalLinksAllowed" class="link-modal-password oc-mt-s">
     <oc-text-input
-      v-if="!onlyInternalLinksAllowed"
+      v-if="advancedMode"
       :key="passwordInputKey"
       :model-value="password.value"
       type="password"
@@ -53,75 +39,81 @@
           : undefined
       "
       :label="passwordEnforced ? `${$gettext('Password')}*` : $gettext('Password')"
-      class="link-modal-password-input oc-mt-l"
+      class="link-modal-password-input"
       :disabled="selectedLinkTypeIsInternal"
       @update:model-value="updatePassword"
     />
+    <div v-else class="link-modal-password-text oc-text-small oc-text-muted">
+      <span v-text="$gettext('Password: ')" />
+      <span v-text="password.value" />
+    </div>
   </div>
-  <div class="link-modal-actions oc-flex oc-flex-right oc-flex-middle oc-mt-m">
-    <oc-icon
-      v-if="selectedExpiry"
-      v-oc-tooltip="expirationDateTooltip"
-      class="oc-mr-s"
-      :aria-label="expirationDateTooltip"
-      name="calendar-event"
-      fill-type="line"
-    />
-    <oc-button
-      v-if="!onlyInternalLinksAllowed"
-      id="link-modal-context-menu-toggle"
-      :aria-label="$gettext('More options')"
-      appearance="raw"
-    >
-      <oc-icon name="more-2" />
-    </oc-button>
-    <oc-drop
-      v-if="!onlyInternalLinksAllowed"
-      ref="contextMenuDrop"
-      drop-id="link-modal-context-menu-drop"
-      toggle="#link-modal-context-menu-toggle"
-      padding-size="small"
-      mode="click"
-    >
-      <oc-list class="link-modal-context-menu">
-        <li class="oc-rounded oc-menu-item-hover">
-          <oc-datepicker
-            v-model="selectedExpiry"
-            class="link-expiry-picker oc-flex oc-width-1-1"
-            :min-date="expirationRules.min"
-            :max-date="expirationRules.max"
-            :locale="$language.current"
-            :is-required="expirationRules.enforced"
-          >
-            <template #default="{ togglePopover }">
-              <oc-button
-                appearance="raw"
-                class="oc-p-s action-menu-item link-expiry-picker-btn"
-                :disabled="selectedLinkTypeIsInternal"
-                @click="togglePopover"
-              >
-                <oc-icon name="calendar-event" fill-type="line" size="medium" />
-                <span
-                  v-text="
-                    selectedExpiry
-                      ? $gettext('Edit expiration date')
-                      : $gettext('Set expiration date')
-                  "
-                />
-              </oc-button>
-              <oc-button
-                v-if="selectedExpiry"
-                :aria-label="$gettext('Remove expiration date')"
-                appearance="raw"
-                @click="selectedExpiry = undefined"
-              >
-                <oc-icon name="close" />
-              </oc-button>
-            </template>
-          </oc-datepicker>
-        </li>
-      </oc-list>
-    </oc-drop>
+  <div class="link-modal-actions oc-flex oc-flex-right oc-flex-middle oc-mt-s">
+    <div v-if="advancedMode" class="link-modal-actions-advanced">
+      <oc-icon
+        v-if="selectedExpiry"
+        v-oc-tooltip="expirationDateTooltip"
+        class="oc-mr-s"
+        :aria-label="expirationDateTooltip"
+        name="calendar-event"
+        fill-type="line"
+      />
+      <oc-button
+        v-if="!onlyInternalLinksAllowed"
+        id="link-modal-context-menu-toggle"
+        :aria-label="$gettext('More options')"
+        appearance="raw"
+      >
+        <oc-icon name="more-2" />
+      </oc-button>
+      <oc-drop
+        v-if="!onlyInternalLinksAllowed"
+        ref="contextMenuDrop"
+        drop-id="link-modal-context-menu-drop"
+        toggle="#link-modal-context-menu-toggle"
+        padding-size="small"
+        mode="click"
+      >
+        <oc-list class="link-modal-context-menu">
+          <li class="oc-rounded oc-menu-item-hover">
+            <oc-datepicker
+              v-model="selectedExpiry"
+              class="link-expiry-picker oc-flex oc-width-1-1"
+              :min-date="expirationRules.min"
+              :max-date="expirationRules.max"
+              :locale="$language.current"
+              :is-required="expirationRules.enforced"
+            >
+              <template #default="{ togglePopover }">
+                <oc-button
+                  appearance="raw"
+                  class="oc-p-s action-menu-item link-expiry-picker-btn"
+                  :disabled="selectedLinkTypeIsInternal"
+                  @click="togglePopover"
+                >
+                  <oc-icon name="calendar-event" fill-type="line" size="medium" />
+                  <span
+                    v-text="
+                      selectedExpiry
+                        ? $gettext('Edit expiration date')
+                        : $gettext('Set expiration date')
+                    "
+                  />
+                </oc-button>
+                <oc-button
+                  v-if="selectedExpiry"
+                  :aria-label="$gettext('Remove expiration date')"
+                  appearance="raw"
+                  @click="selectedExpiry = undefined"
+                >
+                  <oc-icon name="close" />
+                </oc-button>
+              </template>
+            </oc-datepicker>
+          </li>
+        </oc-list>
+      </oc-drop>
+    </div>
     <oc-button
       class="link-modal-cancel oc-modal-body-actions-cancel oc-ml-s"
       appearance="outline"
@@ -169,11 +161,14 @@ import { Resource } from '@ownclouders/web-client'
 import { formatRelativeDateFromDateTime } from '../helpers'
 import { OcButton, OcDrop } from 'design-system/src/components'
 import { SharingLinkType } from '@ownclouders/web-client/graph/generated'
+import { $gettext } from '../router/utils'
+import LinkRoleDropdown from './LinkRoleDropdown.vue'
 
 type RoleRef = ComponentPublicInstance<typeof OcButton>
 
 export default defineComponent({
   name: 'CreateLinkModal',
+  components: { LinkRoleDropdown },
   props: {
     modal: { type: Object as PropType<Modal>, required: true },
     resources: { type: Array as PropType<Resource[]>, required: true },
@@ -181,7 +176,7 @@ export default defineComponent({
     isQuickLink: { type: Boolean, default: false },
     callbackFn: {
       type: Function as PropType<
-        (result: PromiseSettledResult<LinkShare>[]) => Promise<void> | void
+        (result: PromiseSettledResult<LinkShare>[], password: string) => Promise<void> | void
       >,
       default: undefined
     }
@@ -202,13 +197,26 @@ export default defineComponent({
     } = useLinkTypes()
     const { addLink } = useSharesStore()
     const contextMenuDrop = ref<InstanceType<typeof OcDrop>>()
+    const advancedMode = ref(false)
 
     const passwordPolicy = passwordPolicyService.getPolicy()
 
     const isFolder = computed(() => props.resources.every(({ isFolder }) => isFolder))
 
     const confirmButtonText = computed(() => {
-      return unref(isEmbedEnabled) ? $gettext('Share link(s)') : $gettext('Copy link')
+      if (unref(isEmbedEnabled)) {
+        return $gettext('Share link(s)')
+      }
+
+      if (unref(selectedLinkTypeIsInternal)) {
+        return $gettext('Copy link')
+      }
+
+      if (unref(passwordEnforced) || unref(password)) {
+        return $gettext('Copy link and password')
+      }
+
+      return $gettext('Copy link')
     })
 
     const passwordInputKey = ref(uuidV4())
@@ -250,6 +258,10 @@ export default defineComponent({
       )
     })
 
+    const setAdvancedMode = () => {
+      advancedMode.value = true
+    }
+
     const createLinks = () => {
       return Promise.allSettled<LinkShare>(
         props.resources.map((resource) =>
@@ -277,6 +289,7 @@ export default defineComponent({
         }
 
         if (!passwordPolicy.check(unref(password).value)) {
+          password.error = $gettext('Password must fulfill the password policy')
           return Promise.reject()
         }
       }
@@ -313,7 +326,7 @@ export default defineComponent({
       }
 
       if (props.callbackFn) {
-        props.callbackFn(result)
+        props.callbackFn(result, password.value)
       }
     }
 
@@ -344,6 +357,10 @@ export default defineComponent({
       if (activeRoleOption) {
         activeRoleOption.$el.focus()
       }
+
+      if (unref(passwordEnforced)) {
+        password.value = passwordPolicyService.generatePassword()
+      }
     })
 
     watch(selectedExpiry, () => {
@@ -370,11 +387,14 @@ export default defineComponent({
       updatePassword,
       getLinkRoleByType,
       confirmButtonText,
+      advancedMode,
+      setAdvancedMode,
 
       // unit tests
       onConfirm
     }
-  }
+  },
+  methods: { $gettext }
 })
 </script>
 
@@ -384,6 +404,10 @@ export default defineComponent({
   justify-content: flex-start;
 }
 
+.link-modal-password {
+  margin-left: calc(var(--oc-space-small) + 22px);
+}
+
 .role-dropdown-list span {
   line-height: 1.3;
 }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
index 636279ecaa2..0ec71acb17a 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
@@ -38,7 +38,7 @@ export const useFileActionsCreateLink = ({
   const { dispatchModal } = useModals()
   const { copyToClipboard } = useClipboard()
 
-  const proceedResult = async (result: PromiseSettledResult<LinkShare>[]) => {
+  const proceedResult = async (result: PromiseSettledResult<LinkShare>[], password: '') => {
     const succeeded = result.filter(
       (val): val is PromiseFulfilledResult<LinkShare> => val.status === 'fulfilled'
     )
@@ -49,7 +49,12 @@ export const useFileActionsCreateLink = ({
       if (result.length === 1) {
         // Only copy to clipboard if the user tries to create one single link
         try {
-          await copyToClipboard(succeeded[0].value.webUrl)
+          const copyToClipboardText = password
+            ? `Link:${succeeded[0].value.webUrl} Password:${password}`
+            : succeeded[0].value.webUrl
+
+          console.log(copyToClipboardText)
+          await copyToClipboard(copyToClipboardText)
           successMessage = $gettext('The link has been copied to your clipboard.')
         } catch (e) {
           console.warn('Unable to copy link to clipboard', e)
@@ -88,8 +93,8 @@ export const useFileActionsCreateLink = ({
     if (enforceModal || (passwordEnforced && unref(defaultLinkType) !== SharingLinkType.Internal)) {
       dispatchModal({
         title: $ngettext(
-          'Create link for "%{resourceName}"',
-          'Create links for the selected items',
+          'Copy link for "%{resourceName}"',
+          'Copy links for the selected items',
           resources.length,
           { resourceName: resources[0].name }
         ),
@@ -119,7 +124,7 @@ export const useFileActionsCreateLink = ({
     )
     const result = await loadingService.addTask(() => Promise.allSettled<LinkShare>(promises))
 
-    proceedResult(result)
+    proceedResult(result, '')
   }
 
   const isVisible = ({ resources }: FileActionOptions) => {

From 58be7160fc5eb8a66767121278997d2720f5d6dc Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 17:15:22 +0200
Subject: [PATCH 03/17] Passwords can be empty

---
 .../components/Modals/SetLinkPasswordModal.vue |  2 +-
 .../web-pkg/src/components/CreateLinkModal.vue | 14 ++++++++------
 .../services/passwordPolicy/passwordPolicy.ts  | 18 ++++--------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
index 943603de028..2382403319d 100644
--- a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
+++ b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
@@ -92,7 +92,7 @@ export default defineComponent({
       onInput,
       errorMessage,
       passwordPolicyService,
-      inputPasswordPolicy: passwordPolicyService.getPolicy(),
+      inputPasswordPolicy: passwordPolicyService.getPolicy({ enforcePassword: true }),
       inputGeneratePasswordMethod: () => passwordPolicyService.generatePassword(),
 
       // unit tests
diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index ddf365aa4a9..44506ea1c4b 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -1,11 +1,10 @@
 <template>
-  <div class="oc-flex oc-button-justify-content-space-between">
+  <div class="oc-flex oc-button-justify-content-space-between oc-pb-s">
     <div v-if="advancedMode" class="oc-flex oc-flex-middle">
       <oc-icon class="oc-mr-s" :name="getLinkRoleByType(selectedType).icon" fill-type="line" />
       <link-role-dropdown
         :model-value="selectedType"
         :available-link-type-options="availableLinkTypes"
-        drop-offset="0"
         @update:model-value="updateSelectedLinkType"
       />
     </div>
@@ -24,7 +23,7 @@
       <span v-text="$gettext('Options')" />
     </oc-button>
   </div>
-  <div v-if="!onlyInternalLinksAllowed" class="link-modal-password oc-mt-s">
+  <div v-if="!onlyInternalLinksAllowed" class="link-modal-password">
     <oc-text-input
       v-if="advancedMode"
       :key="passwordInputKey"
@@ -43,7 +42,7 @@
       :disabled="selectedLinkTypeIsInternal"
       @update:model-value="updatePassword"
     />
-    <div v-else class="link-modal-password-text oc-text-small oc-text-muted">
+    <div v-else-if="password.value" class="link-modal-password-text oc-text-small oc-text-muted">
       <span v-text="$gettext('Password: ')" />
       <span v-text="password.value" />
     </div>
@@ -68,6 +67,7 @@
       </oc-button>
       <oc-drop
         v-if="!onlyInternalLinksAllowed"
+        X
         ref="contextMenuDrop"
         drop-id="link-modal-context-menu-drop"
         toggle="#link-modal-context-menu-toggle"
@@ -199,8 +199,6 @@ export default defineComponent({
     const contextMenuDrop = ref<InstanceType<typeof OcDrop>>()
     const advancedMode = ref(false)
 
-    const passwordPolicy = passwordPolicyService.getPolicy()
-
     const isFolder = computed(() => props.resources.every(({ isFolder }) => isFolder))
 
     const confirmButtonText = computed(() => {
@@ -229,6 +227,10 @@ export default defineComponent({
     const availableLinkTypes = computed(() => getAvailableLinkTypes({ isFolder: unref(isFolder) }))
     const passwordEnforced = computed(() => isPasswordEnforcedForLinkType(unref(selectedType)))
 
+    const passwordPolicy = passwordPolicyService.getPolicy({
+      enforcePassword: unref(passwordEnforced)
+    })
+
     const selectedLinkTypeIsInternal = computed(
       () => unref(selectedType) === SharingLinkType.Internal
     )
diff --git a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
index a1cb6f2d516..45dc9a168a9 100644
--- a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
+++ b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
@@ -35,17 +35,6 @@ export class PasswordPolicyService {
   public initialize(capabilityStore: CapabilityStore) {
     this.capability = capabilityStore.passwordPolicy
     this.buildGeneratePasswordRules()
-    this.buildPolicy()
-  }
-
-  private useDefaultRules(): boolean {
-    return (
-      !this.capability.min_characters &&
-      !this.capability.min_lowercase_characters &&
-      !this.capability.min_uppercase_characters &&
-      !this.capability.min_digits &&
-      !this.capability.min_special_characters
-    )
   }
 
   private buildGeneratePasswordRules(): void {
@@ -80,7 +69,7 @@ export class PasswordPolicyService {
     }
   }
 
-  private buildPolicy(): void {
+  private buildPolicy({ enforcePassword = false } = {}): void {
     const ruleset = {
       atLeastCharacters: new AtLeastCharactersRule({ ...this.language }),
       mustNotBeEmpty: new MustNotBeEmptyRule({ ...this.language }),
@@ -91,7 +80,7 @@ export class PasswordPolicyService {
     }
     const rules = {} as Record<string, unknown>
 
-    if (this.useDefaultRules()) {
+    if (enforcePassword) {
       rules.mustNotBeEmpty = {}
     }
 
@@ -125,7 +114,8 @@ export class PasswordPolicyService {
     this.policy = new PasswordPolicy(rules, ruleset)
   }
 
-  public getPolicy(): PasswordPolicy {
+  public getPolicy({ enforcePassword = false } = {}): PasswordPolicy {
+    this.buildPolicy({ enforcePassword })
     return this.policy
   }
 

From 2b1f71ff6d017f0183ce445a8f54bd801b9f221f Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 17:17:05 +0200
Subject: [PATCH 04/17] Remove password empty check as already fulfilled by
 password policy

---
 packages/web-pkg/src/components/CreateLinkModal.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index 44506ea1c4b..26793d26f58 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -285,11 +285,6 @@ export default defineComponent({
 
     const onConfirm = async () => {
       if (!unref(selectedLinkTypeIsInternal)) {
-        if (unref(passwordEnforced) && !unref(password).value) {
-          password.error = $gettext('Password must not be empty')
-          return Promise.reject()
-        }
-
         if (!passwordPolicy.check(unref(password).value)) {
           password.error = $gettext('Password must fulfill the password policy')
           return Promise.reject()

From b6a43e77bcba52e1610118a8ae3d3115144bdb77 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 17:27:08 +0200
Subject: [PATCH 05/17] Don't show extra must not be empty rule, when password
 is enforced but there are already policies, remove extra line on add link
 modal

---
 .../src/services/passwordPolicy/passwordPolicy.ts    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
index 45dc9a168a9..be4642f5a29 100644
--- a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
+++ b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
@@ -37,6 +37,16 @@ export class PasswordPolicyService {
     this.buildGeneratePasswordRules()
   }
 
+  private hasRules(): boolean {
+    return (
+      !!this.capability.min_characters ||
+      !!this.capability.min_lowercase_characters ||
+      !!this.capability.min_uppercase_characters ||
+      !!this.capability.min_digits ||
+      !!this.capability.min_special_characters
+    )
+  }
+
   private buildGeneratePasswordRules(): void {
     const DEFAULT_LENGTH = 12
     const DEFAULT_MIN_LOWERCASE_CHARACTERS = 2
@@ -80,7 +90,7 @@ export class PasswordPolicyService {
     }
     const rules = {} as Record<string, unknown>
 
-    if (enforcePassword) {
+    if (enforcePassword && !this.hasRules()) {
       rules.mustNotBeEmpty = {}
     }
 

From 537db72f585c94ee28b5cea1826e09e273486028 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 20:31:16 +0200
Subject: [PATCH 06/17] enhance passwordPolicy tests

---
 .../unit/services/passwordPolicy.spec.ts      | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts b/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts
index b840c8335ed..90e14e964f5 100644
--- a/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts
+++ b/packages/web-pkg/tests/unit/services/passwordPolicy.spec.ts
@@ -3,12 +3,41 @@ import { createTestingPinia } from 'web-test-helpers'
 import { Language } from 'vue3-gettext'
 import { PasswordPolicyCapability } from '@ownclouders/web-client/ocs'
 import { useCapabilityStore } from '../../../src/composables/piniaStores'
+import { describe } from 'vitest'
 
 describe('PasswordPolicyService', () => {
   describe('policy', () => {
+    describe('mustNotBeEmpty rule', () => {
+      it('is present when "enforcePassword" is set', () => {
+        {
+          const { passwordPolicyService, store } = getWrapper({} as PasswordPolicyCapability)
+          passwordPolicyService.initialize(store)
+          expect(
+            Object.keys(passwordPolicyService.getPolicy({ enforcePassword: true }).rules)
+          ).toEqual(['mustNotBeEmpty'])
+        }
+      })
+      it('is not present when "enforcePassword" is set but other rules apply', () => {
+        {
+          const { passwordPolicyService, store } = getWrapper({
+            min_characters: 2
+          } as PasswordPolicyCapability)
+          passwordPolicyService.initialize(store)
+          expect(
+            Object.keys(passwordPolicyService.getPolicy({ enforcePassword: true }).rules)
+          ).toEqual(['atLeastCharacters'])
+        }
+      })
+      it('is not present when "enforcePassword" is not set', () => {
+        {
+          const { passwordPolicyService, store } = getWrapper({} as PasswordPolicyCapability)
+          passwordPolicyService.initialize(store)
+          expect(Object.keys(passwordPolicyService.getPolicy({}).rules)).toEqual([])
+        }
+      })
+    })
     describe('contains the rules according to the capability', () => {
       it.each([
-        [{} as PasswordPolicyCapability, ['mustNotBeEmpty']],
         [{ min_characters: 2 } as PasswordPolicyCapability, ['atLeastCharacters']],
         [
           { min_lowercase_characters: 2 } as PasswordPolicyCapability,
@@ -46,30 +75,36 @@ describe('PasswordPolicyService', () => {
     describe('method "check"', () => {
       describe('test the password correctly against te defined rules', () => {
         it.each([
-          [{} as PasswordPolicyCapability, ['', 'o'], [false, true]],
+          [{} as PasswordPolicyCapability, ['', 'o'], true, [false, true]],
+          [{} as PasswordPolicyCapability, ['', 'o'], false, [true, true]],
           [
             { min_characters: 2 } as PasswordPolicyCapability,
             ['', 'o', 'ow', 'ownCloud'],
+            false,
             [false, false, true, true]
           ],
           [
             { min_lowercase_characters: 2 } as PasswordPolicyCapability,
             ['', 'o', 'oWNCLOUD', 'ownCloud'],
+            false,
             [false, false, false, true]
           ],
           [
             { min_uppercase_characters: 2 } as PasswordPolicyCapability,
             ['', 'o', 'ownCloud', 'ownCLoud'],
+            false,
             [false, false, false, true]
           ],
           [
             { min_digits: 2 } as PasswordPolicyCapability,
             ['', '1', 'ownCloud1', 'ownCloud12'],
+            false,
             [false, false, false, true]
           ],
           [
             { min_special_characters: 2 } as PasswordPolicyCapability,
             ['', '!', 'ownCloud!', 'ownCloud!#'],
+            false,
             [false, false, false, true]
           ],
           [
@@ -82,6 +117,7 @@ describe('PasswordPolicyService', () => {
               max_characters: 72
             } as PasswordPolicyCapability,
             ['öwnCloud', 'öwnCloudää', 'öwnCloudää12', 'öwnCloudäÄ12#!'],
+            false,
             [false, false, false, true]
           ]
         ])(
@@ -89,11 +125,12 @@ describe('PasswordPolicyService', () => {
           (
             capability: PasswordPolicyCapability,
             passwords: Array<string>,
+            enforcePassword: boolean,
             expected: Array<boolean>
           ) => {
             const { passwordPolicyService, store } = getWrapper(capability)
             passwordPolicyService.initialize(store)
-            const policy = passwordPolicyService.getPolicy()
+            const policy = passwordPolicyService.getPolicy({ enforcePassword })
             for (let i = 0; i < passwords.length; i++) {
               expect(policy.check(passwords[i])).toEqual(expected[i])
             }

From 488f77788299b55efe1230813654b419a9aabed1 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 20:47:59 +0200
Subject: [PATCH 07/17] Add tests for simple mode

---
 .../src/components/CreateLinkModal.vue        |  2 +-
 .../unit/components/CreateLinkModal.spec.ts   | 53 +++++++++++++------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index 26793d26f58..1aaed7fee16 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -67,8 +67,8 @@
       </oc-button>
       <oc-drop
         v-if="!onlyInternalLinksAllowed"
-        X
         ref="contextMenuDrop"
+        X
         drop-id="link-modal-context-menu-drop"
         toggle="#link-modal-context-menu-toggle"
         padding-size="small"
diff --git a/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
index 1b849f10046..a8df4c76523 100644
--- a/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
@@ -7,7 +7,7 @@ import { AbilityRule, LinkShare, Resource, ShareRole } from '@ownclouders/web-cl
 import { PasswordPolicy } from 'design-system/src/helpers'
 import { useEmbedMode } from '../../../src/composables/embedMode'
 import { useLinkTypes } from '../../../src/composables/links'
-import { ref } from 'vue'
+import { nextTick, ref } from 'vue'
 import { CapabilityStore, useSharesStore } from '../../../src/composables/piniaStores'
 import { SharingLinkType } from '@ownclouders/web-client/graph/generated'
 
@@ -23,17 +23,28 @@ const selectors = {
   roleElements: '.role-dropdown-list li',
   contextMenuToggle: '#link-modal-context-menu-toggle',
   confirmBtn: '.link-modal-confirm',
-  cancelBtn: '.link-modal-cancel'
+  cancelBtn: '.link-modal-cancel',
+  linkRoleDropDownToggle: '.link-role-dropdown-toggle'
 }
 
 describe('CreateLinkModal', () => {
   describe('password input', () => {
-    it('should be rendered', () => {
+    it('should not rendered when "advancedMode" is not set', async () => {
       const { wrapper } = getWrapper()
+      wrapper.vm.advancedMode = false
+      await nextTick()
+      expect(wrapper.find(selectors.passwordInput).exists()).toBeFalsy()
+    })
+    it('should be rendered', async () => {
+      const { wrapper } = getWrapper()
+      wrapper.vm.advancedMode = true
+      await nextTick()
       expect(wrapper.find(selectors.passwordInput).exists()).toBeTruthy()
     })
-    it('should be disabled for internal links', () => {
+    it('should be disabled for internal links', async () => {
       const { wrapper } = getWrapper({ defaultLinkType: SharingLinkType.Internal })
+      wrapper.vm.advancedMode = true
+      await nextTick()
       expect(wrapper.find(selectors.passwordInput).attributes('disabled')).toBeTruthy()
     })
     it('should not be rendered if user cannot create public links', () => {
@@ -45,21 +56,38 @@ describe('CreateLinkModal', () => {
       expect(wrapper.find(selectors.passwordInput).exists()).toBeFalsy()
     })
   })
-  describe('link role select', () => {
-    it('lists all types as roles', () => {
+  describe('link role drop', () => {
+    it('should not rendered when "advancedMode" is not set', async () => {
+      const { wrapper } = getWrapper()
+      wrapper.vm.advancedMode = false
+      await nextTick()
+      expect(wrapper.find(selectors.linkRoleDropDownToggle).exists()).toBeFalsy()
+    })
+    it('lists all types as roles', async () => {
       const availableLinkTypes = [
         SharingLinkType.View,
         SharingLinkType.Internal,
         SharingLinkType.Edit
       ]
       const { wrapper } = getWrapper({ availableLinkTypes })
+      wrapper.vm.advancedMode = true
+      await nextTick()
+      await wrapper.find(selectors.linkRoleDropDownToggle).trigger('click')
 
       expect(wrapper.findAll(selectors.roleElements).length).toBe(availableLinkTypes.length)
     })
   })
   describe('context menu', () => {
-    it('should display the button to toggle the context menu', () => {
+    it('should not rendered when "advancedMode" is not set', async () => {
+      const { wrapper } = getWrapper()
+      wrapper.vm.advancedMode = false
+      await nextTick()
+      expect(wrapper.find(selectors.contextMenuToggle).exists()).toBeFalsy()
+    })
+    it('should display the button to toggle the context menu', async () => {
       const { wrapper } = getWrapper()
+      wrapper.vm.advancedMode = true
+      await nextTick()
       expect(wrapper.find(selectors.contextMenuToggle).exists()).toBeTruthy()
     })
     it('should not display the button to toggle the context menu if user cannot create public links', () => {
@@ -72,19 +100,12 @@ describe('CreateLinkModal', () => {
     })
   })
   describe('method "confirm"', () => {
-    it('shows an error if a password is enforced but empty', async () => {
-      vi.spyOn(console, 'error').mockImplementation(undefined)
-      const { wrapper } = getWrapper({ passwordEnforced: true })
-      try {
-        await wrapper.vm.onConfirm()
-      } catch (error) {}
-
-      expect(wrapper.vm.password.error).toBeDefined()
-    })
     it('does not create links when the password policy is not fulfilled', async () => {
       vi.spyOn(console, 'error').mockImplementation(undefined)
       const callbackFn = vi.fn()
       const { wrapper } = getWrapper({ passwordPolicyFulfilled: false, callbackFn })
+      wrapper.vm.advancedMode = true
+      await nextTick()
       try {
         await wrapper.vm.onConfirm()
       } catch (error) {}

From 2ea35346741471bd18960d490071b0d0e616a821 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 31 Jul 2024 21:16:48 +0200
Subject: [PATCH 08/17] Remove weird callback orgy, where links were copied
 multiple times to clipboard

---
 .../src/components/CreateLinkModal.vue        | 11 ++++---
 .../files/useFileActionsCopyQuicklink.ts      | 12 +------
 .../actions/files/useFileActionsCreateLink.ts | 33 ++++++++-----------
 3 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index 1aaed7fee16..a40aea592b0 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -166,6 +166,11 @@ import LinkRoleDropdown from './LinkRoleDropdown.vue'
 
 type RoleRef = ComponentPublicInstance<typeof OcButton>
 
+interface CallbackArgs {
+  result: PromiseSettledResult<LinkShare>[]
+  password: string
+}
+
 export default defineComponent({
   name: 'CreateLinkModal',
   components: { LinkRoleDropdown },
@@ -175,9 +180,7 @@ export default defineComponent({
     space: { type: Object as PropType<SpaceResource>, default: undefined },
     isQuickLink: { type: Boolean, default: false },
     callbackFn: {
-      type: Function as PropType<
-        (result: PromiseSettledResult<LinkShare>[], password: string) => Promise<void> | void
-      >,
+      type: Function as PropType<(args: CallbackArgs) => Promise<void> | void>,
       default: undefined
     }
   },
@@ -323,7 +326,7 @@ export default defineComponent({
       }
 
       if (props.callbackFn) {
-        props.callbackFn(result, password.value)
+        props.callbackFn({ result, password: password.value })
       }
     }
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
index 798216617e6..36d0a0dcdec 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
@@ -1,4 +1,4 @@
-import { isLinkShare, LinkShare } from '@ownclouders/web-client'
+import { isLinkShare } from '@ownclouders/web-client'
 import { computed, unref } from 'vue'
 import { useClientService } from '../../clientService'
 import { useGettext } from 'vue3-gettext'
@@ -17,17 +17,7 @@ export const useFileActionsCopyQuickLink = () => {
   const { canShare } = useCanShare()
   const { copyToClipboard } = useClipboard()
 
-  const onLinkCreatedCallback = async (result: PromiseSettledResult<LinkShare>[]) => {
-    const link = result.find(
-      (val): val is PromiseFulfilledResult<LinkShare> => val.status === 'fulfilled'
-    )
-    if (link?.value) {
-      await copyQuickLinkToClipboard(link.value.webUrl)
-    }
-  }
-
   const { actions: createLinkActions } = useFileActionsCreateLink({
-    onLinkCreatedCallback,
     showMessages: false
   })
   const createQuicklinkAction = computed<FileAction>(() =>
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
index 0ec71acb17a..a408351e4aa 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
@@ -18,13 +18,9 @@ import { useClientService } from '../../clientService'
 import { SharingLinkType } from '@ownclouders/web-client/graph/generated'
 
 export const useFileActionsCreateLink = ({
-  enforceModal = false,
-  showMessages = true,
-  onLinkCreatedCallback = undefined
+  enforceModal = false
 }: {
   enforceModal?: boolean
-  showMessages?: boolean
-  onLinkCreatedCallback?: (result: PromiseSettledResult<LinkShare>[]) => Promise<void> | void
 } = {}) => {
   const clientService = useClientService()
   const userStore = useUserStore()
@@ -38,7 +34,14 @@ export const useFileActionsCreateLink = ({
   const { dispatchModal } = useModals()
   const { copyToClipboard } = useClipboard()
 
-  const proceedResult = async (result: PromiseSettledResult<LinkShare>[], password: '') => {
+  const proceedResult = async ({
+    result,
+    password
+  }: {
+    result: PromiseSettledResult<LinkShare>[]
+    password?: string
+  }) => {
+    console.log(password)
     const succeeded = result.filter(
       (val): val is PromiseFulfilledResult<LinkShare> => val.status === 'fulfilled'
     )
@@ -61,15 +64,9 @@ export const useFileActionsCreateLink = ({
         }
       }
 
-      if (showMessages) {
-        showMessage({
-          title: $ngettext(
-            successMessage,
-            'Links have been created successfully.',
-            succeeded.length
-          )
-        })
-      }
+      showMessage({
+        title: $ngettext(successMessage, 'Links have been created successfully.', succeeded.length)
+      })
     }
 
     const failed = result.filter(({ status }) => status === 'rejected')
@@ -79,10 +76,6 @@ export const useFileActionsCreateLink = ({
         title: $ngettext('Failed to create link', 'Failed to create links', failed.length)
       })
     }
-
-    if (onLinkCreatedCallback) {
-      onLinkCreatedCallback(result)
-    }
   }
 
   const handler = async (
@@ -124,7 +117,7 @@ export const useFileActionsCreateLink = ({
     )
     const result = await loadingService.addTask(() => Promise.allSettled<LinkShare>(promises))
 
-    proceedResult(result, '')
+    proceedResult({ result })
   }
 
   const isVisible = ({ resources }: FileActionOptions) => {

From dfefb8be6b72b070d52244553cc7556b8d322977 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 10:12:19 +0200
Subject: [PATCH 09/17] Cleanup

---
 .../src/components/CreateLinkModal.vue        |  4 +-
 .../files/useFileActionsCopyQuicklink.ts      |  4 +-
 .../actions/files/useFileActionsCreateLink.ts |  7 ++--
 .../files/useFileActionsCreateLink.spec.ts    | 37 ++-----------------
 4 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index a40aea592b0..a1b7ec21075 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -161,7 +161,6 @@ import { Resource } from '@ownclouders/web-client'
 import { formatRelativeDateFromDateTime } from '../helpers'
 import { OcButton, OcDrop } from 'design-system/src/components'
 import { SharingLinkType } from '@ownclouders/web-client/graph/generated'
-import { $gettext } from '../router/utils'
 import LinkRoleDropdown from './LinkRoleDropdown.vue'
 
 type RoleRef = ComponentPublicInstance<typeof OcButton>
@@ -393,8 +392,7 @@ export default defineComponent({
       // unit tests
       onConfirm
     }
-  },
-  methods: { $gettext }
+  }
 })
 </script>
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
index 36d0a0dcdec..aea399a47c6 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
@@ -17,9 +17,7 @@ export const useFileActionsCopyQuickLink = () => {
   const { canShare } = useCanShare()
   const { copyToClipboard } = useClipboard()
 
-  const { actions: createLinkActions } = useFileActionsCreateLink({
-    showMessages: false
-  })
+  const { actions: createLinkActions } = useFileActionsCreateLink()
   const createQuicklinkAction = computed<FileAction>(() =>
     unref(createLinkActions).find(({ name }) => name === 'create-quick-links')
   )
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
index a408351e4aa..596e49807fe 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
@@ -41,7 +41,6 @@ export const useFileActionsCreateLink = ({
     result: PromiseSettledResult<LinkShare>[]
     password?: string
   }) => {
-    console.log(password)
     const succeeded = result.filter(
       (val): val is PromiseFulfilledResult<LinkShare> => val.status === 'fulfilled'
     )
@@ -53,10 +52,12 @@ export const useFileActionsCreateLink = ({
         // Only copy to clipboard if the user tries to create one single link
         try {
           const copyToClipboardText = password
-            ? `Link:${succeeded[0].value.webUrl} Password:${password}`
+            ? $gettext('Link:%{link} Password:%{password}', {
+                link: succeeded[0].value.webUrl,
+                password
+              })
             : succeeded[0].value.webUrl
 
-          console.log(copyToClipboardText)
           await copyToClipboard(copyToClipboardText)
           successMessage = $gettext('The link has been copied to your clipboard.')
         } catch (e) {
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts
index ba8943b92a3..a93599430cd 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts
@@ -8,7 +8,7 @@ import {
 } from '../../../../../src/composables/piniaStores'
 import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { mock } from 'vitest-mock-extended'
-import { LinkShare, Resource, SpaceResource } from '@ownclouders/web-client'
+import { Resource, SpaceResource } from '@ownclouders/web-client'
 import { SharingLinkType } from '@ownclouders/web-client/graph/generated'
 import { useLinkTypes } from '../../../../../src/composables/links/useLinkTypes'
 
@@ -118,32 +118,6 @@ describe('useFileActionsCreateLink', () => {
         }
       })
     })
-    it('calls the onLinkCreatedCallback if given', () => {
-      const onLinkCreatedCallback = vi.fn()
-      getWrapper({
-        onLinkCreatedCallback,
-        setup: async ({ actions }) => {
-          await unref(actions)[0].handler({
-            resources: [mock<Resource>({ canShare: () => true })],
-            space: undefined
-          })
-          expect(onLinkCreatedCallback).toHaveBeenCalledTimes(1)
-        }
-      })
-    })
-    it('does not show messages if disabled', () => {
-      getWrapper({
-        showMessages: false,
-        setup: async ({ actions }) => {
-          await unref(actions)[0].handler({
-            resources: [mock<Resource>({ canShare: () => true })],
-            space: undefined
-          })
-          const { showMessage } = useMessages()
-          expect(showMessage).not.toHaveBeenCalled()
-        }
-      })
-    })
   })
 })
 
@@ -151,9 +125,7 @@ function getWrapper({
   setup,
   enforceModal = false,
   passwordEnforced = false,
-  defaultLinkType = SharingLinkType.View,
-  onLinkCreatedCallback = undefined,
-  showMessages = true
+  defaultLinkType = SharingLinkType.View
 }: {
   setup: (
     instance: ReturnType<typeof useFileActionsCreateLink>,
@@ -162,7 +134,6 @@ function getWrapper({
   enforceModal?: boolean
   passwordEnforced?: boolean
   defaultLinkType?: SharingLinkType
-  onLinkCreatedCallback?: (result: PromiseSettledResult<LinkShare>[]) => Promise<void> | void
   showMessages?: boolean
 }) {
   vi.mocked(useLinkTypes).mockReturnValue(
@@ -178,9 +149,7 @@ function getWrapper({
     wrapper: getComposableWrapper(
       () => {
         const instance = useFileActionsCreateLink({
-          enforceModal,
-          showMessages,
-          onLinkCreatedCallback
+          enforceModal
         })
         setup(instance, { mocks })
       },

From 8b1537bb535c67e8c674fcdde57d7e6ae44dd233 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 11:04:03 +0200
Subject: [PATCH 10/17] Cleanup

---
 .../web-pkg/src/components/CreateLinkModal.vue    | 15 +++++++++++----
 .../tests/unit/components/CreateLinkModal.spec.ts |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index a1b7ec21075..f14fcc49b76 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="oc-flex oc-button-justify-content-space-between oc-pb-s">
     <div v-if="advancedMode" class="oc-flex oc-flex-middle">
-      <oc-icon class="oc-mr-s" :name="getLinkRoleByType(selectedType).icon" fill-type="line" />
+      <oc-icon class="oc-mr-s" :name="selectedTypeIcon" fill-type="line" />
       <link-role-dropdown
         :model-value="selectedType"
         :available-link-type-options="availableLinkTypes"
@@ -9,8 +9,8 @@
       />
     </div>
     <div v-else class="oc-flex oc-flex-middle">
-      <oc-icon class="oc-mr-s" :name="getLinkRoleByType(selectedType).icon" fill-type="line" />
-      <span v-text="$gettext(getLinkRoleByType(selectedType).description)" />
+      <oc-icon class="oc-mr-s" :name="selectedTypeIcon" fill-type="line" />
+      <span v-text="selectedTypeDescription" />
     </div>
     <oc-button
       v-if="!advancedMode"
@@ -222,9 +222,14 @@ export default defineComponent({
     const passwordInputKey = ref(uuidV4())
     const roleRefs = ref<Record<string, RoleRef>>({})
 
+    const selectedExpiry = ref<Date>()
     const password = reactive({ value: '', error: undefined })
     const selectedType = ref(unref(defaultLinkType))
-    const selectedExpiry = ref<Date>()
+
+    const selectedTypeDescription = computed(() =>
+      $gettext(getLinkRoleByType(unref(selectedType)).description)
+    )
+    const selectedTypeIcon = computed(() => getLinkRoleByType(unref(selectedType)).icon)
 
     const availableLinkTypes = computed(() => getAvailableLinkTypes({ isFolder: unref(isFolder) }))
     const passwordEnforced = computed(() => isPasswordEnforcedForLinkType(unref(selectedType)))
@@ -379,6 +384,8 @@ export default defineComponent({
       expirationRules,
       availableLinkTypes,
       selectedType,
+      selectedTypeIcon,
+      selectedTypeDescription,
       selectedLinkTypeIsInternal,
       onlyInternalLinksAllowed,
       isSelectedLinkType,
diff --git a/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
index a8df4c76523..79b1e4e317e 100644
--- a/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
@@ -199,7 +199,7 @@ function getWrapper({
     mock<ReturnType<typeof useLinkTypes>>({
       defaultLinkType: ref(defaultLinkType),
       getAvailableLinkTypes: () => availableLinkTypes,
-      getLinkRoleByType: () => mock<ShareRole>(),
+      getLinkRoleByType: () => mock<ShareRole>({ description: 'role' }),
       isPasswordEnforcedForLinkType: () => passwordEnforced
     })
   )

From 006f11629fd0fa8705fa2e8929b16be347e89be5 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 14:30:44 +0200
Subject: [PATCH 11/17] Fix e2e tests

---
 packages/web-pkg/src/components/CreateLinkModal.vue  | 1 +
 tests/e2e/support/objects/app-files/link/actions.ts  | 5 ++++-
 tests/e2e/support/objects/app-files/share/actions.ts | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index f14fcc49b76..69341b4ec13 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -14,6 +14,7 @@
     </div>
     <oc-button
       v-if="!advancedMode"
+      class="link-modal-advanced-mode-button"
       gap-size="xsmall"
       appearance="raw"
       variation="primary"
diff --git a/tests/e2e/support/objects/app-files/link/actions.ts b/tests/e2e/support/objects/app-files/link/actions.ts
index 5b06f8cd204..830d8358dd7 100644
--- a/tests/e2e/support/objects/app-files/link/actions.ts
+++ b/tests/e2e/support/objects/app-files/link/actions.ts
@@ -98,6 +98,7 @@ const copyPasswordButton = '.oc-text-input-copy-password-button'
 const generatePasswordButton = '.oc-text-input-generate-password-button'
 const expectedRegexForGeneratedPassword = /^[A-Za-z0-9\s\S]{12}$/
 const passwordInputDescription = '.oc-text-input-description .oc-text-input-description'
+const advancedModeButton = '.link-modal-advanced-mode-button'
 
 const getRecentLinkUrl = async (page: Page): Promise<string> => {
   return await page.locator(publicLinkUrlList).first().textContent()
@@ -119,7 +120,9 @@ export const createLink = async (args: createLinkArgs): Promise<string> => {
     await sidebar.openPanel({ page: page, name: 'sharing' })
   }
   await page.locator(addPublicLinkButton).click()
-  if (role) {
+  await page.locator(advancedModeButton).click()
+
+    if (role) {
     await page.locator(util.format(publicLinkSetRoleButton, role)).click()
   }
 
diff --git a/tests/e2e/support/objects/app-files/share/actions.ts b/tests/e2e/support/objects/app-files/share/actions.ts
index 657d41dafb4..af6285e2def 100644
--- a/tests/e2e/support/objects/app-files/share/actions.ts
+++ b/tests/e2e/support/objects/app-files/share/actions.ts
@@ -30,6 +30,7 @@ const showMoreOptionsButton = '#show-more-share-options-btn'
 const calendarDatePickerId = 'recipient-datepicker-btn'
 const informMessage = '//div[contains(@class,"oc-notification-message-title")]'
 const showMoreBtn = '.toggle-shares-list-btn:has-text("Show more")'
+const advancedModeButton = '.link-modal-advanced-mode-button'
 
 export interface ShareArgs {
   page: Page
@@ -211,6 +212,7 @@ export const createQuickLink = async (args: createLinkArgs): Promise<string> =>
   const linkName = 'Link'
 
   await clickActionInContextMenu({ page, resource }, 'copy-quicklink')
+  await page.locator(advancedModeButton).click()
   await page.locator(passwordInput).fill(password)
 
   await Promise.all([

From cc57ba6b18f3fef84350b88592394a6519aa0ed0 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 14:40:33 +0200
Subject: [PATCH 12/17] Lint

---
 tests/e2e/support/objects/app-files/link/actions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/support/objects/app-files/link/actions.ts b/tests/e2e/support/objects/app-files/link/actions.ts
index 830d8358dd7..cf03f1beaa7 100644
--- a/tests/e2e/support/objects/app-files/link/actions.ts
+++ b/tests/e2e/support/objects/app-files/link/actions.ts
@@ -122,7 +122,7 @@ export const createLink = async (args: createLinkArgs): Promise<string> => {
   await page.locator(addPublicLinkButton).click()
   await page.locator(advancedModeButton).click()
 
-    if (role) {
+  if (role) {
     await page.locator(util.format(publicLinkSetRoleButton, role)).click()
   }
 

From efe3cc62aa3f8ee0fb82bdb341a8bee9efcb7463 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 15:01:34 +0200
Subject: [PATCH 13/17] fix more e2e

---
 tests/e2e/support/objects/app-files/link/actions.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/e2e/support/objects/app-files/link/actions.ts b/tests/e2e/support/objects/app-files/link/actions.ts
index cf03f1beaa7..194ba1baf81 100644
--- a/tests/e2e/support/objects/app-files/link/actions.ts
+++ b/tests/e2e/support/objects/app-files/link/actions.ts
@@ -61,6 +61,7 @@ export type publicLinkAndItsEditButtonVisibilityArgs = {
   resource?: string
   space?: boolean
 }
+const publicLinkRoleToggle = `link-role-dropdown-toggle`
 const publicLinkSetRoleButton = `//span[contains(@class,"role-dropdown-list-option-label") and text()='%s']`
 const linkExpiryDatepicker = '.link-expiry-picker:not(.vc-container)'
 const publicLinkEditRoleButton =
@@ -123,6 +124,7 @@ export const createLink = async (args: createLinkArgs): Promise<string> => {
   await page.locator(advancedModeButton).click()
 
   if (role) {
+    await page.locator(util.format(publicLinkRoleToggle, role)).click()
     await page.locator(util.format(publicLinkSetRoleButton, role)).click()
   }
 

From 11fe1e20b07c61ade20553e62a151c938f140858 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 15:24:27 +0200
Subject: [PATCH 14/17] fix more e2e

---
 tests/e2e/support/objects/app-files/link/actions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/support/objects/app-files/link/actions.ts b/tests/e2e/support/objects/app-files/link/actions.ts
index 194ba1baf81..2226ceed839 100644
--- a/tests/e2e/support/objects/app-files/link/actions.ts
+++ b/tests/e2e/support/objects/app-files/link/actions.ts
@@ -61,7 +61,7 @@ export type publicLinkAndItsEditButtonVisibilityArgs = {
   resource?: string
   space?: boolean
 }
-const publicLinkRoleToggle = `link-role-dropdown-toggle`
+const publicLinkRoleToggle = `//button[contains(@class, "link-role-dropdown-toggle")]`
 const publicLinkSetRoleButton = `//span[contains(@class,"role-dropdown-list-option-label") and text()='%s']`
 const linkExpiryDatepicker = '.link-expiry-picker:not(.vc-container)'
 const publicLinkEditRoleButton =
@@ -124,7 +124,7 @@ export const createLink = async (args: createLinkArgs): Promise<string> => {
   await page.locator(advancedModeButton).click()
 
   if (role) {
-    await page.locator(util.format(publicLinkRoleToggle, role)).click()
+    await page.locator(publicLinkRoleToggle).click()
     await page.locator(util.format(publicLinkSetRoleButton, role)).click()
   }
 

From 543606ed097cea44bd009dd92ec1a465f5551876 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 1 Aug 2024 15:48:11 +0200
Subject: [PATCH 15/17] fix more e2e

---
 tests/e2e/support/objects/app-files/share/actions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/support/objects/app-files/share/actions.ts b/tests/e2e/support/objects/app-files/share/actions.ts
index af6285e2def..5f88859aa4e 100644
--- a/tests/e2e/support/objects/app-files/share/actions.ts
+++ b/tests/e2e/support/objects/app-files/share/actions.ts
@@ -228,8 +228,8 @@ export const createQuickLink = async (args: createLinkArgs): Promise<string> =>
     // here is flaky https://github.com/owncloud/web/issues/9941
     // sometimes test doesn't have time to pick up the correct buffer
     await page.waitForTimeout(500)
-    url = await page.evaluate(() => navigator.clipboard.readText())
-
+    const clipBoardText = await page.evaluate(() => navigator.clipboard.readText())
+    url = clipBoardText.match(/https?:\/\/[^ ]+/)[0]
     expect(url).toContain(config.baseUrlOcis)
   } else {
     const quickLinkUrlLocator = util.format(publicLinkInputField, linkName)

From 2eea11ca5bb6e607c225ddf7827fa7e03f5240fd Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 2 Aug 2024 09:16:56 +0200
Subject: [PATCH 16/17] Rm blank

---
 packages/web-pkg/src/components/CreateLinkModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index 69341b4ec13..b62c60c415f 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -44,7 +44,7 @@
       @update:model-value="updatePassword"
     />
     <div v-else-if="password.value" class="link-modal-password-text oc-text-small oc-text-muted">
-      <span v-text="$gettext('Password: ')" />
+      <span v-text="$gettext('Password:')" />
       <span v-text="password.value" />
     </div>
   </div>

From 3af0908a7f6b88664e48c278cd3e2122faa24989 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 5 Aug 2024 10:11:49 +0200
Subject: [PATCH 17/17] Add changelog item

---
 changelog/unreleased/enhancement-redesign-share-link-modal | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-redesign-share-link-modal

diff --git a/changelog/unreleased/enhancement-redesign-share-link-modal b/changelog/unreleased/enhancement-redesign-share-link-modal
new file mode 100644
index 00000000000..1bb7886ea68
--- /dev/null
+++ b/changelog/unreleased/enhancement-redesign-share-link-modal
@@ -0,0 +1,7 @@
+Enhancement: Redesign share link modal
+
+We've redesigned the share link modal to make it easier to share.
+The new modal is more user-friendly and provides a better experience for sharing.
+
+https://github.com/owncloud/web/pull/11310
+https://github.com/owncloud/web/issues/11204