mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Add empty credential value marker to show empty pw field (#6532)

Browse source 
add empty credential value marker to show empty pw field
This commit is contained in:
Michael Auerswald 2023-06-23 18:23:28 +02:00 committed by GitHub
parent d9ed0b31b5
commit 9294e2da3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/cli/src/credentials/credentials.service.ts
View file

@ -7,7 +7,7 @@ import type {
INodeCredentialTestResult, INodeCredentialTestResult,
INodeProperties, INodeProperties,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { deepCopy, LoggerProxy, NodeHelpers } from 'n8n-workflow'; import { CREDENTIAL_EMPTY_VALUE, deepCopy, LoggerProxy, NodeHelpers } from 'n8n-workflow';
import { Container } from 'typedi'; import { Container } from 'typedi';
import type { FindManyOptions, FindOptionsWhere } from 'typeorm'; import type { FindManyOptions, FindOptionsWhere } from 'typeorm';
import { In } from 'typeorm'; import { In } from 'typeorm';
@ -300,7 +300,11 @@ export class CredentialsService {
for (const dataKey of Object.keys(copiedData)) { for (const dataKey of Object.keys(copiedData)) {
// The frontend only cares that this value isn't falsy. // The frontend only cares that this value isn't falsy.
if (dataKey === 'oauthTokenData') { if (dataKey === 'oauthTokenData') {
if (copiedData[dataKey].toString().length > 0) {
copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE; copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
} else {
copiedData[dataKey] = CREDENTIAL_EMPTY_VALUE;
}
continue; continue;
} }
const prop = properties.find((v) => v.name === dataKey); const prop = properties.find((v) => v.name === dataKey);
@ -308,8 +312,11 @@ export class CredentialsService {
continue; continue;
} }
if (prop.typeOptions?.password) { if (prop.typeOptions?.password) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access if (copiedData[dataKey].toString().length > 0) {
copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE; copiedData[dataKey] = CREDENTIAL_BLANKING_VALUE;
} else {
copiedData[dataKey] = CREDENTIAL_EMPTY_VALUE;
}
} }
} }
@ -321,7 +328,7 @@ export class CredentialsService {
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
for (const [key, value] of Object.entries(unmerged)) { for (const [key, value] of Object.entries(unmerged)) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
if (value === CREDENTIAL_BLANKING_VALUE) { if (value === CREDENTIAL_BLANKING_VALUE || value === CREDENTIAL_EMPTY_VALUE) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
unmerged[key] = replacement[key]; unmerged[key] = replacement[key];
} else if ( } else if (

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

@ -367,7 +367,7 @@ import type {
EditorType, EditorType,
CodeNodeEditorLanguage, CodeNodeEditorLanguage,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { NodeHelpers } from 'n8n-workflow'; import { NodeHelpers, CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
import CredentialsSelect from '@/components/CredentialsSelect.vue'; import CredentialsSelect from '@/components/CredentialsSelect.vue';
import ExpressionEdit from '@/components/ExpressionEdit.vue'; import ExpressionEdit from '@/components/ExpressionEdit.vue';
@ -607,6 +607,11 @@ export default defineComponent({
return this.$locale.baseText('parameterInput.loadingOptions'); return this.$locale.baseText('parameterInput.loadingOptions');
} }
// if the value is marked as empty return empty string, to prevent displaying the asterisks
if (this.value === CREDENTIAL_EMPTY_VALUE) {
return '';
}
let returnValue; let returnValue;
if (this.isValueExpression === false) { if (this.isValueExpression === false) {
returnValue = this.isResourceLocatorParameter returnValue = this.isResourceLocatorParameter

4
packages/workflow/src/Constants.ts
View file

@ -14,3 +14,7 @@ export const NODES_WITH_RENAMABLE_CONTENT = new Set([
'n8n-nodes-base.function', 'n8n-nodes-base.function',
'n8n-nodes-base.functionItem', 'n8n-nodes-base.functionItem',
]); ]);
// Arbitrary value to represent an empty credential value
export const CREDENTIAL_EMPTY_VALUE =
'__n8n_EMPTY_VALUE_7b1af746-3729-4c60-9b9b-e08eb29e58da' as const;