fix(core): Fix OAuth credential creation via API (#5064)

* fix(core): Fix OAuth credential creation via API

* Fix tests

packages/cli/src/CredentialsHelper.ts

@@ -299,6 +299,21 @@ export class CredentialsHelper extends ICredentialsHelper {
 		}
 
 		if (credentialTypeData.extends === undefined) {
+			// Manually add the special OAuth parameter which stores
+			// data like access- and refresh-token
+			if (['oAuth1Api', 'oAuth2Api'].includes(type)) {
+				return [
+					...credentialTypeData.properties,
+					{
+						displayName: 'oauthTokenData',
+						name: 'oauthTokenData',
+						type: 'json',
+						required: false,
+						default: {},
+					},
+				];
+			}
+
 			return credentialTypeData.properties;
 		}
 

packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts

@@ -158,7 +158,9 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject {
 	// to later validate that only this properties are set in
 	// the credentials sent in the API call.
 	properties.forEach((property) => {
-		requiredFields.push(property.name);
+		if (property.required) {
+			requiredFields.push(property.name);
+		}
 		if (property.type === 'options') {
 			// if the property is type options,
 			// include all possible values in the enum property.

packages/cli/test/integration/shared/utils.ts

@@ -206,18 +206,21 @@ export function gitHubCredentialType(): ICredentialType {
 				name: 'server',
 				type: 'string',
 				default: 'https://api.github.com',
+				required: true,
 				description: 'The server to connect to. Only has to be set if Github Enterprise is used.',
 			},
 			{
 				displayName: 'User',
 				name: 'user',
 				type: 'string',
+				required: true,
 				default: '',
 			},
 			{
 				displayName: 'Access Token',
 				name: 'accessToken',
 				type: 'string',
+				required: true,
 				default: '',
 			},
 		],