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

* 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
2 changed files with 12 additions and 2 deletions

View File

@@ -231,7 +231,10 @@ export default mixins(showMessage, nodeHelpers).extend({
if (this.credentialType) {
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);
}
}
@@ -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(
combineProperties,
credentialTypeData.properties,