admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Introduce advanced permissions (#7844)

Browse Source 
This PR introduces the possibility of inviting new users with an `admin`
role and changing the role of already invited users.
Also using scoped permission checks where applicable instead of using
user role checks.

---------

Co-authored-by: Val <68596159+valya@users.noreply.github.com>
Co-authored-by: Alex Grozav <alex@grozav.com>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
This commit is contained in:
Csaba Tuncsik
2023-12-08 12:52:25 +01:00
committed by GitHub
parent e00577b1d3
commit dbd62a4992
26 changed files with 364 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
View File

@@ -34,7 +34,7 @@
<n8n-info-tip v-if="credentialPermissions.isOwner" :bold="false" class="mb-s">
{{ $locale.baseText('credentialEdit.credentialSharing.info.owner') }}
</n8n-info-tip>
<n8n-info-tip v-if="!credentialPermissions.updateSharing" :bold="false" class="mb-s">
<n8n-info-tip v-if="!credentialPermissions.share" :bold="false" class="mb-s">
{{
$locale.baseText('credentialEdit.credentialSharing.info.sharee', {
interpolate: { credentialOwnerName },
@@ -42,10 +42,14 @@
}}
</n8n-info-tip>
<n8n-info-tip v-if="credentialPermissions.read" class="mb-s" :bold="false">
{{ $locale.baseText('credentialEdit.credentialSharing.info.reader') }}
<i18n-t keypath="credentialEdit.credentialSharing.info.reader">
<template v-if="!isCredentialSharedWithCurrentUser" #notShared>
{{ $locale.baseText('credentialEdit.credentialSharing.info.notShared') }}
</template>
</i18n-t>
</n8n-info-tip>
<n8n-user-select
v-if="credentialPermissions.updateSharing"
v-if="credentialPermissions.share"
class="mb-s"
size="large"
:users="usersList"
@@ -62,7 +66,7 @@
:actions="usersListActions"
:users="sharedWithList"
:currentUserId="usersStore.currentUser.id"
:readonly="!credentialPermissions.updateSharing"
:readonly="!credentialPermissions.share"
@delete="onRemoveSharee"
/>
</div>
@@ -114,13 +118,12 @@ export default defineComponent({
},
usersList(): IUser[] {
return this.usersStore.allUsers.filter((user: IUser) => {
const isCurrentUser = user.id === this.usersStore.currentUser?.id;
const isAlreadySharedWithUser = (this.credentialData.sharedWith || []).find(
(sharee: IUser) => sharee.id === user.id,
);
const isOwner = this.credentialData.ownedBy.id === user.id;
const isOwner = this.credentialData.ownedBy?.id === user.id;
return !isCurrentUser && !isAlreadySharedWithUser && !isOwner;
return !isAlreadySharedWithUser && !isOwner;
});
},
sharedWithList(): IUser[] {
@@ -134,6 +137,11 @@ export default defineComponent({
credentialOwnerName(): string {
return this.credentialsStore.getCredentialOwnerNameById(`${this.credentialId}`);
},
isCredentialSharedWithCurrentUser(): boolean {
return (this.credentialData.sharedWith || []).some((sharee: IUser) => {
return sharee.id === this.usersStore.currentUser?.id;
});
},
},
methods: {
async onAddSharee(userId: string) {