feat(Microsoft OneDrive Node): Allow custom OAuth scopes (CE-949) (#31255)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Jon <jonathan.bennetts@gmail.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

packages/nodes-base/credentials/MicrosoftOneDriveOAuth2Api.credentials.ts

@@ -1,5 +1,8 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
+//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
+const defaultScopes = ['openid', 'offline_access', 'Files.ReadWrite.All'];
+
 export class MicrosoftOneDriveOAuth2Api implements ICredentialType {
 	name = 'microsoftOneDriveOAuth2Api';
 
@@ -10,12 +13,43 @@ export class MicrosoftOneDriveOAuth2Api implements ICredentialType {
 	documentationUrl = 'microsoft';
 
 	properties: INodeProperties[] = [
-		//https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent
+		{
+			displayName: 'Custom Scopes',
+			name: 'customScopes',
+			type: 'boolean',
+			default: false,
+			description: 'Define custom scopes',
+		},
+		{
+			displayName:
+				'The default scopes needed for the node to work are already set, If you change these the node may not function correctly.',
+			name: 'customScopesNotice',
+			type: 'notice',
+			default: '',
+			displayOptions: {
+				show: {
+					customScopes: [true],
+				},
+			},
+		},
+		{
+			displayName: 'Enabled Scopes',
+			name: 'enabledScopes',
+			type: 'string',
+			displayOptions: {
+				show: {
+					customScopes: [true],
+				},
+			},
+			default: defaultScopes.join(' '),
+			description: 'Scopes that should be enabled',
+		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
-			default: 'openid offline_access Files.ReadWrite.All',
+			default:
+				'={{$self["customScopes"] ? $self["enabledScopes"] : "' + defaultScopes.join(' ') + '"}}',
 		},
 	];
 }

packages/nodes-base/credentials/test/MicrosoftOneDriveOAuth2Api.credentials.test.ts

@@ -0,0 +1,144 @@
+import { ClientOAuth2 } from '@n8n/client-oauth2';
+import nock from 'nock';
+
+import { MicrosoftOneDriveOAuth2Api } from '../MicrosoftOneDriveOAuth2Api.credentials';
+
+describe('MicrosoftOneDriveOAuth2Api Credential', () => {
+	const credential = new MicrosoftOneDriveOAuth2Api();
+	const defaultScopes = ['openid', 'offline_access', 'Files.ReadWrite.All'];
+
+	const baseUrl = 'https://login.microsoftonline.com';
+	const authorizationUri = `${baseUrl}/common/oauth2/v2.0/authorize`;
+	const accessTokenUri = `${baseUrl}/common/oauth2/v2.0/token`;
+	const redirectUri = 'http://localhost:5678/rest/oauth2-credential/callback';
+	const clientId = 'test-client-id';
+	const clientSecret = 'test-client-secret';
+
+	const createOAuthClient = (scopes: string[]) =>
+		new ClientOAuth2({
+			clientId,
+			clientSecret,
+			accessTokenUri,
+			authorizationUri,
+			redirectUri,
+			scopes,
+		});
+
+	const mockTokenEndpoint = (code: string, responseScopes: string[]) => {
+		nock(baseUrl)
+			.post('/common/oauth2/v2.0/token', (body: Record<string, unknown>) => {
+				return (
+					body.code === code &&
+					body.grant_type === 'authorization_code' &&
+					body.redirect_uri === redirectUri
+				);
+			})
+			.reply(200, {
+				access_token: 'test-access-token',
+				token_type: 'Bearer',
+				expires_in: 3600,
+				scope: responseScopes.join(' '),
+			});
+	};
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	afterEach(() => {
+		nock.cleanAll();
+	});
+
+	describe('credential metadata', () => {
+		it('should have correct name and parent credential', () => {
+			expect(credential.name).toBe('microsoftOneDriveOAuth2Api');
+			expect(credential.extends).toEqual(['microsoftOAuth2Api']);
+			expect(credential.displayName).toBe('Microsoft Drive OAuth2 API');
+		});
+
+		it('should expose a customScopes toggle that defaults to off', () => {
+			const customScopesProperty = credential.properties.find((p) => p.name === 'customScopes');
+			expect(customScopesProperty).toBeDefined();
+			expect(customScopesProperty?.type).toBe('boolean');
+			expect(customScopesProperty?.default).toBe(false);
+		});
+
+		it('should expose an enabledScopes property with the default scopes', () => {
+			const enabledScopesProperty = credential.properties.find((p) => p.name === 'enabledScopes');
+			expect(enabledScopesProperty).toBeDefined();
+			expect(enabledScopesProperty?.type).toBe('string');
+			expect(enabledScopesProperty?.default).toBe('openid offline_access Files.ReadWrite.All');
+			expect(enabledScopesProperty?.displayOptions).toEqual({ show: { customScopes: [true] } });
+		});
+
+		it('should define a hidden scope expression that resolves to the enabled scopes', () => {
+			const scopeProperty = credential.properties.find((p) => p.name === 'scope');
+			expect(scopeProperty).toBeDefined();
+			expect(scopeProperty?.type).toBe('hidden');
+			expect(scopeProperty?.default).toBe(
+				'={{$self["customScopes"] ? $self["enabledScopes"] : "openid offline_access Files.ReadWrite.All"}}',
+			);
+		});
+	});
+
+	describe('OAuth2 flow with default scopes', () => {
+		it('should include default scopes in authorization URI', () => {
+			const oauthClient = createOAuthClient(defaultScopes);
+			const authUri = oauthClient.code.getUri();
+
+			expect(authUri).toContain('scope=');
+			expect(authUri).toContain('openid');
+			expect(authUri).toContain('offline_access');
+			expect(authUri).toContain('Files.ReadWrite.All');
+			expect(authUri).toContain(`client_id=${clientId}`);
+			expect(authUri).toContain('response_type=code');
+		});
+
+		it('should retrieve token successfully with default scopes', async () => {
+			const code = 'test-auth-code';
+			mockTokenEndpoint(code, defaultScopes);
+
+			const oauthClient = createOAuthClient(defaultScopes);
+			const token = await oauthClient.code.getToken(redirectUri + `?code=${code}`);
+
+			expect(token.data.scope).toBe('openid offline_access Files.ReadWrite.All');
+		});
+	});
+
+	describe('OAuth2 flow with custom scopes', () => {
+		const customScopes = [
+			'openid',
+			'offline_access',
+			'Files.ReadWrite.All',
+			'Sites.Read.All',
+			'Sites.FullControl.All',
+		];
+
+		it('should include custom scopes in authorization URI', () => {
+			const oauthClient = createOAuthClient(customScopes);
+			const authUri = oauthClient.code.getUri();
+
+			expect(authUri).toContain('scope=');
+			expect(authUri).toContain('Sites.Read.All');
+			expect(authUri).toContain('Sites.FullControl.All');
+		});
+
+		it('should retrieve token successfully with custom scopes', async () => {
+			const code = 'test-auth-code';
+			mockTokenEndpoint(code, customScopes);
+
+			const oauthClient = createOAuthClient(customScopes);
+			const token = await oauthClient.code.getToken(redirectUri + `?code=${code}`);
+
+			expect(token.data.scope).toContain('openid');
+			expect(token.data.scope).toContain('offline_access');
+			expect(token.data.scope).toContain('Files.ReadWrite.All');
+			expect(token.data.scope).toContain('Sites.Read.All');
+			expect(token.data.scope).toContain('Sites.FullControl.All');
+		});
+	});
+});