Discoverability flow and scopes notice for HTTP Request node

packages/cli/src/CredentialsHelper.ts

@@ -286,33 +286,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 		return combineProperties;
 	}
 
-	/**
-	 * Returns the scope of a credential type
-	 *
-	 * @param {string} type
-	 * @returns {string[]}
-	 * @memberof CredentialsHelper
-	 */
-	getScopes(type: string): string[] {
-		const scopeProperty = this.getCredentialsProperties(type).find(({ name }) => name === 'scope');
-
-		if (!scopeProperty?.default || typeof scopeProperty.default !== 'string') {
-			const errorMessage = `No \`scope\` property found for credential type: ${type}`;
-
-			Logger.error(errorMessage);
-
-			throw new Error(errorMessage);
-		}
-
-		const { default: scopeDefault } = scopeProperty;
-
-		if (/ /.test(scopeDefault)) return scopeDefault.split(' ');
-
-		if (/,/.test(scopeDefault)) return scopeDefault.split(',');
-
-		return [scopeDefault];
-	}
-
 	/**
 	 * Returns the decrypted credential data with applied overwrites
 	 *

packages/cli/src/LoadNodesAndCredentials.ts

@@ -58,7 +58,6 @@ class LoadNodesAndCredentialsClass {
 			// In case "n8n" package is the root and the packages are
 			// in the "node_modules" folder underneath it.
 			path.join(__dirname, '..', '..', 'node_modules', 'n8n-workflow'),
-			path.join(__dirname, '..', 'node_modules', 'n8n-workflow'), // for test run
 		];
 		for (const checkPath of checkPaths) {
 			try {

packages/cli/src/Server.ts

@@ -157,7 +157,6 @@ import { ExecutionEntity } from './databases/entities/ExecutionEntity';
 import { SharedWorkflow } from './databases/entities/SharedWorkflow';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES } from './constants';
 import { credentialsController } from './api/credentials.api';
-import { oauth2CredentialController } from './api/oauth2Credential.api';
 import {
 	getInstanceBaseUrl,
 	isEmailSetUp,
@@ -1457,7 +1456,7 @@ class App {
 					if (defaultLocale === 'en') {
 						return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
 							const { description } = NodeTypes().getByNameAndVersion(name, version);
-							acc.push(description);
+							acc.push(injectCustomApiCallOption(description));
 							return acc;
 						}, []);
 					}
@@ -1481,7 +1480,7 @@ class App {
 							// ignore - no translation exists at path
 						}
 
-						nodeTypes.push(description);
+						nodeTypes.push(injectCustomApiCallOption(description));
 					}
 
 					const nodeTypes: INodeTypeDescription[] = [];
@@ -1929,8 +1928,6 @@ class App {
 		// OAuth2-Credential/Auth
 		// ----------------------------------------
 
-		this.app.use(`/${this.restEndpoint}/oauth2-credential`, oauth2CredentialController);
-
 		// Authorize OAuth Data
 		this.app.get(
 			`/${this.restEndpoint}/oauth2-credential/auth`,
@@ -3117,3 +3114,58 @@ async function getExecutionsCount(
 
 	return { count, estimated: false };
 }
+
+const CUSTOM_API_CALL_NAME = 'Custom API Call';
+const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
+
+/**
+ * Inject a `Custom API Call` option into `resource` and `operation`
+ * parameters in a node that supports proxy auth.
+ */
+function injectCustomApiCallOption(description: INodeTypeDescription) {
+	if (!supportsProxyAuth(description)) return description;
+
+	description.properties.forEach((p) => {
+		if (
+			['resource', 'operation'].includes(p.name) &&
+			Array.isArray(p.options) &&
+			p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
+		) {
+			p.options.push({
+				name: CUSTOM_API_CALL_NAME,
+				value: CUSTOM_API_CALL_KEY,
+			});
+		}
+
+		return p;
+	});
+
+	return description;
+}
+
+const credentialTypes = CredentialTypes();
+
+/**
+ * Whether any of the node's credential types may be used to
+ * make a request from a node other than itself.
+ */
+function supportsProxyAuth(description: INodeTypeDescription) {
+	if (!description.credentials) return false;
+
+	return description.credentials.some(({ name }) => {
+		const credType = credentialTypes.getByName(name);
+
+		if (credType.authenticate !== undefined) return true;
+
+		return isOAuth(credType);
+	});
+}
+
+function isOAuth(credType: ICredentialType) {
+	return (
+		Array.isArray(credType.extends) &&
+		credType.extends.some((parentType) =>
+			['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
+		)
+	);
+}

packages/cli/src/constants.ts

@@ -7,8 +7,6 @@ import { RESPONSE_ERROR_MESSAGES as CORE_RESPONSE_ERROR_MESSAGES } from 'n8n-cor
 export const RESPONSE_ERROR_MESSAGES = {
 	NO_CREDENTIAL: 'Credential not found',
 	NO_ENCRYPTION_KEY: CORE_RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY,
-	NO_CREDENTIAL_TYPE: 'Missing query string param: `credentialType`',
-	CREDENTIAL_TYPE_NOT_OAUTH2: 'Credential type is not OAuth2 - no scopes can be provided',
 };
 
 export const AUTH_COOKIE_NAME = 'n8n-auth';

packages/cli/src/requests.d.ts

@@ -245,7 +245,6 @@ export declare namespace OAuthRequest {
 	namespace OAuth2Credential {
 		type Auth = OAuth1Credential.Auth;
 		type Callback = AuthenticatedRequest<{}, {}, {}, { code: string; state: string }>;
-		type Scopes = AuthenticatedRequest<{}, {}, {}, { credentialType: string }>;
 	}
 }
 

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

@@ -62,8 +62,3 @@ export const BOOTSTRAP_MYSQL_CONNECTION_NAME: Readonly<string> = 'n8n_bs_mysql';
  * Timeout (in milliseconds) to account for fake SMTP service being slow to respond.
  */
 export const SMTP_TEST_TIMEOUT = 30_000;
-
-/**
- * Timeout (in milliseconds) to account for `LoadNodesAndCredentials()` being slow to run on CI/CD server.
- */
-export const LOAD_NODES_AND_CREDS_TEST_TIMEOUT = 30_000;

packages/cli/test/integration/shared/types.d.ts

@@ -15,7 +15,7 @@ export type SmtpTestAccount = {
 	};
 };
 
