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.

Sign up for GitHub

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

Jump to bottom

fix(editor): Show credential share info only to appropriate users #8020

Merged
merged 3 commits into from
Dec 14, 2023
Merged

fix(editor): Show credential share info only to appropriate users #8020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3622098
fix(editor): Show credential share info only to appropriate users
cstuncsik Dec 13, 2023
bb2124b
test: Extend e2e test for credential sharing as admin
cstuncsik Dec 13, 2023
67c495e
test: Remove '.only'
cstuncsik Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cypress/e2e/17-sharing.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
credentialsModal.getters.testSuccessTag().should('be.visible');
});

it.only('should work for admin role on credentials created by others (also can share it with themselves)', () => {
it('should work for admin role on credentials created by others (also can share it with themselves)', () => {
cy.signin(INSTANCE_MEMBERS[0]);

cy.visit(credentialsPage.url);
Expand All @@ -150,6 +150,9 @@ describe('Sharing', { disableAutoLogin: true }, () => {
credentialsModal.getters.testSuccessTag().should('be.visible');
cy.get('input').should('not.have.length');
credentialsModal.actions.changeTab('Sharing');
cy.contains(
'You can view this credential because you have permission to read and share',
).should('be.visible');

credentialsModal.getters.usersSelect().click();
cy.getByTestId('user-email')
Expand Down
10 changes: 9 additions & 1 deletion packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,15 @@
})
}}
</n8n-info-tip>
<n8n-info-tip v-if="credentialPermissions.read" class="mb-s" :bold="false">
<n8n-info-tip
v-if="
credentialPermissions.read &&
credentialPermissions.share &&
!credentialPermissions.isOwner
"
class="mb-s"
:bold="false"
>
<i18n-t keypath="credentialEdit.credentialSharing.info.reader">
<template v-if="!isCredentialSharedWithCurrentUser" #notShared>
{{ $locale.baseText('credentialEdit.credentialSharing.info.notShared') }}
Expand Down
2 changes: 1 addition & 1 deletion packages/editor-ui/src/plugins/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@
"credentialEdit.oAuthButton.signInWithGoogle": "Sign in with Google",
"credentialEdit.credentialSharing.info.owner": "Sharing a credential allows people to use it in their workflows. They cannot access credential details.",
"credentialEdit.credentialSharing.info.reader": "You can view this credential because you have permission to read and share (and rename or delete it too).{notShared}",
"credentialEdit.credentialSharing.info.notShared": "To use it in a workflow, ask the credential owner to share it with you.",
"credentialEdit.credentialSharing.info.notShared": "To use it in a workflow you need to share it with yourself.",
"credentialEdit.credentialSharing.info.sharee": "Only {credentialOwnerName} can change who this credential is shared with",
"credentialEdit.credentialSharing.info.sharee.fallback": "the owner",
"credentialEdit.credentialSharing.select.placeholder": "Add users...",
Expand Down
Loading