refactor(core): Remove roleId indirection (no-changelog) (#8413)

packages/cli/src/Ldap/ldap.service.ts

@@ -7,7 +7,6 @@ import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { Cipher } from 'n8n-core';
 
 import config from '@/config';
-import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import type { RunningMode, SyncStatus } from '@db/entities/AuthProviderSyncHistory';
 import { SettingsRepository } from '@db/repositories/settings.repository';
@@ -30,7 +29,6 @@ import {
 	escapeFilter,
 	formatUrl,
 	getLdapIds,
-	getLdapUserRole,
 	getLdapUsers,
 	getMappingAttributes,
 	mapLdapUserToDbUser,
@@ -346,12 +344,9 @@ export class LdapService {
 
 		const localAdUsers = await getLdapIds();
 
-		const role = await getLdapUserRole();
-
 		const { usersToCreate, usersToUpdate, usersToDisable } = this.getUsersToProcess(
 			adUsers,
 			localAdUsers,
-			role,
 		);
 
 		this.logger.debug('LDAP - Users processed', {
@@ -407,14 +402,13 @@ export class LdapService {
 	private getUsersToProcess(
 		adUsers: LdapUser[],
 		localAdUsers: string[],
-		role: Role,
 	): {
 		usersToCreate: Array<[string, User]>;
 		usersToUpdate: Array<[string, User]>;
 		usersToDisable: string[];
 	} {
 		return {
-			usersToCreate: this.getUsersToCreate(adUsers, localAdUsers, role),
+			usersToCreate: this.getUsersToCreate(adUsers, localAdUsers),
 			usersToUpdate: this.getUsersToUpdate(adUsers, localAdUsers),
 			usersToDisable: this.getUsersToDisable(adUsers, localAdUsers),
 		};
@@ -424,11 +418,10 @@ export class LdapService {
 	private getUsersToCreate(
 		remoteAdUsers: LdapUser[],
 		localLdapIds: string[],
-		role: Role,
 	): Array<[string, User]> {
 		return remoteAdUsers
 			.filter((adUser) => !localLdapIds.includes(adUser[this.config.ldapIdAttribute] as string))
-			.map((adUser) => mapLdapUserToDbUser(adUser, this.config, role));
+			.map((adUser) => mapLdapUserToDbUser(adUser, this.config, true));
 	}
 
 	/** Get users in LDAP that are already in the database */