-type EndpointGroup = 'me' | 'users' | 'auth' | 'owner' | 'passwordReset' | 'credentials' | 'oauth2-credential';
+type EndpointGroup = 'me' | 'users' | 'auth' | 'owner' | 'passwordReset' | 'credentials';
 
 export type CredentialPayload = {
 	name: string;

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

@@ -26,7 +26,6 @@ import { credentialsController } from '../../../src/api/credentials.api';
 import type { User } from '../../../src/databases/entities/User';
 import type { EndpointGroup, SmtpTestAccount } from './types';
 import type { N8nApp } from '../../../src/UserManagement/Interfaces';
-import { oauth2CredentialController } from '../../../src/api/oauth2Credential.api';
 
 /**
  * Initialize a test server.
@@ -64,7 +63,6 @@ export function initTestServer({
 	if (routerEndpoints.length) {
 		const map: Record<string, express.Router> = {
 			credentials: credentialsController,
-			'oauth2-credential': oauth2CredentialController,
 		};
 
 		for (const group of routerEndpoints) {
@@ -107,10 +105,7 @@ const classifyEndpointGroups = (endpointGroups: string[]) => {
 	const functionEndpoints: string[] = [];
 
 	endpointGroups.forEach((group) =>
-		(['credentials', 'oauth2-credential'].includes(group)
-			? routerEndpoints
-			: functionEndpoints
-		).push(group),
+		(group === 'credentials' ? routerEndpoints : functionEndpoints).push(group),
 	);
 
 	return [routerEndpoints, functionEndpoints];