Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Change default permissions to capablities #8566

Merged
merged 19 commits into from
Mar 9, 2023
Merged
Prev Previous commit
Next Next commit
Address some PR issues
lookacat committed Mar 9, 2023
commit 8c9d44e92e7b50f15b315a81bb336f40f35b82ea
Original file line number Diff line number Diff line change
@@ -25,9 +25,8 @@
</template>

<script lang="ts">
import { computed, defineComponent } from 'vue'
import { computed, defineComponent, inject } from 'vue'
import { useAbility } from 'web-pkg'
import { inject } from 'vue'
import { Resource } from 'web-client/src'
import { useGettext } from 'vue3-gettext'
import { LinkShareRoles } from 'web-client/src/helpers/share'
@@ -64,7 +63,7 @@ export default defineComponent({
if (!canCreatePublicLinks.value) {
emit('createPublicLink', emitData)
}
const capabilitiesRoleName = capabilities.capabilities.files_sharing?.quickLink?.default_role || 'viewer'
const capabilitiesRoleName = capabilities.capabilities.files_sharing?.quick_link?.default_role || 'viewer'
emitData.link.permissions = (
LinkShareRoles.getByName(capabilitiesRoleName, resource.isFolder) ||
LinkShareRoles.getByName('viewer', resource.isFolder)
2 changes: 1 addition & 1 deletion packages/web-app-files/src/helpers/share/link.ts
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ export const createQuicklink = async (args: CreateQuicklink): Promise<Share> =>
const canCreatePublicLink = ability.can('create-all', 'PublicLink')
const allowResharing = store.state.user.capabilities.files_sharing?.resharing
const capabilitiesRoleName =
store.state.user.capabilities.files_sharing?.quickLink?.default_role || 'viewer'
store.state.user.capabilities.files_sharing?.quick_link?.default_role || 'viewer'
let permissions
if (!canCreatePublicLink) {
permissions = LinkShareRoles.getByName('none', resource.isFolder).bitmask(allowResharing)
2 changes: 1 addition & 1 deletion packages/web-client/src/helpers/share/role.ts
Original file line number Diff line number Diff line change
@@ -411,7 +411,7 @@ export abstract class LinkShareRoles {
}

static getByName(name: string, isFolder: boolean): ShareRole {
return LinkShareRoles.list(isFolder).find(
return LinkShareRoles.list(isFolder, true, true, true).find(
(role) => role.name.toLowerCase() === name.toLowerCase()
)
}
2 changes: 1 addition & 1 deletion packages/web-client/src/ocs/capabilities.ts
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ export interface Capabilities {
version: string
}[]
}
quickLink?: {
quick_link?: {
default_role?: string
}
}