From 28ab4f66f096eb6ec483e344bffe98b9a81520c6 Mon Sep 17 00:00:00 2001 From: Ricardo Espinoza Date: Fri, 16 Sep 2022 10:12:59 -0400 Subject: [PATCH] fix(public-api): Create correct OAuth2 credential schema (#4111) --- packages/cli/src/PublicApi/types.d.ts | 2 +- .../PublicApi/v1/handlers/credentials/credentials.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/PublicApi/types.d.ts b/packages/cli/src/PublicApi/types.d.ts index 501f7b028..d5728aa5a 100644 --- a/packages/cli/src/PublicApi/types.d.ts +++ b/packages/cli/src/PublicApi/types.d.ts @@ -152,7 +152,7 @@ export interface IRequired { } export interface IDependency { if?: { properties: {} }; - then?: { oneOf: IRequired[] }; + then?: { allOf: IRequired[] }; else?: { allOf: IRequired[] }; } diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts index 8f6c84643..7e2eab58d 100644 --- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts +++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts @@ -220,7 +220,7 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject { }, }, then: { - oneOf: [], + allOf: [], }, else: { allOf: [], @@ -228,7 +228,7 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject { }; } - propertyRequiredDependencies[dependantName].then?.oneOf.push({ required: [property.name] }); + propertyRequiredDependencies[dependantName].then?.allOf.push({ required: [property.name] }); propertyRequiredDependencies[dependantName].else?.allOf.push({ not: { required: [property.name] }, });