[permissions] Override workspaceDatasource.createQueryBuilder (#12415)
In the frame of https://github.com/twentyhq/core-team-issues/issues/924 - Rename dataSource -> workspaceDataSource when relevant to ease understandability - override workspaceDataSource.createQueryBuilder, because we don't want developers to use it directly since it does not run permission checks at this level. Indeed, we cannot do so because 1) datasources are shared between roles so we would need to re-think its implementation to make that possible, while for now we never call workspaceDatasource.createQueryBuilder in our codebase 2) workspaceEntityManager.createQueryBuilder, that we have overriden with permission checks, then performs a call to workspaceDataSource.createQueryBuilder so that would make two permission checks.
This commit is contained in:
@ -145,14 +145,20 @@ export class WorkspaceEntityManager extends EntityManager {
|
||||
let queryBuilder: SelectQueryBuilder<Entity>;
|
||||
|
||||
if (alias) {
|
||||
queryBuilder = super.createQueryBuilder(
|
||||
queryBuilder = this.connection.createQueryBuilder(
|
||||
entityClassOrQueryRunner as EntityTarget<Entity>,
|
||||
alias as string,
|
||||
queryRunner as QueryRunner | undefined,
|
||||
{
|
||||
calledByWorkspaceEntityManager: true,
|
||||
},
|
||||
);
|
||||
} else {
|
||||
queryBuilder = super.createQueryBuilder(
|
||||
queryBuilder = this.connection.createQueryBuilder(
|
||||
entityClassOrQueryRunner as QueryRunner,
|
||||
{
|
||||
calledByWorkspaceEntityManager: true,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -912,7 +918,10 @@ export class WorkspaceEntityManager extends EntityManager {
|
||||
permissionOptions,
|
||||
)
|
||||
.setFindOptions(options || {})
|
||||
.getExists();
|
||||
.select('1')
|
||||
.limit(1)
|
||||
.getRawOne()
|
||||
.then((result) => isDefined(result));
|
||||
}
|
||||
|
||||
override existsBy<Entity extends ObjectLiteral>(
|
||||
@ -929,7 +938,10 @@ export class WorkspaceEntityManager extends EntityManager {
|
||||
permissionOptions,
|
||||
)
|
||||
.setFindOptions({ where })
|
||||
.getExists();
|
||||
.select('1')
|
||||
.limit(1)
|
||||
.getRawOne()
|
||||
.then((result) => isDefined(result));
|
||||
}
|
||||
|
||||
override count<Entity extends ObjectLiteral>(
|
||||
|
||||
Reference in New Issue
Block a user