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 rendering for generic auth creds

Browse source
This commit is contained in:
Iván Ovejero 2022-05-02 10:36:16 +02:00
parent 81aeefa715
commit 3d5b92b009
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packages/editor-ui/src/components/NodeCredentials.vue
View file

@ -77,6 +77,7 @@ import { showMessage } from '@/components/mixins/showMessage';
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import mixins from 'vue-typed-mixins'; import mixins from 'vue-typed-mixins';
import { HTTP_REQUEST_NODE_TYPE } from '@/constants';
export default mixins( export default mixins(
genericHelpers, genericHelpers,
@ -97,13 +98,17 @@ export default mixins(
computed: { computed: {
...mapGetters('credentials', { ...mapGetters('credentials', {
credentialOptions: 'allCredentialsByType', credentialOptions: 'allCredentialsByType',
getCredentialTypeByName: 'getCredentialTypeByName',
}), }),
isProxyCredentialType(): boolean { isProxyAuth(): boolean {
const proxyCredentialNodeTypes = ["n8n-nodes-base.httpRequest"]; return this.node.type === HTTP_REQUEST_NODE_TYPE
&& this.node.typeVersion === 2
return proxyCredentialNodeTypes.includes(this.node.type) && this.node.parameters.authenticateWith === 'nodeCredential';
&& this.node.parameters.authenticateWith === 'nodeCredential' },
&& this.node.parameters.nodeCredentialType; isGenericAuth(): boolean {
return this.node.type === HTTP_REQUEST_NODE_TYPE
&& this.node.typeVersion === 2
&& this.node.parameters.authenticateWith === 'genericAuth';
}, },
credentialTypesNode (): string[] { credentialTypesNode (): string[] {
return this.credentialTypesNodeDescription return this.credentialTypesNodeDescription
@ -118,8 +123,16 @@ export default mixins(
credentialTypesNodeDescription (): INodeCredentialDescription[] { credentialTypesNodeDescription (): INodeCredentialDescription[] {
const node = this.node as INodeUi; const node = this.node as INodeUi;
if (this.isProxyCredentialType) { if (this.isGenericAuth) {
return [this.$store.getters['credentials/getCredentialTypeByName'](this.node.parameters.nodeCredentialType)]; const { genericAuthType } = this.node.parameters as { genericAuthType: string };
return [this.getCredentialTypeByName(genericAuthType)];
}
if (this.isProxyAuth) {
const { nodeCredentialType } = this.node.parameters as { nodeCredentialType?: string };
if (nodeCredentialType) return [this.getCredentialTypeByName(nodeCredentialType)];
} }
const activeNodeType = this.$store.getters.nodeType(node.type, node.typeVersion) as INodeTypeDescription | null; const activeNodeType = this.$store.getters.nodeType(node.type, node.typeVersion) as INodeTypeDescription | null;