fix(core): Use correct scopes-separator when generating authorization urls (#6502)

packages/@n8n/client-oauth2/src/CodeFlow.ts

@@ -2,7 +2,7 @@ import * as qs from 'querystring';
 import type { ClientOAuth2, ClientOAuth2Options } from './ClientOAuth2';
 import type { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
 import { DEFAULT_HEADERS, DEFAULT_URL_BASE } from './constants';
-import { auth, expects, getAuthError, getRequestOptions, sanitizeScope } from './utils';
+import { auth, expects, getAuthError, getRequestOptions } from './utils';
 
 interface CodeFlowBody {
 	code: string | string[];
@@ -22,27 +22,30 @@ export class CodeFlow {
 	/**
 	 * Generate the uri for doing the first redirect.
 	 */
-	getUri(opts?: ClientOAuth2Options): string {
-		const options = { ...this.client.options, ...opts };
+	getUri(opts?: Partial<ClientOAuth2Options>): string {
+		const options: ClientOAuth2Options = { ...this.client.options, ...opts };
 
 		// Check the required parameters are set.
 		expects(options, 'clientId', 'authorizationUri');
 
-		const query: Record<string, string | undefined> = {
+		const url = new URL(options.authorizationUri);
+
+		const queryParams = {
+			...options.query,
 			client_id: options.clientId,
 			redirect_uri: options.redirectUri,
 			response_type: 'code',
 			state: options.state,
+			...(options.scopes ? { scope: options.scopes.join(options.scopesSeparator ?? ' ') } : {}),
 		};
-		if (options.scopes !== undefined) {
-			query.scope = sanitizeScope(options.scopes);
+
+		for (const [key, value] of Object.entries(queryParams)) {
+			if (value !== null && value !== undefined) {
+				url.searchParams.append(key, value);
+			}
 		}
 
-		if (options.authorizationUri) {
-			const sep = options.authorizationUri.includes('?') ? '&' : '?';
-			return options.authorizationUri + sep + qs.stringify({ ...query, ...options.query });
-		}
-		throw new TypeError('Missing authorization uri, unable to get redirect uri');
+		return url.toString();
 	}
 
 	/**