mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 21:07:28 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Use CredentialsOverwrites when testing credentials (#4675)

Browse source 
* fix(cli): use CredentialsOverwrites in credentials testing

* fix(editor-ui): do not set credential properties if they have been overwritten
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2022-11-22 10:08:35 +01:00 committed by GitHub
parent 4c423762d6
commit 772ec78349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/cli/src/CredentialsHelper.ts
View file

@ -551,6 +551,13 @@ export class CredentialsHelper extends ICredentialsHelper {
}); });
} }
if (credentialsDecrypted.data) {
credentialsDecrypted.data = CredentialsOverwrites().applyOverwrite(
credentialType,
credentialsDecrypted.data,
);
}
if (typeof credentialTestFunction === 'function') { if (typeof credentialTestFunction === 'function') {
// The credentials get tested via a function that is defined on the node // The credentials get tested via a function that is defined on the node
const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions(); const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions();

7
packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
View file

@ -231,7 +231,10 @@ export default mixins(showMessage, nodeHelpers).extend({
if (this.credentialType) { if (this.credentialType) {
for (const property of this.credentialType.properties) { for (const property of this.credentialType.properties) {
if (!this.credentialData.hasOwnProperty(property.name)) { if (
!this.credentialData.hasOwnProperty(property.name) &&
!this.credentialType.__overwrittenProperties?.includes(property.name)
) {
Vue.set(this.credentialData, property.name, property.default as CredentialInformation); Vue.set(this.credentialData, property.name, property.default as CredentialInformation);
} }
} }
@ -516,7 +519,7 @@ export default mixins(showMessage, nodeHelpers).extend({
); );
} }
// The properties defined on the parent credentials take presidence // The properties defined on the parent credentials take precedence
NodeHelpers.mergeNodeProperties( NodeHelpers.mergeNodeProperties(
combineProperties, combineProperties,
credentialTypeData.properties, credentialTypeData.properties,